Index: Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html
===================================================================
--- Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html	(revision 349)
+++ Dev/branches/rest-dojo-ui/client/mSurveyAdvanced.html	(revision 354)
@@ -43,4 +43,5 @@
         'rft/ui/LineWithActionsWidgetThijs',
         'rft/ui/TitleGroup',
+        'rft/ui/SurveyEditorPreview',
         'dojo/domReady!'
         ],function(parser){
@@ -48,11 +49,8 @@
         });
 
-function goToPage(name) {
-    window.location = "http://localhost/RESEARCHTOOL/Dev/branches/rest-dojo-ui/client/"+name+".html";
-}
 </script>
 </head>
 
-<body class="dijitReset claro">
+<body class="dijitReset claro blue">
     <div class="page" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
         <!-- Top menu bar -->
@@ -76,39 +74,42 @@
                 </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="orange">
-                            <div data-dojo-type="dijit.layout.ContentPane" title="Included questions" data-dojo-props="iconClass: 'rftIcon rftIconQuestion'">
-                                <div data-dojo-type="rft.ui.List">
-                                    <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>
-                                    <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>
-                                    <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>
-                                    <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>
+                        <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 data-dojo-type="dijit.layout.ContentPane" title="Content" data-dojo-props="iconClass:'rftIcon rftIconPlus'">
-                                <!-- Content objects here -->
                             </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 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>
 
-                <div data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="region:'center'">
-                    <!-- Center preview/editor -->
-                    <div class="QuestionEditor">
-                        <div class="PreviewWindow">Content here</div>
-                    </div>
-                </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>
