Changeset 2022

Timestamp:

Sep 17, 2013, 2:46:12 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #500: Plugin configurations should be grouped below their plug-ins

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/admin/install.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (1 diff)

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

@@ -92 +92 @@
     }
     
-    if (lastItemType != check.itemType)
+    var sameSection = lastItemType == check.itemType;
+    // Do not start new section when switching between plugin definition and configuration
+    if (!sameSection) sameSection = lastItemType == 'PLUGINDEFINITION' && check.itemType == 'PLUGINCONFIGURATION';
+    if (!sameSection) sameSection = lastItemType == 'PLUGINCONFIGURATION' && check.itemType == 'PLUGINDEFINITION';
+    if (!sameSection)
     {
       html += first10;
@@ -125 +129 @@
     }
     
-    var line = '<tr class="sameitemtype highlight">';
+    var line = '<tr class="sameitemtype highlight '+check.itemType+'">';
     lastItemType = check.itemType;
     var name = check.name;
@@ -266 +270 @@
 }
 
+.report .sameitemtype.PLUGINCONFIGURATION > td:first-child
+{
+  padding-left: 2.5em;
+  font-style: italic;
+}
+
 .report td 
 {

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

@@ -355 +355 @@
         // Plugin definitions and configurations
         jsonChecks.add(checkPlugin(dc, CaliperSampleNameExporter.class, effectiveOptions, createIfMissing));
+
         jsonChecks.add(checkPlugin(dc, CaliperRunParametersExporter.class, effectiveOptions, createIfMissing));
-        jsonChecks.add(checkPlugin(dc, CaliperLibPrepParametersExporter.class, effectiveOptions, createIfMissing));
-        jsonChecks.add(checkPlugin(dc, QubitSampleNameExporter.class, effectiveOptions, createIfMissing));
-        jsonChecks.add(checkPlugin(dc, FlowCellSampleSheetExporter.class, effectiveOptions, createIfMissing));
-        
         jsonChecks.add(checkPluginConfiguration(dc, CaliperRunParametersExporter.class, "Standard sensitivity", effectiveOptions, createIfMissing));
         jsonChecks.add(checkPluginConfiguration(dc, CaliperRunParametersExporter.class, "High sensitivity", effectiveOptions, createIfMissing));
+
+        jsonChecks.add(checkPlugin(dc, CaliperLibPrepParametersExporter.class, effectiveOptions, createIfMissing));
         jsonChecks.add(checkPluginConfiguration(dc, CaliperLibPrepParametersExporter.class, "HT DNA 1K Ver2 (96)", effectiveOptions, createIfMissing));
         jsonChecks.add(checkPluginConfiguration(dc, CaliperLibPrepParametersExporter.class, "HT DNA 1K Ver2 (384)", effectiveOptions, createIfMissing));
 
+        jsonChecks.add(checkPlugin(dc, QubitSampleNameExporter.class, effectiveOptions, createIfMissing));
+        
+        jsonChecks.add(checkPlugin(dc, FlowCellSampleSheetExporter.class, effectiveOptions, createIfMissing));
         jsonChecks.add(checkPluginConfiguration(dc, FlowCellSampleSheetExporter.class, "SCAN-B 2x50", effectiveOptions, createIfMissing));