Changeset 2486


Ignore:
Timestamp:
Jun 5, 2014, 11:21:28 AM (9 years ago)
Author:
olle
Message:

Refs #592. Lab environment extension updated in JSP files by removing warning if no BASE project has been selected, since this is not necessary for the lab environment extension functionality:

  1. JSP files in resources/reports/ updated in HTML section by removal of warning if no BASE project has been selected:
    a. labenvironmentalarms.jsp
    b. labenvironmentdatabasedisplay.jsp
    c. labenvironmentdatabaseeventpopup.jsp
    d. labenvironmentdatabaseexport.jsp
    e. labenvironmentdatabasestatistics.jsp
    f. labsensorinfo.jsp
Location:
extensions/net.sf.basedb.labenv/trunk/resources/reports
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labenvironmentalarms.jsp

    r2427 r2486  
    379379    <div id="y-guide" style="position: absolute; z-index: 99; display: none; background-color: #224488; height: 1px;"></div>
    380380    <div class="content">
    381     <%
    382     if (sc.getActiveProjectId() == 0)
    383     {
    384       %>
    385       <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    386         No project has been selected. You may proceed with the report generation but
    387         only your own items will be included in the report.
    388       </div>
    389       <%
    390     }
    391     %>
    392381 
    393382    <form name="labenv" onsubmit="return false;">

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labenvironmentdatabasedisplay.jsp

    r2465 r2486  
    765765    <div id="y-guide" style="position: absolute; z-index: 99; display: none; background-color: #224488; height: 1px;"></div>
    766766    <div class="content">
    767     <%
    768     if (sc.getActiveProjectId() == 0)
    769     {
    770       %>
    771       <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    772         No project has been selected. You may proceed with the report generation but
    773         only your own items will be included in the report.
    774       </div>
    775       <%
    776     }
    777     %>
    778767 
    779768    <form name="labenv" onsubmit="return false;">

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labenvironmentdatabaseeventpopup.jsp

    r2481 r2486  
    463463    <div id="y-guide" style="position: absolute; z-index: 99; display: none; background-color: #224488; height: 1px;"></div>
    464464    <div class="content">
    465     <%
    466     if (sc.getActiveProjectId() == 0)
    467     {
    468       %>
    469       <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    470         No project has been selected. You may proceed with the report generation but
    471         only your own items will be included in the report.
    472       </div>
    473       <%
    474     }
    475     %>
    476465 
    477466    <form name="labenv" onsubmit="return false;">

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labenvironmentdatabaseexport.jsp

    r2341 r2486  
    317317
    318318  <div class="content">
    319   <%
    320   if (sc.getActiveProjectId() == 0)
    321   {
    322     %>
    323     <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    324       No project has been selected. You may proceed with the export but
    325       it may no include all items.
    326     </div>
    327     <%
    328   }
    329   %>
    330319  <form name="labenv" onsubmit="return false;">
    331320 

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labenvironmentdatabasestatistics.jsp

    r2439 r2486  
    700700    <div id="y-guide" style="position: absolute; z-index: 99; display: none; background-color: #224488; height: 1px;"></div>
    701701    <div class="content">
    702     <%
    703     if (sc.getActiveProjectId() == 0)
    704     {
    705       %>
    706       <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    707         No project has been selected. You may proceed with the report generation but
    708         only your own items will be included in the report.
    709       </div>
    710       <%
    711     }
    712     %>
    713702 
    714703    <form name="labenv" onsubmit="return false;">

  • extensions/net.sf.basedb.labenv/trunk/resources/reports/labsensorinfo.jsp

    r2341 r2486  
    239239
    240240  <div class="content">
    241   <%
    242   if (sc.getActiveProjectId() == 0)
    243   {
    244     %>
    245     <div class="messagecontainer note" style="width: 950px; margin-left: 20px; margin-bottom: 20px; margin-right: 0px; font-weight: bold; color: #cc0000;">
    246       No project has been selected. You may proceed with the export but
    247       it may no include all items.
    248     </div>
    249     <%
    250   }
    251   %>
    252241  <form name="labenv" onsubmit="return false;">
    253242 
Note: See TracChangeset for help on using the changeset viewer.