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
46 commits
Select commit Hold shift + click to select a range
900adda
[ADM] Fix bug: ID auto numbering occurring in reverse.
Aug 24, 2012
ad496c5
[Widgets] Added event properties to widgets.
Aug 17, 2012
43e43ed
[ADM] Added force argument for generateUniqueProperty()
Aug 22, 2012
423c81b
[General] Implemented event handler feature.
Jul 19, 2012
2440b31
[Widgets] Add list widgets
Jul 31, 2012
350c692
[Widgets] Allow subtype to be treated as base type in type list checking
zhizhangchen Aug 1, 2012
e2f382c
[Widgets] Add horizontal button group
zhizhangchen Jul 2, 2012
9cedc80
[Widgets] Deny VButtonGroup in Footer as it appears as faux-horizonta…
zhizhangchen Aug 27, 2012
978f8ba
[Code View] Remove primary tools as they are not usefull in code view
zhizhangchen Aug 27, 2012
8779269
[Panel] Fixed 1px vertical stripe visible when panels collapsed.
Aug 27, 2012
7dfd51d
[Property View] Use jQuery UI button to reimplement delete button.
Aug 27, 2012
129925f
[General] Create new one for no project case when tab changing
DonnaWuDongxia Aug 27, 2012
56f1c9b
Merge remote branch 'xuqingkuang/pannelCollapsed' into integration-20…
zhizhangchen Aug 27, 2012
27f28d1
Merge remote branch 'xuqingkuang/deleteButtonHover' into integration-…
zhizhangchen Aug 27, 2012
65fed8e
Merge branch 'horizontal-button-group' into integration-20120827
zhizhangchen Aug 27, 2012
f8fc50d
Merge remote branch 'xuqingkuang/fixIDReverse' into integration-20120827
zhizhangchen Aug 27, 2012
ef6ef07
[ADM] Support child type morphing
zhizhangchen Aug 1, 2012
a93ecff
[ADM] Add max and min limit of cardinality
zhizhangchen Aug 1, 2012
008d895
[Widgets] Extend zones more gracefully
zhizhangchen Aug 3, 2012
d514f8b
[Widgets] Enable using function as a zone's "allow" field
zhizhangchen Aug 6, 2012
cb88dd5
[Widgets] Implement list widgets using generic item and button
Jul 31, 2012
8b830dc
[Widgets] Implement ordered list as a property of ListBase
zhizhangchen Aug 7, 2012
fe8d48e
[Widgets] Change name of SimpleSplitList to ButtonSplitList
zhizhangchen Aug 7, 2012
4fc51c0
[Widgets] Introduce default htmlSelector
zhizhangchen Aug 7, 2012
a315cf3
[Widgets] Extract text property to BCommonProperties
zhizhangchen Aug 7, 2012
9ac61f7
[Widgets] Collapse split list button into SplitListItem
zhizhangchen Aug 7, 2012
53b2104
[Widgets] Collapse list button into ListItem
Aug 8, 2012
35528bf
[Widgets] Introduce multiple inheritance
zhizhangchen Aug 8, 2012
fb66fe3
[Widgets] Use multiple inheritance to implement split list widgets
zhizhangchen Aug 8, 2012
39eb612
[Widgets] Remove unused svg files and display labels
zhizhangchen Aug 9, 2012
3182729
[Widgets] Enable count bubble on all list types
zhizhangchen Aug 21, 2012
92552db
[FileIO] Support themes in root directory of sandbox when exporting
DonnaWuDongxia Aug 21, 2012
ec04cb2
[General] Add inSandbox flag for uploadable widget
DonnaWuDongxia Aug 21, 2012
aca58d5
[Layout View] Revert css changes in 8ee0558e
zhizhangchen Aug 22, 2012
179b637
[ADM] Fix moveNode index caculating problem
zhizhangchen Aug 24, 2012
23351fe
[ADM] Use moveNode to insert child if old parent is not null
zhizhangchen Aug 24, 2012
3639f63
[Layout View] Use a new algorithm for sorting
zhizhangchen Aug 24, 2012
d49b661
Fix sorting
zhizhangchen Aug 27, 2012
cd92d2d
[Layout View] Fix focus styling problem
zhizhangchen Aug 27, 2012
2cffbc3
[Widgets] Change iconsrc property to icon
zhizhangchen Aug 27, 2012
dd1d1c7
Merge branch 'list-widgets-generic-multi-inheritance' into integratio…
zhizhangchen Aug 27, 2012
bc89dd1
Merge remote branch 'xuqingkuang/eventHandlerInADM' into integration-…
zhizhangchen Aug 27, 2012
5697a30
Merge branch 'remove-primary-tools-in-code-view' into integration-201…
zhizhangchen Aug 27, 2012
801d261
[Property View] Fix bug: Grid uses two types of form widget for interger
zeroooing Aug 22, 2012
32af8d5
[Preperty View] Fix bug: using illegal values results in silent failure
zeroooing Aug 22, 2012
127034f
Merge remote branch 'smallertomato/Grid' into integration-20120827
zhizhangchen Aug 27, 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
23 changes: 20 additions & 3 deletions src/assets/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,33 @@
"Functional Groups": [
{
"Toolbars": ["#0._hidden_node.jqm_toolbars"],
"Buttons": ["Button", "ButtonGroup"],
"Buttons": ["Button", "VButtonGroup", "HButtonGroup"],
"Content Formatting": ["Grid", "Collapsible", "Accordion", "Div"],
"Form Elements": [
"#0._hidden_node.jqm_other_inputs.0", "Text",
{
"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
118 changes: 118 additions & 0 deletions src/css/builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ body.ui-tabs.ui-widget {
height: 32px;
max-height: 64px;
}
.smallbutton {
font-size: .8em !important; /* Override original size of jQuery UI button */
}
.hasflex {
display: box;
display: -webkit-box;
Expand Down Expand Up @@ -1560,3 +1563,118 @@ input.screenCoordinate::-webkit-inner-spin-button {
#exportDialog .buttonStyle {
margin: 0 0.6em;
}

#eventHandlerDialog {
overflow: hidden;
}

#eventHandlerDialog .title {
position: relative;
height: 52px;
background-color: #E4E5DF;
}

#eventHandlerDialog .title > label {
position: absolute;
left: 10px;
top: 16px;
font-size : 13px;
color: #4d4d4d;
font-family: OpenSans-SB;
font-weight: 600; /* semi-bold */
}


#eventHandlerDialog .wrap_left {
position: relative;
width: 230px;
border-right: 1px solid #dededc;
}

#eventHandlerDialog .wrap_left .container {
position: absolute;
width: 100%;
margin: 10px;
}


#eventHandlerDialog .wrap_left .container * {
display: inline-block;
}

#eventHandlerDialog .wrap_left .container select {
position: absolute;
top: 10px;
left: 0px;
width: 270px;
}

#eventHandlerDialog .wrap_left .container fieldset {
position: absolute;
top: 40px;
width: 244px;
height: 370px;
overflow: auto;
}

#eventHandlerDialog .wrap_left .container fieldset ul {
margin: 0px;
}

#eventHandlerDialog .wrap_left .container fieldset li {
display: block;
padding: 8px 8px 8px 8px;
margin-left: -36px;
width: 200px;
height: 34px;
border: 8px transparent;
border-bottom: 1px solid #CCC;
}

#eventHandlerDialog .wrap_left .container fieldset li.ui-selected {
background-color: #4AE57B;
}

#eventHandlerDialog .wrap_left .container fieldset li > a.link {
padding-top: 8px;
width: 160px;
height: 34px;
}

#eventHandlerDialog .wrap_left .container fieldset a.ui-button {
margin-top: 0px;
float: right;
}

#eventHandlerDialog .wrap_left .container button.doneButton {
position: absolute;
top: 440px;
left: 46px;
width: 180px;
}

#eventHandlerDialog .wrap_right {
width: 630px;
}

#eventHandlerDialog .wrap_right .container {
overflow: auto;
resize: none;
height: 600px;
width: 98%;
margin: 6px;
}

#eventHandlerDialog .wrap_right .container .CodeMirror {
margin: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-moz-box-shadow: inset 0 0 4px #000000;
-webkit-box-shadow: inset 0 0 4px #000000;
box-shadow: inset 0 0 4px #000000;
height: 470px;
}

#eventHandlerDialog .wrap_right .container .CodeMirror .CodeMirror-scroll {
height: 464px;
}
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