Changeset 6613

Timestamp:

Nov 21, 2014, 12:47:22 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1890: Improve skinnability of BASE

Minor adjustments.

Location:

trunk/www

Files:

• admin/itemsubtypes/edit_subtype.jsp (modified) (1 diff)
• include/scripts/joust-2.js (modified) (2 diffs)
• include/scripts/main-2.js (modified) (1 diff)
• include/styles/joust-2.css (modified) (6 diffs)
• include/styles/login.css (modified) (2 diffs)
• include/styles/main.css (modified) (1 diff)
• include/styles/menu.css (modified) (1 diff)
• include/styles/path.css (modified) (2 diffs)
• main.jsp (modified) (1 diff)
• my_base/index.jsp (modified) (6 diffs)

trunk/www/admin/itemsubtypes/edit_subtype.jsp

@@ -295 +295 @@
         </table>
       </div>
-      <div id="filetypes.disabled" style="display: none; border: 1px solid transparent;">
+      <div id="filetypes.disabled" class="bg-filled-50" style="height: 100%; display: none; border: 1px solid transparent;">
         <div class="messagecontainer error"></div>
       </div>

trunk/www/include/scripts/joust-2.js

@@ -245 +245 @@
     
     // Create main menu <div> container
-    var menuElement = internal.makeDiv(menuItem.id, 'menuitem', pad);
+    var menuElement = internal.makeDiv(menuItem.id, 'joustitem', pad);
     menuElement.item = menuItem;
     if (menuItem.className) menuElement.className += ' ' + menuItem.className;
@@ -270 +270 @@
     
     // Menu text
-    var text = internal.makeDiv(menuItem.id+'-text', 'text', menuItem.text);
+    var text = internal.makeDiv(menuItem.id+'-text', 'text interactable', menuItem.text);
     if (menuItem.tooltip) text.title = menuItem.tooltip;
     menuElement.appendChild(text);

trunk/www/include/scripts/main-2.js

@@ -1956 +1956 @@
     controllers['HARDWARE'] = { url:'admin/hardware/index.jsp', width:800, height:500 };
     controllers['HELP'] = { url:'admin/clients/help/index.jsp', width:600, height:400, noAnyToAny:true };
-    controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:600, height:400 };
+    controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:690, height:460 };
     controllers['JOB'] = { url:'views/jobs/index.jsp', width:750, height:500, popup:true, edit:false };
     controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:600, height:400 };

trunk/www/include/styles/joust-2.css

@@ -34 +34 @@
 
 /* Main div tag for menuitem */
-.joust .menuitem
+.joust .joustitem
 {
   height: 1.65em;
@@ -42 +42 @@
 
 /* Child div tags for holding padding, outline, icon and text */
-.joust .menuitem > div
+.joust .joustitem > div
 {
   height: 100%;
@@ -51 +51 @@
 
 /* Text part of the menu entry */
-.joust .menuitem .text
+.joust .joustitem .text
 {
-  border: 2px solid transparent;
+  padding: 2px;
   border-radius: 4px;
   height: auto;
@@ -59 +59 @@
 
 /* Show border around the text when hovering over the menu entry */
-.joust .menuitem:hover .text 
+.joust .joustitem .text:hover 
 {
   cursor: pointer;
-  border: 2px solid #2288AA;
+  border-width: 2px;
+  padding: 0; 
 }
 
 /* A selected menu item is highlighted */
-.joust .menuitem.selected 
+.joust .joustitem.selected 
 {
   font-weight: bold;
 }
-.joust .menuitem.selected .text
+.joust .joustitem.selected .text
 {
   color: #FFFFFF;
@@ -77 +78 @@
 
 /* Used while lazy-loading child items */
-.joust .menuitem.working
+.joust .joustitem.working
 {
   cursor: progress;
@@ -83 +84 @@
 
 /* Padding is either empty or a vertical dotted line */
-.joust .menuitem .pad
+.joust .joustitem .pad
 {
   width: 18px;
 }
-.joust .menuitem .pad.line
+.joust .joustitem .pad.line
 {
   background-image: url('../../images/joust/line.png');

trunk/www/include/styles/login.css

@@ -35 +35 @@
   margin: 0em 0px 0px 0px;
   padding: 1px 4px 1px 4px;
-  border: 0px;
+  border-width: 0;
   background-color: #224488;
   background-image: url('backgrounds/popup_h1.png');
@@ -144 +144 @@
 }
 
+h3 img
+{
+  margin-right: 3px;
+}
+

trunk/www/include/styles/main.css

@@ -481 +481 @@
 
 /* Regular text-field controls + selection list */
-input, textarea, select, .input
+input, textarea, select, .interactable.input
 {
   /* content-box, otherwise the content will jump around when we modify border */

trunk/www/include/styles/menu.css

@@ -55 +55 @@
 }
 
-.menu.horizontal .menuitem.enabled:hover 
+.menu.horizontal .menuitem.interactable:hover 
 {
   border-width: 2px;

trunk/www/include/styles/path.css

@@ -27 +27 @@
 */
 
-h1.path 
+.path 
 {}
 
-h1.path .pathelement:before
+.pathelement:before
 {
   content: '›';
@@ -38 +38 @@
 }
 
-h1.path .pathelement:first-child:before
+.pathelement:first-child:before
 {
   content: '';

trunk/www/main.jsp

@@ -132 +132 @@
       }
       %>
-      <table style="width: 100%; margin-top: 1em;">
+      <table style="width: 100%; margin-top: 1em; border-collapse: separate;">
       <tr>
         <td class="base-logo"></td>

trunk/www/my_base/index.jsp

@@ -192 +192 @@
 
     <div class="absolutefull" style="height: 50%;">
-      <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
-        <h3 style="height: 100%;"><base:icon image="project.png" style="margin-right: 3px;" />Projects (<%=projects.size()%>)</h3>
-      </div>
-      <div id="projectsSection" class="absolutefull welcomesection" style="top: 1.75em; bottom: 0.5em;">
+      <div class="absolutefull" style="height: 2em; overflow: hidden;">
+        <h3 style="height: 100%;"><base:icon image="project.png" />Projects (<%=projects.size()%>)</h3>
+      </div>
+      <div id="projectsSection" class="absolutefull welcomesection" style="top: 2em; bottom: 0.5em;">
       <%
       if (projects.size() == 0)
@@ -251 +251 @@
 
     <div class="absolutefull" style="height: 50%; top: auto;">
-      <div class="absolutefull" style="height: 1.75em; top: 0.5em; overflow: hidden;">
-        <h3 style="height: 100%;"><base:icon image="message.png" style="margin-right: 3px;" />New messages (<%=messages.size()%>)</h3>
-      </div>
-      <div id="messagesSection" class="absolutefull news welcomesection" style="top: 2.25em;">
+      <div class="absolutefull" style="height: 2em; top: 0.5em; overflow: hidden;">
+        <h3 style="height: 100%;"><base:icon image="message.png" />New messages (<%=messages.size()%>)</h3>
+      </div>
+      <div id="messagesSection" class="absolutefull news welcomesection" style="top: 2.5em;">
       <%
       String broadcastTitle = (String)application.getAttribute("broadcast.title");
@@ -307 +307 @@
     %>
     <div class="absolutefull" style="left: 1em; right: 0.5em; top: auto; height: 14em; bottom: 1em; ">
-      <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
-      <h3 style="height: 100%;"><base:icon image="help.png" style="margin-right: 3px;" />Help</h3>
-      </div>
-      <div id="helpSection" class="absolutefull welcomesection" style="top: 1.75em;">
+      <div class="absolutefull" style="height: 2em; overflow: hidden;">
+      <h3 style="height: 100%;"><base:icon image="help.png" />Help</h3>
+      </div>
+      <div id="helpSection" class="absolutefull welcomesection" style="top: 2em;">
       <%
       if (help != null)
@@ -345 +345 @@
   
     <div class="absolutefull" style="left: 0.5em; right: 1em; bottom: 16em;">
-      <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
-      <h3 style="height: 100%;"><base:icon image="news.png" style="margin-right: 3px;"/>News and announcements (<%=news.size()%>) 
+      <div class="absolutefull" style="height: 2em; overflow: hidden;">
+      <h3 style="height: 100%;"><base:icon image="news.png" />News and announcements (<%=news.size()%>) 
         <%
         if (RssNewsFeed.isEnabled()) 
@@ -358 +358 @@
       </h3>
       </div>
-      <div id="newsSection" class="absolutefull news welcomesection" style="top: 1.75em;">
+      <div id="newsSection" class="absolutefull news welcomesection" style="top: 2em;">
         <%
         if (news.size() == 0)
@@ -386 +386 @@
   
     <div class="absolutefull" style="left: 0.5em; right: 1em; top: auto; height: 14em; bottom: 1em;">
-      <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
-      <h3 style="height: 100%;"><base:icon image="diskusage.png" style="margin-right: 3px;"/>Disk usage</h3>
-      </div>
-      <div id="quotaSection" class="absolutefull welcomesection" style="top: 1.75em;">
+      <div class="absolutefull" style="height: 2em; overflow: hidden;">
+      <h3 style="height: 100%;"><base:icon image="diskusage.png" />Disk usage</h3>
+      </div>
+      <div id="quotaSection" class="absolutefull welcomesection" style="top: 2em;">
       <%
       if (quotaGroup != null)