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/index.html

    r359 r407  
    1 <div data-dojo-type="rft.pages.index">
    2     <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 600px;">
    3         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
    4             <h2>
    5                 <span class="rftIcon rftIconUser"></span>
    6                 <span class="headerText">Main Menu</span>
    7             </h2>
     1<div>
     2    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'top'">
     3        <h2>
     4            <span class="rftIcon rftIconUser"></span>
     5            <span class="headerText">Main Menu</span>
     6        </h2>
     7    </div>
     8
     9    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
     10
     11        <div class="rftIndexMenuBlock" title="Sessions">
     12            <div class="rftIndexMenuMask">
     13                <span class="rftIcon rftIconSession"></span><span class="label">Sessions</span>
     14            </div>
     15            <button data-dojo-attach-point="btnContentCreate" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconPlus'">Create and edit</button>
     16            <button data-dojo-attach-point="btnContentFacilitate" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconForward'">Facilitate</button>
    817        </div>
    918
    10         <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
     19        <div class="rftIndexMenuBlock" title="Content">
     20            <div class="rftIndexMenuMask">
     21                <span class="rftIcon rftIconInspect"></span><span class="label">Content</span>
     22            </div>
     23            <button data-dojo-attach-point="btnSurveys" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue oneHeight', iconClass: 'rftIcon rftIconSurvey'">Surveys</button>
     24            <button data-dojo-attach-point="btnQuestions" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'orange oneHeight', iconClass: 'rftIcon rftIconQuestion'">Questions</button>
     25            <button data-dojo-attach-point="btnApplications" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'purple oneHeight', iconClass: 'rftIcon rftIconApplication'">Applications</button>
     26            <button data-dojo-attach-point="btnDashboards" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'red oneHeight', iconClass: 'rftIcon rftIconDashboard'">Dashboards</button>
     27        </div>
    1128
    12             <div class="rftIndexMenuBlock" title="Sessions">
    13                 <div class="rftIndexMenuMask">
    14                     <span class="rftIcon rftIconSession"></span><span class="label">Sessions</span>
    15                 </div>
    16                 <button data-rft-attach-point="btnContentCreate" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconPlus'">Create and edit</button>
    17                 <button data-rft-attach-point="btnContentFacilitate" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconForward'">Facilitate</button>
     29        <div class="rftIndexMenuBlock" title="results">
     30            <div class="rftIndexMenuMask">
     31                <span class="rftIcon rftIconGameData"></span><span class="label">Results</span>
    1832            </div>
    19 
    20             <div class="rftIndexMenuBlock" title="Content">
    21                 <div class="rftIndexMenuMask">
    22                     <span class="rftIcon rftIconInspect"></span><span class="label">Content</span>
    23                 </div>
    24                 <button data-rft-attach-point="btnSurveys" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue oneHeight', iconClass: 'rftIcon rftIconSurvey'">Surveys</button>
    25                 <button data-rft-attach-point="btnQuestions" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'orange oneHeight', iconClass: 'rftIcon rftIconQuestion'">Questions</button>
    26                 <button data-rft-attach-point="btnApplications" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'purple oneHeight', iconClass: 'rftIcon rftIconApplication'">Applications</button>
    27                 <button data-rft-attach-point="btnDashboards" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'red oneHeight', iconClass: 'rftIcon rftIconDashboard'">Dashboards</button>
    28             </div>
    29 
    30             <div class="rftIndexMenuBlock" title="results">
    31                 <div class="rftIndexMenuMask">
    32                     <span class="rftIcon rftIconGameData"></span><span class="label">Results</span>
    33                 </div>
    34                 <button data-rft-attach-point="btnResults" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue fourHeight', iconClass: 'rftIcon rftIconGameData'">Results</button>
    35             </div>
     33            <button data-dojo-attach-point="btnResults" data-dojo-type="dijit/form/Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue fourHeight', iconClass: 'rftIcon rftIconGameData'">Results</button>
    3634        </div>
    3735    </div>
    3836
    39     <script>
    40     require([
    41         'dojo/on',
    42         'dojo/query',
    43         'dijit/registry',
    44         'rft/content',
    45         'dojo/domReady!'
    46         ], function(on, query, registry, content){
    47             debugger;
    48             registry.byId("btnSessionsCreate").on("click", function(){
    49                 content.goTo("sessions", null);
    50             });
    51             registry.byId("btnSessionsFacilitate").on("click", function(){
    52                 content.goTo("sessions", null);
    53             });
    54 
    55             registry.byId("btnSurveys").on("click", function(){
    56                 content.goTo("surveys", null);
    57             });
    58             registry.byId("btnQuestions").on("click", function(){
    59                 content.goTo("questions", null);
    60             });
    61             registry.byId("btnApplications").on("click", function(){
    62                 content.goTo("applications", null);
    63             });
    64             registry.byId("btnDashboards").on("click", function(){
    65                 content.goTo("dashboards", null);
    66             });
    67 
    68             registry.byId("btnResults").on("click", function(){
    69                 content.goTo("results", null);
    70             });
    71 
    72         });
    73     </script>
    7437</div>
Note: See TracChangeset for help on using the changeset viewer.