Changeset 5970 for trunk/www/my_base/index.jsp

Timestamp:

Feb 17, 2012, 9:55:56 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1655: GUI improvements

Avoid line-wrapping of message titles on home/login page. Reduce unused space in the menu.

File:

• trunk/www/my_base/index.jsp (modified) (10 diffs)

trunk/www/my_base/index.jsp

@@ -198 +198 @@
   <div class="absolutefull" style="width: 50%;">
   
-    <div class="absolutefull" style="left: 1em; right: 0.5em; bottom: <%=hasHelp ? "15em" : "1em" %>;">
+    <div class="absolutefull" style="left: 1em; right: 0.5em; bottom: <%=hasHelp ? "16em" : "1em" %>;">
 
     <div class="absolutefull" style="height: 50%;">
@@ -269 +269 @@
         String broadcastMessage = (String)application.getAttribute("broadcast.message");
         %>
-        <div class="item"><base:icon image="warning.png" />
-          <span class="date"><%=dateFormatter.format(new Date())%></span>
-          <span class="headline"><%=HTML.encodeTags(broadcastTitle)%></span><br>
-          <span class="text"><%=HTML.niceFormat(broadcastMessage)%></span>
+        <div class="item">
+          <div class="headline">
+            <base:icon image="warning.png" />
+            <span class="date"><%=dateFormatter.format(new Date())%></span>
+            <%=HTML.encodeTags(broadcastTitle)%>
+          </div>
+          <div class="text"><%=HTML.niceFormat(broadcastMessage)%></div>
         </div>
         <% 
@@ -287 +290 @@
         {
           String fullName = m.getName();
-          String shortName = Values.trimString(fullName, 50);
           String text = Values.trimString(m.getDescription(), 100);
           %>
           <div class="item">
-            <a href="javascript:viewMessage(<%=m.getId()%>)"
-              title="<%=HTML.encodeTags(fullName)%>">
-            <span class="date"><%=dateTimeFormatter.format(m.getTimeSent())%></span>
-            <span class="headline"><%=HTML.encodeTags(shortName)%></span></a><br>
-            <span class="text"><%=HTML.encodeTags(text)%></span>
+            <div class="headline">
+              <a href="javascript:viewMessage(<%=m.getId()%>)" title="<%=HTML.encodeTags(fullName)%>">
+              <span class="date"><%=dateTimeFormatter.format(m.getTimeSent())%></span>
+              <%=HTML.encodeTags(fullName)%></a>
+            </div>
+            <div class="text"><%=HTML.encodeTags(text)%></div>
           </div>
           <%
@@ -309 +312 @@
   {
     %>
-    <div class="absolutefull" style="left: 1em; right: 0.5em; top: auto; height: 13em; bottom: 1em; ">
+    <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" />Help</h3>
@@ -318 +321 @@
       {
         %>
-        <a href="<%=help%>" target="Help"><base:icon image="bullet.png" />Help&hellip;</a><br>
+        <a href="<%=help%>" target="Help"><base:icon image="bullet.png" />&nbsp;Help&hellip;</a><br>
         <%
       }
@@ -326 +329 @@
       {
         %>
-        <a href="<%=faq%>" target="FAQ"><base:icon image="bullet.png" />Frequently asked questions&hellip;</a><br>
+        <a href="<%=faq%>" target="FAQ"><base:icon image="bullet.png" />&nbsp;Frequently asked questions&hellip;</a><br>
         <%
       }
@@ -334 +337 @@
       {
         %>
-        <a href="<%=reportBug%>" target="ReportBug"><base:icon image="bug.png" />Report a bug&hellip;</a><br>
+        <a href="<%=reportBug%>" target="ReportBug"><base:icon image="bug.png" />&nbsp;Report a bug&hellip;</a><br>
         <%
       }
@@ -347 +350 @@
   <div class="absolutefull" style="width: 50%; left: auto;">
   
-    <div class="absolutefull" style="left: 0.5em; right: 1em; bottom: 15em;">
+    <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" />News and announcements (<%=news.size()%>) 
@@ -378 +381 @@
             %>
             <div class="item">
-              <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
-              <span class="headline"><%=HTML.encodeTags(n.getName())%></span><br>
-              <span class="text"><%=HTML.niceFormat(n.getDescription())%></span>
+              <div class="headline">
+                <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
+                <%=HTML.encodeTags(n.getName())%>
+              </div>
+              <div class="text"><%=HTML.niceFormat(n.getDescription())%></div>
             </div>
             <%
@@ -389 +394 @@
     </div>
   
-    <div class="absolutefull" style="left: 0.5em; right: 1em; top: auto; height: 13em; bottom: 1em;">
+    <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" />Disk usage</h3>