Changeset 1538 for extensions/net.sf.basedb.reggie/trunk/resources/refform.jsp

Timestamp:

Feb 21, 2012, 1:49:04 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #354: Changes related to new GUI in BASE 3.1

This should fix most of the issues related to the GUI differences between BASE 3.0 and 3.1. Reggie should display just fine in both versions. This is solved by:

• Including all icons needed by Reggie in the Reggie distribution. We don't have to worry about the GIF vs. PNG issue.
• Mainly designing Reggie for BASE 3.1 and then applying an extra stylesheet with a minial set of styles to make Reggie also work in BASE 3.0. The style sheet is only used if Reggie is installed on a BASE 3.0 server so it should not interfere with BASE 3.1 and up.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/refform.jsp (modified) (10 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/refform.jsp

@@ -11 +11 @@
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
+  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
   import="net.sf.basedb.util.Values"
   import="java.util.List"
@@ -20 +21 @@
 final String ID = sc.getId();
 final float scale = Base.getScale(sc);
+final String home = ExtensionsControl.getHomeUrl("net.sf.basedb.reggie");
 DbControl dc = null;
 try
@@ -38 +40 @@
 <base:page type="default" >
 <base:head scripts="ajax.js" styles="path.css">
-  <link rel="stylesheet" type="text/css" href="reggie.css">
+  <link rel="stylesheet" type="text/css" href="css/reggie.css">
+  <%
+  if (Application.getMajorVersion() == 3 && Application.getMinorVersion() == 0)
+  {
+    %>
+    <link rel="stylesheet" type="text/css" href="css/base30.css">
+    <%
+  }
+  %>
   <script language="JavaScript" src="reggie.js" type="text/javascript" charset="UTF-8"></script>
 
@@ -158 +168 @@
     {
       html += '<tr><td colspan="2" class="summary" onclick="showHide(\'alreadyLinked\')" title="Click to show/hide details">';
-      html += '<img src="../../images/show_section.gif" id="alreadyLinkedImg">';
+      html += '<img src="images/show_section.png" id="alreadyLinkedImg">';
       html += numAlreadyLinked + ' file(s) was already linked to a case</td></tr>\n';
       html += '<tbody id="alreadyLinked" style="display: none;">' + htmlAlreadyLinked + "</tbody>";
@@ -165 +175 @@
     {
       html += '<tr><td colspan="2" class="summary" onclick="showHide(\'linkCreated\')" title="Click to show/hide details">';
-      html += '<img src="../../images/hide_section.gif" id="linkCreatedImg">';
+      html += '<img src="images/hide_section.png" id="linkCreatedImg">';
       html += numLinkedNow + ' file(s) linked to a case</td></tr>\n';
       html += '<tbody id="linkCreated">' + htmlLinkedNow + "</tbody>";
@@ -172 +182 @@
     {
       html += '<tr><td colspan="2" class="summary" onclick="showHide(\'notLinked\')" title="Click to show/hide details">';
-      html += '<img src="../../images/hide_section.gif" id="notLinkedImg">';
+      html += '<img src="images/hide_section.png" id="notLinkedImg">';
       html += numNotLinked + ' file(s) could not be linked</td></tr>\n';
       html += '<tbody id="notLinked">' + htmlNotLinked + "</tbody>";
@@ -187 +197 @@
   Main.showHide(sectionId); 
   var img = document.getElementById(sectionId + 'Img');
-  img.src = img.src.indexOf('show') > 0 ? '../../images/hide_section.gif' : '../../images/show_section.gif';
+  img.src = img.src.indexOf('show') > 0 ? 'images/hide_section.png' : 'images/show_section.png';
 }
 </script>
@@ -230 +240 @@
 <base:body onload="init()">
 
-  <p:path style="margin-top: 20px; margin-bottom: 10px;">
-    <p:pathelement title="Reggie" href="<%="index.jsp?ID="+ID%>" />
-    <p:pathelement title="Referral form registration" />
-  </p:path>
-
+  <p:path><p:pathelement 
+    title="Reggie" href="<%="index.jsp?ID="+ID%>" 
+    /><p:pathelement title="Referral form registration"
+    /></p:path>
+  <div class="content">
   <%
   if (sc.getActiveProjectId() == 0)
   {
     %>
-    <base:note type="warning" style="width: 800px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
+    <div class="messagecontainer note" style="width: 800px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
       No project has been selected. You may proceed with the registration but 
       created items will not be shared.
-    </base:note>
+    </div>
     <%
   }
@@ -302 +312 @@
   </div>
 
-  <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
+  <div class="messagecontainer error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
 
   <div id="done" class="success" style="display: none; width: 800px; margin-left: 20px; margin-top: 20px;"></div>
@@ -309 +319 @@
   <tr>
     <td><base:button id="gocancel" title="Cancel" onclick="goRestart(false)" style="display: none;"/></td>
-    <td><base:button id="goprocess" title="Process" image="gonext.gif" onclick="goProcess()" 
+    <td><base:button id="goprocess" title="Process" image="<%=home+"/images/gonext.png"%>" onclick="goProcess()" 
       tooltip="Process the files in the selected directory"/></td>
-    <td><base:button id="gorestart" title="Restart" image="goback.gif" onclick="goRestart(true)" style="display: none;"/></td>
+    <td><base:button id="gorestart" title="Restart" image="<%=home+"/images/goback.png"%>" onclick="goRestart(true)" style="display: none;"/></td>
     <td id="gonext.message" class="message"></td>
   </tr>
   </table>
   </form>
+  </div>
   
 </base:body>