Changeset 1463 for extensions/net.sf.basedb.reggie/trunk/resources

Timestamp:

Nov 14, 2011, 2:07:58 PM (11 years ago)

Author:

Martin Svensson

Message:

Merging trunk with branch 2.0

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• . (modified) (1 prop)
• resources/install.jsp (modified) (6 diffs)

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

@@ -53 +53 @@
   var numWarnings = 0;
   var numErrors = 0;
+  var numIncomplete = 0;
   var checks = response.checks;
   var html = '<table border="0" cellpadding="0" cellspacing="0" class="report">';
@@ -66 +67 @@
       icon = 'error.gif';
     }
+    if (check.status == 'incomplete')
+    {
+      numIncomplete++;
+      icon = 'warning.gif';
+    }
     if (check.status == 'error') 
     {
@@ -85 +91 @@
     }
     lastItemType = check.itemType;
+    var name = check.name;
+    if (check.mainType) name += ' <span class="itemsubtype">[' + check.mainType + ']</span>'; 
     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>';
+      html += ' title="View this item (use CTRL, ALT or SHIFT to edit)">'+name+'</div></td>';
     }
     else
     {
-      html += '<td><i>' + check.name + '</i></td>';
+      html += '<td><i>' + name + '</i></td>';
     }
     html += '<td><img src="../../images/'+icon+'"></td><td>';
@@ -120 +128 @@
     setWarningMessage(numWarnings+' warnings was detected. Reggie may still work. If not, you need to fix it manually.'); 
   }
-  Main.showHide('createMissingItems', numMissing > 0);  
-  
+  Main.showHide('createMissingItems', numMissing > 0);
+  Main.showHide('fixIncompleteItems', numMissing == 0 && numIncomplete > 0);
 }
 
@@ -145 +153 @@
 .report #itemTypeCol
 {
-  width: 150px;
+  width: 180px;
 }
 
@@ -198 +206 @@
   </div>
 
+  <div id="fixIncompleteItems" style="display:none; margin-left: 20px; margin-top: 10px;">
+    <table><tr><td>
+    <base:button title="Fix items" image="fixit.png" onclick="createMissingItems()"/>
+    </td></tr></table>
+  </div>
+
   <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>