Ignore:
Timestamp:
07/09/12 19:24:56 (13 years ago)
Author:
tjcschipper
Message:
  • Made change to _Page.js to destroy the page's child widgets on page leave. This was causing widgets with identical names (such as "btnSave") to make regsitry throw a duplicate widget error.
  • survey.js/html now sorts loaded questions into categories and topics and creates or adds them to the proper TabPane/Selectors?. TODO: Allow for spaces in category titles.
  • Added "addQuestion()" method to Selector.js, to internalize question visualization logic.
  • Included surveyAdvanced page in run.js
  • Changes index to use proper button format, still need to figure out a way to bind content.goTo to the onclick field (since there is no index.js script being run!)
  • Various css tweaks.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html

    r349 r354  
    4343        'rft/ui/LineWithActionsWidgetThijs',
    4444        'rft/ui/TitleGroup',
     45        'rft/ui/SurveyEditorPreview',
    4546        'dojo/domReady!'
    4647        ],function(parser){
    … …  
    4849        });
    4950
    50 function goToPage(name) {
    51     window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
    52 }
    5351</script>
    5452</head>
    5553
    56 <body class="dijitReset claro">
     54<body class="dijitReset claro blue">
    5755    <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
    5856        <!-- Top menu bar -->
    … …  
    7674                </div>
    7775
     76
     77
     78
    7879                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'left', design:'headline'" style="width: 300px;">
    7980                    <!-- Left toolbar -->
    8081                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
    8182                        <!--Accordion-->
    82                         <div data-dojo-type="dijit.layout.AccordionContainer" class="orange">
    83                             <div data-dojo-type="dijit.layout.ContentPane" title="Included questions" data-dojo-props="iconClass: 'rftIcon rftIconQuestion'">
    84                                 <div data-dojo-type="rft.ui.List">
    85                                     <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question 1', actions:{'remove':{callback: function(){}, properties: {blockButton: false, modifiers: 'white', icon: 'Delete'}}}"></div>
    86                                     <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question 1', actions:{'remove':{callback: function(){}, properties: {blockButton: false, modifiers: 'white', icon: 'Delete'}}}"></div>
    87                                     <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question 1', actions:{'remove':{callback: function(){}, properties: {blockButton: false, modifiers: 'white', icon: 'Delete'}}}"></div>
    88                                     <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question 1', actions:{'remove':{callback: function(){}, properties: {blockButton: false, modifiers: 'white', icon: 'Delete'}}}"></div>
     83                        <div data-dojo-type="dijit.layout.AccordionContainer" class="blue">
     84                            <div data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
     85                                <div data-dojo-type="dojo.dnd.Source" id="toolkitSource" data-dojo-props="skipForm: true, accept:[], selfAccept: false, copyOnly: true, horizontal: false, singular: true">
     86                                                       
    8987                                </div>
    90                             </div>
    91                             <div data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
    92                                 <!-- Content objects here -->
    9388                            </div>
    9489                        </div>
    9590                    </div>
    96                     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'">
    97                         <!--Buttons-->
    98                         <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save</button>
    99                         <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
    100                         <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconUndo'">Exit Design</button>
    101                     </div>
     91                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'"
     92                    >                    <!--Buttons-->
     93                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save</button>
     94                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
     95                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconUndo'">Exit Design</button>
     96                </div>
     97            </div>
     98
     99
     100
     101
     102
     103
     104            <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
     105                <div data-dojo-type="rft.ui.SurveyEditorPreview" data-dojo-id="SurveyEditorPreview">
     106                    <!-- Center preview/editor -->
    102107                </div>
    103108
    104                 <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
    105                     <!-- Center preview/editor -->
    106                     <div class="QuestionEditor">
    107                         <div class="PreviewWindow">Content here</div>
    108                     </div>
    109                 </div>
     109                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPlus', onClick: function(){SurveyEditorPreview.InsertObjects([{data:{title: 'New item', description: 'Default', code: 'QAB01F'}, type: 'editorToolkitItem'}]);}">Add new</button>
    110110            </div>
    111111        </div>
    112112    </div>
     113</div>
    113114</body>
    114115</html>
Note: See TracChangeset for help on using the changeset viewer.