Changeset 1309 for extensions/net.sf.basedb.reggie/trunk/resources/install.jsp

Timestamp:

Mar 4, 2011, 1:58:17 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #292: Check/create annotation types, etc. required by reggie

• Added warning-level messages.
• Added check for active project.
• Always do all checks for annotation types.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/install.jsp (modified) (7 diffs)

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

@@ -48 +48 @@
   
   var numMissing = 0;
+  var numWarnings = 0;
   var numErrors = 0;
   var checks = response.checks;
@@ -56 +57 @@
   {
     var check = checks[i];
-    var icon = check.status == 'ok' ? 'ok.gif' : 'error.gif';
-    if (check.status == 'missing') numMissing++;
-    if (check.status == 'error') numErrors++;
+    var icon = 'ok.gif';
+    if (check.status == 'missing') 
+    {
+      numMissing++;
+      icon = 'error.gif';
+    }
+    if (check.status == 'error') 
+    {
+      numErrors++;
+      icon = 'error.gif';
+    }
+    if (check.status == 'warning') 
+    {
+      numWarnings++;
+      icon = 'warning.gif';
+    }
     if (lastItemType != check.itemType)
     {
-      html += '<tr class="newitemtype"><td>'+check.itemType+'</td>';
+      html += '<tr class="newitemtype" valign="top"><td>'+check.itemType+'</td>';
     }
     else
     {
-      html += '<tr><td>&nbsp;</td>';
+      html += '<tr class="sameitemtype" valign="top"><td>&nbsp;</td>';
     }
     lastItemType = check.itemType;
-    html += '<td><div class="link" onclick="itemOnClick(event, \''+check.itemType+'\','+check.id+')"';
-    html += ' title="View this item (use CTRL, ALT or SHIFT to edit)">'+check.name+'</div></td>';
-    html += '<td><img src="../../images/'+icon+'"></td>';
-    html += '<td>'+check.message+'</td>';
-    html += '</tr>';
+    if (check.id)
+    {
+      html += '<td><div class="link" onclick="itemOnClick(event, \''+check.itemType+'\','+check.id+')"';
+      html += ' title="View this item (use CTRL, ALT or SHIFT to edit)">'+check.name+'</div></td>';
+    }
+    else
+    {
+      html += '<td><i>' + check.name + '</i></td>';
+    }
+    html += '<td><img src="../../images/'+icon+'"></td><td>';
+    if (check.messages.length > 1)
+    {
+      for (var m = 0; m < check.messages.length; m++)
+      {
+        html += '• '+check.messages[m] + '<br>';
+      }
+    }
+    else
+    {
+      html += check.messages;
+    }
+    html += '</td></tr>';
   }
   html += '</table>';
@@ -81 +112 @@
   {
     setFatalError(numErrors+' errors was detected. You need to fix those manually.'); 
+  }
+  else if (numWarnings > 0)
+  {
+    setWarningMessage(numWarnings+' warnings was detected. Reggie may still work. If not, you need to fix it manually.'); 
   }
   Main.showHide('createMissingItems', numMissing > 0);  
@@ -96 +131 @@
   setInnerHTML('errorMessage', message);
   Main.show('errorMessage');
+}
+
+function setWarningMessage(message)
+{
+  setInnerHTML('warningMessage.message', message);
+  Main.show('warningMessage');
 }
 
@@ -143 +184 @@
 .report .newitemtype td
 {
-  border-top: 1px  solid #999999;
+  border-top: 1px solid #999999;
+}
+.report .sameitemtype td
+{
+  border-top: 1px dotted #cccccc;
 }
 
@@ -156 +201 @@
 
   <div id="validationResult" style="margin-left: 20px;">Checking; please wait...</div>
-
-  <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
 
   <div id="createMissingItems" style="display:none; margin-left: 20px; margin-top: 10px;">
@@ -165 +208 @@
   </div>
 
+  <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
+
+  <base:note id="warningMessage" type="warning" style="display: none; width: 800px; margin-left: 20px; margin-top: 20px;"><div id="warningMessage.message"></div></base:note>
+
   <pre>
   <div id="debug"></div>