Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
76bd720
[Properties] Highlight changed property
maxyu Aug 21, 2012
60d89fc
[Project View] Edit name directly after click on project name.
Aug 22, 2012
5e5e2b0
[Properties] Remove current page id from target list
maxyu Aug 24, 2012
b471f41
[Widgets] Add list widgets
Jul 31, 2012
5e1860d
[Widgets] Allow subtype to be treated as base type in type list checking
zhizhangchen Aug 1, 2012
34e0812
[ADM] Support child type morphing
zhizhangchen Aug 1, 2012
b93b4e0
[ADM] Add max and min limit of cardinality
zhizhangchen Aug 1, 2012
79abc1c
[Widgets] Extend zones more gracefully
zhizhangchen Aug 3, 2012
6138fe5
[Widgets] Enable using function as a zone's "allow" field
zhizhangchen Aug 6, 2012
ec0f7fc
[Widgets] Implement list widgets using generic item and button
Jul 31, 2012
1ee93f1
[Widgets] Implement ordered list as a property of ListBase
zhizhangchen Aug 7, 2012
fd73d0d
[Widgets] Change name of SimpleSplitList to ButtonSplitList
zhizhangchen Aug 7, 2012
cfe0f23
[Widgets] Introduce default htmlSelector
zhizhangchen Aug 7, 2012
9ab5d9f
[Widgets] Extract text property to BCommonProperties
zhizhangchen Aug 7, 2012
5d3c256
[Widgets] Collapse split list button into SplitListItem
zhizhangchen Aug 7, 2012
b7fe486
[Widgets] Collapse list button into ListItem
Aug 8, 2012
f80900b
[Widgets] Introduce multiple inheritance
zhizhangchen Aug 8, 2012
b1523a0
[Widgets] Use multiple inheritance to implement split list widgets
zhizhangchen Aug 8, 2012
2f66eb1
[Widgets] Remove unused svg files and display labels
zhizhangchen Aug 9, 2012
1aa4124
[Widgets] Enable count bubble on all list types
zhizhangchen Aug 21, 2012
47961cd
[FileIO] Support themes in root directory of sandbox when exporting
DonnaWuDongxia Aug 21, 2012
f5d99a5
[General] Add inSandbox flag for uploadable widget
DonnaWuDongxia Aug 21, 2012
5ed3a22
[Layout View] Revert css changes in 8ee0558e
zhizhangchen Aug 22, 2012
5b82f2f
[ADM] Fix moveNode index caculating problem
zhizhangchen Aug 24, 2012
02bc28e
[ADM] Use moveNode to insert child if old parent is not null
zhizhangchen Aug 24, 2012
d948030
[Layout View] Use a new algorithm for sorting
zhizhangchen Aug 24, 2012
9c1f77c
Merge remote branch 'maxyu/page' into integration-20120824
zhizhangchen Aug 24, 2012
7c63396
Merge remote branch 'xuqingkuang/editNameInProjectView' into integrat…
zhizhangchen Aug 24, 2012
3795394
Merge remote branch 'maxyu/highlight' into integration-20120824
zhizhangchen Aug 24, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<body class="vbox fullsize">
<script src="lib/jquery-1.6.4.min.js"></script>
<script src="lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/msg-box.js"></script>
<script src="src/js/widgets.js"></script>
<script src="src/js/adm.js"></script>
Expand All @@ -34,7 +35,6 @@
<script src="src/js/projects.js"></script>
<script src="src/js/serialize.js"></script>
<!-- New stuff from here ... -->
<script src="src/js/jquery-workarounds.js"></script>
<script src="src/js/jquery-plugins.js"></script>
<script src="src/js/views/base.js"></script>
<script src="src/js/views/tree.js"></script>
Expand Down
21 changes: 19 additions & 2 deletions src/assets/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,25 @@
"Boolean": ["#0._hidden_node.jqm_input_boolean"]
}
],
"List Views": [
"List", "OrderedList", "ListItem", "ListDivider", "ListButton"
"List Views": [ {
"Single Lists": [
"SimpleList",
"ButtonList",
"TextList",
"IconList",
"ThumbnailList",
"SimpleListItem",
"ListDivider"
],
"Split Lists": [
"ButtonSplitList",
"TextSplitList",
"IconSplitList",
"ThumbnailSplitList",
"SimpleListItem",
"ListDivider"
]
}
],
"Image": ["Image"]
}
Expand Down
5 changes: 5 additions & 0 deletions src/css/builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,11 @@ div.propertyItems label[for|=id] {
font-weight: bold;
}

.titleBar input {
width: 150px;
margin: 3px;
}

.openButton {
background-image: url("images/openButton_up.png");
background-repeat: no-repeat;
Expand Down
2 changes: 1 addition & 1 deletion src/css/composer.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
/*************************/
/* Class specific tweaks */
/*************************/
.nrc-sortable-container.ui-content .adm-node {
.nrc-sortable-container.ui-content > * {
margin-top: 10px;
margin-bottom: 10px;
}
Expand Down
44 changes: 44 additions & 0 deletions src/css/images/widgets/jqm_button_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_button_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_icon_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/css/images/widgets/jqm_icon_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_icon_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/css/images/widgets/jqm_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 0 additions & 31 deletions src/css/images/widgets/jqm_list_split_button.svg

This file was deleted.

44 changes: 44 additions & 0 deletions src/css/images/widgets/jqm_text_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_text_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_text_split_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/css/images/widgets/jqm_thumbnail_list.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/css/images/widgets/jqm_thumbnail_list_button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading