Ignore:
Timestamp:
Nov 14, 2011, 2:07:58 PM (10 years ago)
Author:
Martin Svensson
Message:

Merging trunk with branch 2.0

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk

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

    r1342 r1463  
    5353  var numWarnings = 0;
    5454  var numErrors = 0;
     55  var numIncomplete = 0;
    5556  var checks = response.checks;
    5657  var html = '<table border="0" cellpadding="0" cellspacing="0" class="report">';
     
    6667      icon = 'error.gif';
    6768    }
     69    if (check.status == 'incomplete')
     70    {
     71      numIncomplete++;
     72      icon = 'warning.gif';
     73    }
    6874    if (check.status == 'error')
    6975    {
     
    8591    }
    8692    lastItemType = check.itemType;
     93    var name = check.name;
     94    if (check.mainType) name += ' <span class="itemsubtype">[' + check.mainType + ']</span>';
    8795    if (check.id)
    8896    {
    8997      html += '<td><div class="link" onclick="itemOnClick(event, \''+check.itemType+'\','+check.id+')"';
    90       html += ' title="View this item (use CTRL, ALT or SHIFT to edit)">'+check.name+'</div></td>';
     98      html += ' title="View this item (use CTRL, ALT or SHIFT to edit)">'+name+'</div></td>';
    9199    }
    92100    else
    93101    {
    94       html += '<td><i>' + check.name + '</i></td>';
     102      html += '<td><i>' + name + '</i></td>';
    95103    }
    96104    html += '<td><img src="../../images/'+icon+'"></td><td>';
     
    120128    setWarningMessage(numWarnings+' warnings was detected. Reggie may still work. If not, you need to fix it manually.');
    121129  }
    122   Main.showHide('createMissingItems', numMissing > 0); 
    123  
     130  Main.showHide('createMissingItems', numMissing > 0);
     131  Main.showHide('fixIncompleteItems', numMissing == 0 && numIncomplete > 0);
    124132}
    125133
     
    145153.report #itemTypeCol
    146154{
    147   width: 150px;
     155  width: 180px;
    148156}
    149157
     
    198206  </div>
    199207
     208  <div id="fixIncompleteItems" style="display:none; margin-left: 20px; margin-top: 10px;">
     209    <table><tr><td>
     210    <base:button title="Fix items" image="fixit.png" onclick="createMissingItems()"/>
     211    </td></tr></table>
     212  </div>
     213
    200214  <div class="error" id="errorMessage" style="display: none; width: 800px; margin-left: 20px; margin-bottom: 0px;"></div>
    201215
Note: See TracChangeset for help on using the changeset viewer.