Ignore:
Timestamp:
09/05/12 14:41:13 (13 years ago)
Author:
hendrikvanantwerpen
Message:

Added build infrastructure and reorganised code to match it.

Page navigation is now done by the rft/app/Controller class. pages
inherit generally from rft/app/Page, which is a BorderContainer?. The
Page uses normal widget mechanism like templateString, all data-rft-*
are obsolete, use normal data-dojo-* options again in templates.
This is done so the pages of the app can be included in the build.
URLs are linked to pages through registration, which is done in
run.js. The routes are defined in the routes.js file. Page class names
and URLs are now independent.

Reduced includes in index.html to one CSS file and two JS files. Dojo
stylesheets are now included thorugh externals.css.

Dojo 1.8 doesn't require the dotted names in declares anymore. All these
are now removed (redundant with module path and JS filename anyway)
and in templates a module id is used, so iso 'dijit.form.Form' use
'dijit/form/Form' now. This is more consistent with requires in the JS
code and they are picked up by the build system.

Removed any old-style dojo.<function> code and use loaded modules
everywhere.

Lots of whitespace unification.

Location:
Dev/branches/rest-dojo-ui
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Dev/branches/rest-dojo-ui

    • Property svn:ignore

      •  

        old new  
        11nbproject
        22.project
         3release

  • Dev/branches/rest-dojo-ui/client

    • Property svn:externals

      •  

        old new  
        1 dojotoolkit http://svn.dojotoolkit.org/src/tags/release-1.8.0
         1dojo http://svn.dojotoolkit.org/src/tags/release-1.8.0/dojo
         2dijit http://svn.dojotoolkit.org/src/tags/release-1.8.0/dijit
         3dojox http://svn.dojotoolkit.org/src/tags/release-1.8.0/dojox
         4util http://svn.dojotoolkit.org/src/tags/release-1.8.0/util

  • Dev/branches/rest-dojo-ui/client/rft/pages/survey.html

    r382 r407  
    1 <div data-dojo-type="rft.pages.survey" class="blue">
    2     <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
     1<div class="blue">
    32
    4         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
    5             <h2>
    6                 <span class="rftIcon rftIconSurvey"></span>
    7                 <span class="headerText" data-rft-attach-point="titleNode">Survey Editor</span>
    8             </h2>
     3    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
     4        <h2>
     5            <span class="rftIcon rftIconSurvey"></span>
     6            <span class="headerText" data-dojo-attach-point="titleNode">Survey Editor</span>
     7        </h2>
     8    </div>
     9   
     10    <div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="region:'center'">
     11        <div data-dojo-attach-point="questionBrowser"></div>
     12    </div>
     13   
     14    <div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
     15        <div data-dojo-attach-point="surveyListViewNode" class="rftSurveyListView">
    916        </div>
    10        
    11         <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
    12             <div data-rft-attach-point="questionBrowser"></div>
     17
     18        <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'bottom'">
     19            <button data-dojo-type="dijit/form/Button"
     20                    data-dojo-attach-event="onClick:_onShowProperties"
     21                    data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconProperties'">
     22                Properties</button>
     23            <button data-dojo-type="dijit/form/Button"
     24                    data-dojo-attach-event="onClick:_onSave"
     25                    data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
     26                Save Changes</button>
     27            <button data-dojo-type="dijit/form/Button"
     28                    data-dojo-attach-event="onClick:_onDiscard"
     29                    data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
     30                Discard changes</button>
     31            <button data-dojo-type="dijit/form/Button"
     32                    data-dojo-attach-event="onClick:_onShowPreview"
     33                    data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPreview'">
     34                Preview</button>
    1335        </div>
    14        
    15         <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
    16             <div data-rft-attach-point="surveyListViewNode" class="rftSurveyListView">
    17             </div>
    1836
    19             <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'">
    20                 <button data-dojo-type="dijit.form.Button"
    21                         data-rft-attach-event="onClick:_onShowProperties"
    22                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconProperties'">
    23                     Properties</button>
    24                 <button data-dojo-type="dijit.form.Button"
    25                         data-rft-attach-event="onClick:_onSave"
    26                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">
    27                     Save Changes</button>
    28                 <button data-dojo-type="dijit.form.Button"
    29                         data-rft-attach-event="onClick:_onDiscard"
    30                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">
    31                     Discard changes</button>
    32                 <button data-dojo-type="dijit.form.Button"
    33                         data-rft-attach-event="onClick:_onShowPreview"
    34                         data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPreview'">
    35                     Preview</button>
    36             </div>
    37         </div>
    38     </div>
     37    <div data-dojo-type="dijit/Dialog"
     38         title="Survey properties"
     39         data-dojo-attach-point="propertiesDialog"
     40         data-dojo-attach-event="onSubmit:_onPropertiesOk">
    3941
    40     <div data-dojo-type="dijit.Dialog"
    41          title="Survey properties"
    42          data-rft-attach-point="propertiesDialog"
    43          data-rft-attach-event="onSubmit:_onPropertiesOk">
    44 
    45         <form data-dojo-type="dijit.form.Form"
    46               data-rft-attach-point="propertiesForm">
     42        <form data-dojo-type="dijit/form/Form"
     43              data-dojo-attach-point="propertiesForm">
    4744            <label for="title">Title</label>
    48             <input data-dojo-type="dijit.form.TextBox" name="title"/><br/>
     45            <input data-dojo-type="dijit/form/TextBox" name="title"/><br/>
    4946            <label for="description">Description</label>
    50             <input data-dojo-type="dijit.form.Textarea" name="description"/><br/>
     47            <input data-dojo-type="dijit/form/Textarea" name="description"/><br/>
    5148        </form>
    5249           
    5350        <div>
    54             <button data-dojo-type="dijit.form.Button"
     51            <button data-dojo-type="dijit/form/Button"
    5552                    type="submit"
    56                     data-rft-attach-event="onClick:_onPropertiesOk">
     53                    data-dojo-attach-event="onClick:_onPropertiesOk">
    5754                OK</button>
    58             <button data-dojo-type="dijit.form.Button"
     55            <button data-dojo-type="dijit/form/Button"
    5956                    type="button"
    60                     data-rft-attach-event="onClick:_onPropertiesCancel">
     57                    data-dojo-attach-event="onClick:_onPropertiesCancel">
    6158                Cancel</button>
    6259        </div>
     60
    6361    </div>
    6462
Note: See TracChangeset for help on using the changeset viewer.