Changeset 344 for Dev/branches/rest-dojo-ui/client/rft/ui/templates

Timestamp:

06/20/12 19:07:01 (13 years ago)

Author:

tjcschipper

Message:

• mSessions.html is more or less done
• mMenu.html is nearly done, still needs non-hover overlays on the menu boxes/buttons
• Fixed theme dependency, style overrides now work on a stock copy of Dojo claro theme!
• Improved iconset alignment somewhat, still needs pixel tweaks to rftIcons24.png and rftIcons16.png (Icons are sometimes 1px too wide!)
• Fixed MainMenu? template and applied styling classes. Replaced markup version with rft.ui.MainMenu? version in all mockups.
• Fixed colour settings/context on LineWithButtons?

Location:

Dev/branches/rest-dojo-ui/client/rft/ui/templates

Files:

• MainMenu.html (modified) (2 diffs)
• ObjectBox.html (added)
• SessionBar.html (added)

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

@@ -1 +1 @@
 <div class="mainMenu">
     <div  data-dojo-type="dijit.MenuBar">
-        <div data-dojo-type="dijit.MenuBarItem" data-dojo-props="disabled: true">Research Facilitator Tool</div>
-        <div data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'sessions'">Sessions</div>
-        <div data-dojo-type="dijit.PopupMenuBarItem">
+        <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'sessions'">Sessions</div>
+        <div class="rftMainMenuButton" data-dojo-type="dijit.PopupMenuBarItem">
             <span>Content</span>
             <div data-dojo-type="dijit.DropDownMenu">
@@ -12 +11 @@
             </div>
         </div>
-        <div data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'results'">Results</div>
-        <div data-dojo-type="dijit.MenuBarItem" id="loginMenu" style="float:right;">Login/Register</div>
+        <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" data-dojo-props="pageId:'results'">Results</div>
+        <div class="rftMainMenuButton" data-dojo-type="rft.ui.MenuBarLink" id="loginMenu">Logout</div>
     </div>
 </div>