Index: Dev/branches/rest-dojo-ui/client/mMenu.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mMenu.html	(revision 356)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research Facilitator Tool</title>
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-        <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-        <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-        <script type="text/javascript">
-            require([
-                'dojo/parser',
-                'dijit/DropDownMenu',
-                'dijit/layout/AccordionContainer',
-                'dijit/layout/BorderContainer',
-                'dijit/layout/ContentPane',
-                'dijit/layout/TabContainer',
-                'dijit/layout/SplitContainer',
-                'dijit/MenuBar',
-                'dijit/MenuBarItem',
-                'dijit/form/Button',
-                'dijit/form/ComboBox',
-                'dijit/form/Form',
-                'dijit/form/Select',
-                'dijit/form/SimpleTextarea',
-                'dijit/form/TextBox',
-                'dijit/form/Textarea',
-                'dijit/PopupMenuBarItem',
-                'dijit/TitlePane',
-                'dojox/grid/DataGrid',
-                'dojox/widget/TitleGroup',
-                'rft/ui/List',
-                'rft/ui/MainMenu',
-                'rft/ui/MenuBarLink',
-                'rft/ui/MenuLink',
-                'rft/ui/Notifications',
-                'rft/ui/LineWithActionsWidget',
-                'rft/ui/QuestionWidget',
-                'rft/ui/Selector',
-                'rft/ui/SelectorThijs',
-                'rft/ui/LineWithActionsWidgetThijs',
-                'rft/ui/TitleGroup',
-                'dojo/domReady!'
-            ],function(parser){
-                parser.parse();
-            });
-        </script>
-
-        <script>
-            function goToPage(name) {
-                window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
-            }
-        </script>
-    </head>
-    <body class="dijitReset claro">
-        <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <!-- Top menu bar -->
-            <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                <h1>ResearchTool</h1>
-                <div data-dojo-type="rft.ui.MainMenu"></div>
-                <div class="breadcrumbs">
-                    <span class="breadcrumb breadcrumbCurrent">User</span>
-                </div>
-            </div>
-            <!-- Main content window -->
-            <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 600px;">
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                        <h2>
-                            <span class="rftIcon rftIconUser"></span>
-                            <span class="headerText">Main Menu</span>
-                        </h2>
-                    </div>
-
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-
-                        <div class="rftIndexMenuBlock">
-                            <div class="rftIndexMenuMask">
-                                <span class="rftIcon rftIconSession"></span><span class="label">Sessions</span>
-                            </div>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconPlus'" onClick="goToPage('mSessions');">Create and edit</button>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'green twoHeight', iconClass: 'rftIcon rftIconForward'" onClick="goToPage('mSessions');">Facilitate</button>
-                        </div>
-
-                        <div class="rftIndexMenuBlock">
-                            <div class="rftIndexMenuMask">
-                                <span class="rftIcon rftIconInspect"></span><span class="label">Content</span>
-                            </div>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue oneHeight', iconClass: 'rftIcon rftIconSurvey'" onClick="goToPage('mSurveys');">Surveys</button>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'orange oneHeight', iconClass: 'rftIcon rftIconQuestion'" onClick="goToPage('mQuestions');">Questions</button>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'purple oneHeight', iconClass: 'rftIcon rftIconApplication'" onClick="goToPage('mApplications');">Applications</button>
-                            <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'red oneHeight', iconClass: 'rftIcon rftIconDashboard'" onClick="goToPage('mDashboards');">Dashboards</button>
-
-                        </div>
-
-                        <div class="rftIndexMenuBlock">
-                            <div data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftIndexMenuButton', class: 'blue fourHeight', iconClass: 'rftIcon rftIconGameData'" onClick="goToPage('mResults')">Results</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/mSession.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mSession.html	(revision 356)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research Facilitator Tool</title>
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-        <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-        <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-        <script type="text/javascript">
-            require([
-                'dojo/parser',
-                'dijit/DropDownMenu',
-                'dijit/layout/AccordionContainer',
-                'dijit/layout/BorderContainer',
-                'dijit/layout/ContentPane',
-                'dijit/layout/TabContainer',
-                'dijit/layout/SplitContainer',
-                'dijit/MenuBar',
-                'dijit/MenuBarItem',
-                'dijit/form/Button',
-                'dijit/form/ComboBox',
-                'dijit/form/Form',
-                'dijit/form/Select',
-                'dijit/form/SimpleTextarea',
-                'dijit/form/DateTextBox',
-                'dijit/form/TextBox',
-                'dijit/form/Textarea',
-                'dijit/PopupMenuBarItem',
-                'dijit/TitlePane',
-                'dojox/grid/DataGrid',
-                'dojox/widget/TitleGroup',
-                'rft/ui/List',
-                'rft/ui/MainMenu',
-                'rft/ui/MenuBarLink',
-                'rft/ui/MenuLink',
-                'rft/ui/Notifications',
-                'rft/ui/LineWithActionsWidget',
-                'rft/ui/QuestionWidget',
-                'rft/ui/Selector',
-                'rft/ui/SelectorThijs',
-                'rft/ui/LineWithActionsWidgetThijs',
-                'rft/ui/TitleGroup',
-                'dojo/domReady!'
-            ],function(parser){
-                parser.parse();
-            });
-        </script>
-        <script>
-            function goToPage(name) {
-                window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
-            }
-        </script>
-    </head>
-    <body class="dijitReset claro">
-        <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <!-- Top menu bar -->
-            <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                <h1>ResearchTool</h1>
-                <div data-dojo-type="rft.ui.MainMenu"></div>
-                <div class="breadcrumbs">
-                    <span class="breadcrumb">User > </span>
-                    <span class="breadcrumbCurrent">Team session 15-5-2012 [editing]</span>
-                </div>
-            </div>
-            <!-- Main content window -->
-            <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                        <h2>
-                            <span class="rftIcon rftIconSurvey"></span>
-                            <span class="headerText">Teamup Session 15-5-2012 [editing]</span>
-                        </h2>
-                    </div>
-                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-                        <div data-dojo-type="dijit.layout.TabContainer" class="green" data-dojo-props="tabPosition:'left-h',region:'center'">
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Properties">
-                                <!--PROPERTIES-->
-                                <h3>Basic</h3>
-                                <fieldset class="align">
-                                    <label for="titleInput">Title:</label>
-                                    <input type="text" id="titleInput" data-dojo-type="dijit.form.TextBox" data-dojo-props="placeHolder: 'Enter title here'" />
-                                    <br/>
-                                    <label for="descriptionInput">Description:</label>
-                                    <textarea id="descriptionInput" rows="3" cols="54" data-dojo-type="dijit.form.SimpleTextarea" data-dojo-props="selectOnClick: true">This is the description in the info popups!</textarea>
-                                    <br/>
-                                    <label for="dateInput">Planned date:</label>
-                                    <input type="text" id="dateInput" data-dojo-type="dijit.form.DateTextBox" required="true" />
-                                </fieldset>
-
-                                <h3>Accounts</h3>
-                                <fieldset class="align">
-                                    <label for="accountsInput">Add new</label>
-                                    <input type="text" data-dojo-type="dijit.form.TextBox" data-dojo-props="placeHolder: 'Enter email address here...'" />
-                                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftBlockButton', class: 'green', iconClass: 'rftIcon rftIconPlus'">Invite</button>
-                                    <br/><br/>
-                                    <div data-dojo-type="rft.ui.List" data-dojo-props="region:'center'" style="width: 500px;">
-                                        <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'a.bezuijen@tudelft.nl', modifiers: 'green', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, icon: 'Delete', modifiers:'white'}}}"></div>
-                                        <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'i.mayer@tudelft.nl', modifiers: 'green', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, icon: 'Delete', modifiers:'white'}}}"></div>
-                                    </div>
-                                </fieldset>
-
-                                <button id="btnPropertiesDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
-                                <button id="btnPropertiesSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save changes</button>
-
-
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Design">
-                                <!--DESIGN-->
-
-                                <div class="rftSessionObject green">
-                                    <div class="rftIcon rftIconSurvey"></div>
-                                    <label>Survey name</label>
-                                </div>
-                                <div class="rftSessionObject green">
-                                    <div class="rftIcon rftIconSurvey"></div>
-                                    <label>Survey name, this one is really long.</label>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/mSessions.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mSessions.html	(revision 356)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research Facilitator Tool</title>
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-        <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-        <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-        <script type="text/javascript">
-            require([
-                'dojo/parser',
-                'dojo/_base/array',
-                'dijit/DropDownMenu',
-                'dijit/layout/AccordionContainer',
-                'dijit/layout/BorderContainer',
-                'dijit/layout/ContentPane',
-                'dijit/layout/TabContainer',
-                'dijit/layout/SplitContainer',
-                'dijit/MenuBar',
-                'dijit/MenuBarItem',
-                'dijit/form/Button',
-                'dijit/form/ComboBox',
-                'dijit/form/Form',
-                'dijit/form/Select',
-                'dijit/form/SimpleTextarea',
-                'dijit/form/TextBox',
-                'dijit/form/Textarea',
-                'dijit/PopupMenuBarItem',
-                'dijit/TitlePane',
-                'dojox/grid/DataGrid',
-                'dojox/widget/TitleGroup',
-                'rft/ui/List',
-                'rft/ui/MainMenu',
-                'rft/ui/MenuBarLink',
-                'rft/ui/MenuLink',
-                'rft/ui/Notifications',
-                'rft/ui/LineWithActionsWidget',
-                'rft/ui/QuestionWidget',
-                'rft/ui/Selector',
-                'rft/ui/SelectorThijs',
-                'rft/ui/LineWithActionsWidgetThijs',
-                'rft/ui/ObjectBox',
-                'rft/ui/TitleGroup',
-                'dojo/domReady!'
-            ],function(parser){
-                parser.parse();
-            });
-        </script>
-        <script>
-            function createNew(){
-                debugger;
-                var newBox = new rft.ui.ObjectBox({
-                    title: 'TeamUp Basic Template',
-                    subTitle: '',
-                    lowerTitle: '',
-                    objectType: 'SessionTemplate',
-                    actions: {
-                        "edit": function() {},
-                        "delete": function() {}
-                    }
-                });
-                newBox.startup();
-                newBox.placeAt("containerTemplates", "last");
-            }
-            
-            function createInstance(args) {
-                // Create a template instance in the "Sessions" tab
-                var args;
-                args.objectType = "Session";
-                var d = new Date();
-                var dateString = d.getDate()+"-"+d.getMonth()+"-"+d.getFullYear();
-                var creator = "Igor Mayer"; // Use currently logged in profile instead!
-                args.subTitle = "Created on "+dateString+" by "+creator;
-            
-                args.actions = {
-                    "edit": function() {},
-                    "delete": function() {}
-                }
-                var newBox = new rft.ui.ObjectBox(args);
-                newBox.startup();
-                newBox.placeAt("containerSessions", "last");
-                debugger;
-
-                // TODO: Then switch tabs to the Sessions tab!
-                var sess = dijit.byId("dijit_layout_ContentPane_5");
-                dijit.byId("tabs").selectChild(sess);
-            }
-            
-            
-        </script>
-        <script>
-            function goToPage(name) {
-                window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
-            }
-        </script>
-
-
-    </head>
-    <body class="dijitReset claro">
-        <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <!-- Top menu bar -->
-            <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                <h1>ResearchTool</h1>
-                <div data-dojo-type="rft.ui.MainMenu"></div>
-                <div class="breadcrumbs">
-                    <span class="breadcrumb">User > </span>
-                    <span class="breadcrumbCurrent">Sessions</span>
-                </div>
-            </div>
-            <!-- Main content window -->
-            <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                        <h2>
-                            <span class="rftIcon rftIconSession"></span>
-                            <span class="headerText">Sessions</span>
-                        </h2>
-                    </div>
-                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-                        <div data-dojo-type="dijit.layout.TabContainer" class="green" data-dojo-props="tabPosition:'left-h',region:'center'" id="tabs">
-                            <div data-dojo-type="dijit.layout.BorderContainer" title="Templates">
-                                <div id="containerTemplates" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'">
-                                    <!--TODO: These don't allow for custom icon settings yet! -->
-                                    <div data-dojo-type="rft.ui.ObjectBox" data-dojo-props="actions: {'edit': function(){alert('Custom edit code');}, 'delete':function(){}, 'Custom function': function(){alert('newCommand');}, 'publish': createInstance}"></div>
-                                </div>
-                                <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
-                                    <div data-dojo-type="dijit.form.Button" data-dojo-props="region: 'bottom', baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconSessionTemplate', onClick: createNew">Create new template</div>
-                                </div>
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Sessions">
-                                <div id="containerSessions" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'">
-
-                                </div>
-                                <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'" style="height: 40px;">
-                                    <!-- Buttons? -->
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/mSurvey.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mSurvey.html	(revision 356)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Research Facilitator Tool</title>
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-    <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-    <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-    <script type="text/javascript">
-    require([
-        'dojo/parser',
-        'dijit/DropDownMenu',
-        'dijit/layout/AccordionContainer',
-        'dijit/layout/BorderContainer',
-        'dijit/layout/ContentPane',
-        'dijit/layout/TabContainer',
-        'dijit/layout/SplitContainer',
-        'dijit/MenuBar',
-        'dijit/MenuBarItem',
-        'dijit/form/Button',
-        'dijit/form/ComboBox',
-        'dijit/form/Form',
-        'dijit/form/Select',
-        'dijit/form/SimpleTextarea',
-        'dijit/form/TextBox',
-        'dijit/form/Textarea',
-        'dijit/PopupMenuBarItem',
-        'dijit/TitlePane',
-        'dojox/grid/DataGrid',
-        'dojox/widget/TitleGroup',
-        'rft/ui/List',
-        'rft/ui/MainMenu',
-        'rft/ui/MenuBarLink',
-        'rft/ui/MenuLink',
-        'rft/ui/Notifications',
-        'rft/ui/LineWithActionsWidget',
-        'rft/ui/QuestionWidget',
-        'rft/ui/Selector',
-        'rft/ui/SelectorThijs',
-        'rft/ui/LineWithActionsWidgetThijs',
-        'rft/ui/TitleGroup',
-        'dojo/domReady!'
-        ],function(parser){
-            parser.parse();
-        });
-</script>
-<script>
-function goToPage(name) {
-    window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
-}
-</script>
-</head>
-<body class="dijitReset claro">
-    <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-        <!-- Top menu bar -->
-        <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-            <h1>ResearchTool</h1>
-            <div data-dojo-type="rft.ui.MainMenu"></div>
-            <div class="breadcrumbs">
-                <span class="breadcrumb">User > </span>
-                <span class="breadcrumb">Session > </span>
-                <span class="breadcrumbCurrent">Survey A [editing]</span>
-            </div>
-        </div>
-        <!-- Main content window -->
-        <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
-                <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                    <h2>
-                        <span class="rftIcon rftIconSurvey"></span>
-                        <span class="headerText">Survey A [editing]</span>
-                    </h2>
-                </div>
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                        Presets
-                    </div>
-                    <div data-dojo-type="dijit.layout.TabContainer" class="blue" data-dojo-props="tabPosition:'left-h',region:'center'">
-                        <div data-dojo-type="dijit.layout.ContentPane" title="Category One, this is a very long title to see how overflow works. This part is cut off because it passes two lines at 200px wide.">
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                        </div>
-                        <div data-dojo-type="dijit.layout.ContentPane" title="Category Two">
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                        </div>
-                        <div data-dojo-type="dijit.layout.ContentPane" title="Category Three">
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                        </div>
-                        <div data-dojo-type="dijit.layout.ContentPane" title="Category Four">
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Green Question Subcat one'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat three'"></div>
-                        </div>
-                        <div data-dojo-type="dijit.layout.ContentPane" title="Category Five">
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat three'"></div>
-                            <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat four'"></div>
-                        </div>
-                    </div>
-                </div>
-                <!-- "Shopping cart" -->
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
-                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'top'">
-                        <h3>Included questions</h3>
-                    </div>
-                    <div data-dojo-type="rft.ui.List" data-dojo-props="region:'center'">
-                        <!-- These would have to be dynamically generated instead of declared here! -->
-                        <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question one', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, icon: 'Delete', modifiers:'white'}}}"></div>
-                        <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question two', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, icon: 'Delete', modifiers:'white'}}}"></div>
-                    </div>
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'bottom'">
-                        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconProperties'">Properties</button>
-                        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save Changes</button>
-                        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
-                        <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconPreview'">Design</button>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html	(revision 356)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Research Facilitator Tool</title>
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-    <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-    <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-    <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-    <script type="text/javascript">
-    require([
-        'dojo/parser',
-        'dijit/DropDownMenu',
-        'dijit/layout/AccordionContainer',
-        'dijit/layout/BorderContainer',
-        'dijit/layout/ContentPane',
-        'dijit/layout/TabContainer',
-        'dijit/layout/SplitContainer',
-        'dijit/MenuBar',
-        'dijit/MenuBarItem',
-        'dijit/form/Button',
-        'dijit/form/ComboBox',
-        'dijit/form/Form',
-        'dijit/form/Select',
-        'dijit/form/SimpleTextarea',
-        'dijit/form/TextBox',
-        'dijit/form/Textarea',
-        'dijit/PopupMenuBarItem',
-        'dijit/TitlePane',
-        'dojox/grid/DataGrid',
-        'dojox/widget/TitleGroup',
-        'rft/ui/List',
-        'rft/ui/MainMenu',
-        'rft/ui/MenuBarLink',
-        'rft/ui/MenuLink',
-        'rft/ui/Notifications',
-        'rft/ui/LineWithActionsWidget',
-        'rft/ui/QuestionWidget',
-        'rft/ui/Selector',
-        'rft/ui/SelectorThijs',
-        'rft/ui/LineWithActionsWidgetThijs',
-        'rft/ui/TitleGroup',
-        'rft/ui/SurveyEditorPreview',
-        'dojo/domReady!'
-        ],function(parser){
-            parser.parse();
-        });
-
-</script>
-</head>
-
-<body class="dijitReset claro blue">
-    <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-        <!-- Top menu bar -->
-        <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-            <h1>ResearchTool</h1>
-            <div data-dojo-type="rft.ui.MainMenu"></div>
-            <div class="breadcrumbs">
-                <span class="breadcrumb">User > </span>
-                <span class="breadcrumb">Session > </span>
-                <span class="breadcrumbCurrent">Survey A [Design]</span>
-            </div>
-        </div>
-        <!-- Main content window -->
-        <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
-                <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                    <h2>
-                        <span class="rftIcon rftIconSurvey"></span>
-                        <span class="headerText">Survey A [Design]</span>
-                    </h2>
-                </div>
-
-
-
-
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'left', design:'headline'" style="width: 300px;">
-                    <!-- Left toolbar -->
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                        <!--Accordion-->
-                        <div data-dojo-type="dijit.layout.AccordionContainer" class="blue">
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
-                                <div data-dojo-type="dojo.dnd.Source" id="toolkitSource" data-dojo-props="skipForm: true, accept:[], selfAccept: false, copyOnly: true, horizontal: false, singular: true">
-                                                       
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'bottom'"
-                    >                    <!--Buttons-->
-                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save</button>
-                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard</button>
-                    <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconUndo'">Exit Design</button>
-                </div>
-            </div>
-
-
-
-
-
-
-            <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                <div data-dojo-type="rft.ui.SurveyEditorPreview" data-dojo-id="SurveyEditorPreview">
-                    <!-- Center preview/editor -->
-                </div>
-
-                <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>
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/mockup.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mockup.html	(revision 356)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Research Facilitator Tool</title>
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dijit/themes/gamelab/gamelab.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/Grid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/grid/resources/claroGrid.css" />
-        <link rel="stylesheet" type="text/css" href="dojotoolkit/dojox/widget/Toaster/Toaster.css" />
-        <link rel="stylesheet" type="text/css" href="rft/css/main.css" />
-        <script type="text/javascript" src="dojotoolkit/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: false, tlmSiblingOfDojo: false, isDebug: true, baseUrl: '', packagePaths: {'dojotoolkit':['dojo','dijit', 'dojox'], '.':['rft']}"></script>
-        <script type="text/javascript">
-            require([
-                'dojo/parser',
-                'dijit/DropDownMenu',
-                'dijit/layout/AccordionContainer',
-                'dijit/layout/BorderContainer',
-                'dijit/layout/ContentPane',
-                'dijit/layout/TabContainer',
-                'dijit/layout/SplitContainer',
-                'dijit/MenuBar',
-                'dijit/MenuBarItem',
-                'dijit/form/Button',
-                'dijit/form/ComboBox',
-                'dijit/form/Form',
-                'dijit/form/Select',
-                'dijit/form/SimpleTextarea',
-                'dijit/form/TextBox',
-                'dijit/form/Textarea',
-                'dijit/PopupMenuBarItem',
-                'dijit/TitlePane',
-                'dojox/grid/DataGrid',
-                'dojox/widget/TitleGroup',
-                'rft/ui/List',
-                'rft/ui/MainMenu',
-                'rft/ui/MenuBarLink',
-                'rft/ui/MenuLink',
-                'rft/ui/Notifications',
-                'rft/ui/LineWithActionsWidget',
-                'rft/ui/QuestionWidget',
-                'rft/ui/Selector',
-                'rft/ui/SelectorThijs',
-                'rft/ui/LineWithActionsWidgetThijs',
-                'rft/ui/TitleGroup',
-                'dojo/domReady!'
-            ],function(parser){
-                parser.parse();
-            });
-        </script>
-    </head>
-    <body class="dijitReset claro">
-        <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-            <!-- Top menu bar -->
-            <div class="topbar" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                <h1>ResearchTool</h1>
-                <div data-dojo-type="dijit.MenuBar">
-                    <div data-dojo-type="dijit.MenuBarItem" class="rftMainMenuButton">Sessions</div>
-                    <div data-dojo-type="dijit.MenuBarItem" class="rftMainMenuButton">Content</div>
-                    <div data-dojo-type="dijit.MenuBarItem" class="rftMainMenuButton">Results</div>
-                    <div data-dojo-type="dijit.MenuBarItem" class="rftMainMenuButton">Log out</div>
-                </div>
-                <div class="breadcrumbs">
-                    <span class="breadcrumb">User > </span>
-                    <span class="breadcrumb">Session > </span>
-                    <span class="breadcrumbCurrent">Survey A [editing]</span>
-                </div>
-            </div>
-            <!-- Main content window -->
-            <div class="content" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'" style="height: 500px;">
-                    <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                        <h2>
-                            <span class="rftIcon rftIconSurvey"></span>
-                            <span class="headerText">Survey A [editing]</span>
-                        </h2>
-                    </div>
-                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-                        <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
-                            Presets
-                        </div>
-                        <div data-dojo-type="dijit.layout.TabContainer" class="blue" data-dojo-props="tabPosition:'left-h',region:'center'">
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Category One, this is a very long title to see how overflow works. This part is cut off because it passes two lines at 200px wide.">
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one', modifiers:'green'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two', modifiers: 'purple'"></div>
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Category Two">
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Category Three">
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Category Four">
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Green Question Subcat one'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat three'"></div>
-                            </div>
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Category Five">
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat one'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat two'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat three'"></div>
-                                <div data-dojo-type="rft.ui.SelectorThijs" data-dojo-props="Title:'Subcat four'"></div>
-
-                                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass:'rftIcon rftIconAccept'">Properties</button>
-                                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass:'rftIcon rftIconPreview'">Preview</button>
-                                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass:'rftIcon rftIconCancel'">Discard</button>
-                                <button data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass:'rftIcon rftIconAccept'">Accept changes</button>
-                            </div>
-                        </div>
-                    </div>
-                    <!-- "Shopping cart" -->
-                    <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'right'" style="width: 300px">
-                        <div data-dojo-type="rft.ui.List" data-dojo-props="region:'center'">
-                            <!-- These would have to be dynamically generated instead of declared here! -->
-                            <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question one', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, modifiers:'white'}}}"></div>
-                            <div data-dojo-type="rft.ui.LineWithActionsWidgetThijs" data-dojo-props="title:'Question two', actions: {'Cancel':{callback: function(){}, properties: {blockButton: false, modifiers:'white'}}}"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
Index: Dev/branches/rest-dojo-ui/client/rft/pages/session.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/pages/session.html	(revision 356)
+++ Dev/branches/rest-dojo-ui/client/rft/pages/session.html	(revision 357)
@@ -14,11 +14,11 @@
                     <fieldset class="align">
                         <label for="titleInput">Title:</label>
-                        <input type="text" id="titleInput" data-dojo-type="dijit.form.TextBox" data-dojo-props="placeHolder: 'Enter title here'" />
+                        <input type="text" data-rft-attach-point="titleInput" data-dojo-type="dijit.form.TextBox" data-dojo-props="placeHolder: 'Enter title here'" />
                         <br/>
                         <label for="descriptionInput">Description:</label>
-                        <textarea id="descriptionInput" rows="3" cols="54" data-dojo-type="dijit.form.SimpleTextarea" data-dojo-props="selectOnClick: true">This is the description in the info popups!</textarea>
+                        <textarea data-rft-attach-point="descriptionInput" rows="3" cols="54" data-dojo-type="dijit.form.SimpleTextarea" data-dojo-props="selectOnClick: true">This is the description in the info popups!</textarea>
                         <br/>
                         <label for="dateInput">Planned date:</label>
-                        <input type="text" id="dateInput" data-dojo-type="dijit.form.DateTextBox" required="true" />
+                        <input type="text" data-rft-attach-point="dateInput" data-dojo-type="dijit.form.DateTextBox" required="true" />
                     </fieldset>
 
@@ -35,6 +35,6 @@
                     </fieldset>
 
-                    <button id="btnPropertiesDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
-                    <button id="btnPropertiesSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save changes</button>
+                    <button data-rft-attach-point="btnPropertiesDiscard" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconCancel'">Discard changes</button>
+                    <button data-rft-attach-point="btnPropertiesSave" data-dojo-type="dijit.form.Button" data-dojo-props="baseClass: 'rftLargeButton', iconClass: 'rftIcon rftIconAccept'">Save changes</button>
 
 
Index: Dev/branches/rest-dojo-ui/client/rft/pages/sessions.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/rft/pages/sessions.html	(revision 356)
+++ Dev/branches/rest-dojo-ui/client/rft/pages/sessions.html	(revision 357)
@@ -8,5 +8,5 @@
         </div>
         <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-            <div data-dojo-type="dijit.layout.TabContainer" class="green" data-dojo-props="tabPosition:'left-h',region:'center'" id="tabs">
+            <div data-dojo-type="dijit.layout.TabContainer" class="green" data-dojo-props="tabPosition:'left-h',region:'center'">
                 <div data-dojo-type="dijit.layout.BorderContainer" title="Templates">
                     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region: 'center'" data-rft-attach-point="containerTemplates">
