Changeset 2022


Ignore:
Timestamp:
Sep 17, 2013, 2:46:12 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/admin/install.jsp

    r1915 r2022  
    9292    }
    9393   
    94     if (lastItemType != check.itemType)
     94    var sameSection = lastItemType == check.itemType;
     95    // Do not start new section when switching between plugin definition and configuration
     96    if (!sameSection) sameSection = lastItemType == 'PLUGINDEFINITION' && check.itemType == 'PLUGINCONFIGURATION';
     97    if (!sameSection) sameSection = lastItemType == 'PLUGINCONFIGURATION' && check.itemType == 'PLUGINDEFINITION';
     98    if (!sameSection)
    9599    {
    96100      html += first10;
     
    125129    }
    126130   
    127     var line = '<tr class="sameitemtype highlight">';
     131    var line = '<tr class="sameitemtype highlight '+check.itemType+'">';
    128132    lastItemType = check.itemType;
    129133    var name = check.name;
     
    266270}
    267271
     272.report .sameitemtype.PLUGINCONFIGURATION > td:first-child
     273{
     274  padding-left: 2.5em;
     275  font-style: italic;
     276}
     277
    268278.report td
    269279{
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r2021 r2022  
    355355        // Plugin definitions and configurations
    356356        jsonChecks.add(checkPlugin(dc, CaliperSampleNameExporter.class, effectiveOptions, createIfMissing));
     357
    357358        jsonChecks.add(checkPlugin(dc, CaliperRunParametersExporter.class, effectiveOptions, createIfMissing));
    358         jsonChecks.add(checkPlugin(dc, CaliperLibPrepParametersExporter.class, effectiveOptions, createIfMissing));
    359         jsonChecks.add(checkPlugin(dc, QubitSampleNameExporter.class, effectiveOptions, createIfMissing));
    360         jsonChecks.add(checkPlugin(dc, FlowCellSampleSheetExporter.class, effectiveOptions, createIfMissing));
    361        
    362359        jsonChecks.add(checkPluginConfiguration(dc, CaliperRunParametersExporter.class, "Standard sensitivity", effectiveOptions, createIfMissing));
    363360        jsonChecks.add(checkPluginConfiguration(dc, CaliperRunParametersExporter.class, "High sensitivity", effectiveOptions, createIfMissing));
     361
     362        jsonChecks.add(checkPlugin(dc, CaliperLibPrepParametersExporter.class, effectiveOptions, createIfMissing));
    364363        jsonChecks.add(checkPluginConfiguration(dc, CaliperLibPrepParametersExporter.class, "HT DNA 1K Ver2 (96)", effectiveOptions, createIfMissing));
    365364        jsonChecks.add(checkPluginConfiguration(dc, CaliperLibPrepParametersExporter.class, "HT DNA 1K Ver2 (384)", effectiveOptions, createIfMissing));
    366365
     366        jsonChecks.add(checkPlugin(dc, QubitSampleNameExporter.class, effectiveOptions, createIfMissing));
     367       
     368        jsonChecks.add(checkPlugin(dc, FlowCellSampleSheetExporter.class, effectiveOptions, createIfMissing));
    367369        jsonChecks.add(checkPluginConfiguration(dc, FlowCellSampleSheetExporter.class, "SCAN-B 2x50", effectiveOptions, createIfMissing));
    368370
Note: See TracChangeset for help on using the changeset viewer.