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:
9 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/ui/templates/LoginDialog.html

    r390 r407  
    77    </div>
    88    <div data-dojo-attach-point="containerNode">
    9         <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="loginForm">
     9        <form data-dojo-type="dijit/form/Form" data-dojo-attach-point="loginForm">
    1010            <fieldset>
    1111                <label for="email" class="loginLabel">Email</label>
    12                 <input data-dojo-type="dijit.form.TextBox" name="email" type="text" class="loginInput" />
     12                <input data-dojo-type="dijit/form/TextBox" name="email" type="text" class="loginInput" />
    1313                <label for="password" class="loginLabel">Password</label>
    14                 <input data-dojo-type="dijit.form.TextBox" name="password" type="password" class="loginInput" />
     14                <input data-dojo-type="dijit/form/TextBox" name="password" type="password" class="loginInput" />
    1515            </fieldset>
    1616            <div style="float: right;">
    17                 <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onRegister">Register</button>
    18                 <button type="submit" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
     17                <button type="button" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onRegister">Register</button>
     18                <button type="submit" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onLogin">Login</button>
    1919            </div>
    2020        </form>

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/MainMenu.html

    r403 r407  
    11<div class="mainMenu">
    2     <div  data-dojo-type="dijit.MenuBar">
    3         <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'sessions'">Sessions</div>
    4         <div class="rftMainMenuButton" data-dojo-type="dijit.PopupMenuBarItem">
     2    <div  data-dojo-type="dijit/MenuBar">
     3        <div class="rftMainMenuButton" data-dojo-type="rft/ui/MenuBarLink" data-dojo-props="path:'/sessions'">Sessions</div>
     4        <div class="rftMainMenuButton" data-dojo-type="dijit/PopupMenuBarItem">
    55            <span>Content</span>
    6             <div data-dojo-type="dijit.DropDownMenu">
    7                 <div data-dojo-type="rft.ui.MenuLink" class="blue bgColorHover" data-dojo-props="pageId:'surveys', iconClass:'rftIcon rftIconSurvey'">Surveys</div>
    8                 <div data-dojo-type="rft.ui.MenuLink" class="orange bgColorHover" data-dojo-props="pageId:'questions', iconClass:'rftIcon rftIconQuestion'">Questions</div>
    9                 <div data-dojo-type="rft.ui.MenuLink" class="purple bgColorHover" data-dojo-props="pageId:'applications', iconClass: 'rftIcon rftIconApplication'">Applications</div>
    10                 <div data-dojo-type="rft.ui.MenuLink" class="red bgColorHover" data-dojo-props="pageId:'dashboards', iconClass: 'rftIcon rftIconDashboard'">Dashboards</div>
     6            <div data-dojo-type="dijit/DropDownMenu">
     7                <div data-dojo-type="rft/ui/MenuLink" class="blue bgColorHover" data-dojo-props="path:'/surveys', iconClass:'rftIcon rftIconSurvey'">Surveys</div>
     8                <div data-dojo-type="rft/ui/MenuLink" class="orange bgColorHover" data-dojo-props="path:'/questions', iconClass:'rftIcon rftIconQuestion'">Questions</div>
     9                <div data-dojo-type="rft/ui/MenuLink" class="purple bgColorHover" data-dojo-props="path:'/applications', iconClass: 'rftIcon rftIconApplication'">Applications</div>
     10                <div data-dojo-type="rft/ui/MenuLink" class="red bgColorHover" data-dojo-props="path:'/dashboards', iconClass: 'rftIcon rftIconDashboard'">Dashboards</div>
    1111            </div>
    1212        </div>
    13         <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'results'">Results</div>
    14         <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" id="loginMenu">Logout</div>
     13        <div class="rftMainMenuButton" data-dojo-type="rft/ui/MenuBarLink" data-dojo-props="path:'/results'">Results</div>
     14        <div class="rftMainMenuButton" data-dojo-type="rft/ui/MenuBarLink" id="loginMenu">Logout</div>
    1515    </div>
    1616</div>

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/MultipleChoiceWidget.html

    r311 r407  
    33    </div>
    44    <div data-dojo-attach-point="buttons" class="row">
    5         <div><span class="rowBox"/><span class="rowText"/><span class="rowBtn"/><button data-dojo-type="dijit.form.Button" type="button" data-dojo-attach-event="onClick:_onAddRow" class="rowBtn">+</button></div>
     5        <div><span class="rowBox"/><span class="rowText"/><span class="rowBtn"/><button data-dojo-type="dijit/form/Button" type="button" data-dojo-attach-event="onClick:_onAddRow" class="rowBtn">+</button></div>
    66    </div>
    77</div>

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorPreviewItem.html

    r397 r407  
    33                <span class="title" data-dojo-attach-point="titleNode">Default title</span>
    44                <span class="floatRight" data-dojo-attach-point="buttonsNode">
    5                         <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
    6                         <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="foldButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'">Fold</button>
    7                         <button class="trans bg inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
     5                        <button class="trans bg inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-point="editButtonNode" data-dojo-props="baseClass: 'rftBlockButton', iconClass: 'rftIcon rftIconEdit'">Edit</button>
     6                        <button class="trans bg inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-point="foldButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconHalfArrowUp'">Fold</button>
     7                        <button class="trans bg inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-point="removeButtonNode" data-dojo-props="baseClass: 'rftBlockButton', showLabel: false, iconClass: 'rftIcon rftIconDelete'">Remove</button>
    88                </span>
    99        </div>

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionEditorToolkit.html

    r404 r407  
    11<div>
    2         <div data-dojo-type="dojox.widget.TitleGroup">
    3                 <div data-dojo-type="dijit.TitlePane" class="orange" data-dojo-props="open:true" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
    4             <div data-dojo-type="dijit.form.Form" data-dojo-attach-point="propertiesForm">
     2        <div data-dojo-type="dojox/widget/TitleGroup">
     3                <div data-dojo-type="dijit/TitlePane" class="orange" data-dojo-props="open:true" title="Properties" data-dojo-props="iconClass:'rftIcon rftIconProperties'">
     4            <div data-dojo-type="dijit/form/Form" data-dojo-attach-point="propertiesForm">
    55                                <fieldset class="align">
    6                                         <label>Title:</label><input data-dojo-type="dijit.form.TextBox" name="title"/>
    7                                         <label>Code:</label><input data-dojo-type="dijit.form.TextBox" name= "code"/>
     6                                        <label>Title:</label><input data-dojo-type="dijit/form/TextBox" name="title"/>
     7                                        <label>Code:</label><input data-dojo-type="dijit/form/TextBox" name= "code"/>
    88                                        <label>Categories:</label>
    99                                        <div data-dojo-attach-point="listNode" class="rftLineListView"></div>
    1010                                        <div data-dojo-attach-point="categoriesBoxNode"></div>
    11                                         <button class="inheritBgColor" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
     11                                        <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br>
    1212                                        <label>Topic:</label>
    1313                                        <div data-dojo-attach-point="topicBoxNode"></div>
    14                                         <label>Description:</label><textarea data-dojo-type="dijit.form.Textarea" name="description"></textarea>
     14                                        <label>Description:</label><textarea data-dojo-type="dijit/form/Textarea" name="description"></textarea>
    1515                                </fieldset>
    1616                        </div>
    1717                </div>
    1818
    19                 <div data-dojo-type="dijit.TitlePane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus', open:false">
     19                <div data-dojo-type="dijit/TitlePane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus', open:false">
    2020                        <div data-dojo-attach-point="ToolkitContentSourceNode">
    2121                               
    … …  
    2323                </div>
    2424
    25                 <div data-dojo-type="dijit.TitlePane" title="Inputs" data-dojo-props="iconClass:'rftIcon rftIconInput', open:false">
     25                <div data-dojo-type="dijit/TitlePane" title="Inputs" data-dojo-props="iconClass:'rftIcon rftIconInput', open:false">
    2626                        <div data-dojo-attach-point="ToolkitInputsSourceNode">
    2727                               

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/QuestionWidget.html

    r343 r407  
    11<div>
    2     <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="ourForm">
     2    <form data-dojo-type="dijit/form/Form" data-dojo-attach-point="ourForm">
    33        <fieldset>
    44            <label for="code" class="loginLabel">Code</label>
    5             <input data-dojo-type="dijit.form.TextBox" name="code" type="text" class="loginInput" />
     5            <input data-dojo-type="dijit/form/TextBox" name="code" type="text" class="loginInput" />
    66            <label for="question" class="loginLabel">Title</label>
    7             <input data-dojo-type="dijit.form.TextBox" name="title" type="text" class="loginInput" />
     7            <input data-dojo-type="dijit/form/TextBox" name="title" type="text" class="loginInput" />
    88            <label for="question" class="loginLabel">Description</label>
    9             <input data-dojo-type="dijit.form.Textarea" name="description" type="text" class="loginInput"/>
     9            <input data-dojo-type="dijit/form/Textarea" name="description" type="text" class="loginInput"/>
    1010            <label for="category" class="loginLabel">Category</label>
    11             <input data-dojo-type="dijit.form.TextBox" name="category" type="text" class="loginInput" />
     11            <input data-dojo-type="dijit/form/TextBox" name="category" type="text" class="loginInput" />
    1212        </fieldset>
    1313        <fieldset>
    14             <select data-dojo-type="dijit.form.Select" data-dojo-attach-point="scaleSelector" data-dojo-attach-event="onChange:_onTypeChange" name="scale">
     14            <select data-dojo-type="dijit/form/Select" data-dojo-attach-point="scaleSelector" data-dojo-attach-event="onChange:_onTypeChange" name="scale">
    1515                <option value="string" selected>String</option>
    1616                <option value="text">Text</option>

  • Dev/branches/rest-dojo-ui/client/rft/ui/templates/SessionBar.html

    r396 r407  
    11<div class="${baseClass}">
    22    <span class="rftIcon rftIconSession" data-dojo-attach-point="iconNode"></span>
    3     <div data-dojo-type="rft.ui.LineWithActionsWidget" data-dojo-attach-point="upperNode" data-dojo-props="actions: {'inspect':{callback: inspect, properties: {blockButton: true}}}"></div>
    4     <div data-dojo-type="rft.ui.LineWithActionsWidget" data-dojo-attach-point="lowerNode"></div>
     3    <div data-dojo-type="rft/ui/LineWithActionsWidget" data-dojo-attach-point="upperNode" data-dojo-props="actions: {'inspect':{callback: inspect, properties: {blockButton: true}}}"></div>
     4    <div data-dojo-type="rft/ui/LineWithActionsWidget" data-dojo-attach-point="lowerNode"></div>
    55</div>
Note: See TracChangeset for help on using the changeset viewer.