Changeset 153

Show
Ignore:
Timestamp:
31-05-11 10:37:26 (3 years ago)
Author:
tjeerd@…
Message:

#46 is closed by this commit. Also some javascript is enhanced.

Location:
nugoctdwebapp
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • nugoctdwebapp/src/java/ctd/services/internal/Overview.java

    r147 r153  
    129129            strLine += "\t<td class=\"tdoverview\">"+data[2].toString()+"&nbsp;(<a href='#' onClick='showOverviewDetails(\""+(String)data[0]+"\")'>more info</a>)\n"; 
    130130            strLine += "</tr>\n"; 
    131             strLine += "<tbody id=\""+(String)data[0]+"HiddenRows\" style='visibility: collapse;'><tr><td class=\"tdoverview tdoverviewdetails\" colspan='4' id=\""+(String)data[0]+"Details\"><img src='./images/wait.gif' /></td></tr></tbody>\n"; 
     131            strLine += "<tbody id=\""+(String)data[0]+"HiddenRows\" style='display: none;'><tr><td class=\"tdoverview tdoverviewdetails\" colspan='4' id=\""+(String)data[0]+"Details\"><img src='./images/wait.gif' /></td></tr></tbody>\n"; 
    132132            lstRijen.add(strLine); 
    133133        } 
  • nugoctdwebapp/web/scripts/indexscripts.js

    r141 r153  
    11 function loadPage(page, div) { 
    2     strSep = "?"; 
     2    var strSep = "?"; 
    33    if(page.indexOf("?") != -1) { 
    44        strSep = "&"; 
  • nugoctdwebapp/web/scripts/overviewscripts.js

    r150 r153  
    22 
    33function showOverviewDetails(assay) { 
    4     nowopen = overviewdetail; 
     4    var nowopen = overviewdetail; 
    55    closeOverviewDetails(); 
    66    if(nowopen!=assay) { 
    77        overviewdetail = assay; 
    8         $("#"+overviewdetail+"HiddenRows").css({ 
    9             "visibility": "visible" 
    10         }); 
     8        $("#"+overviewdetail+"HiddenRows").show(); 
    119        $.ajax({ 
    1210            url: "./samplesoverview.jsp?assayToken="+assay, 
     
    2018function closeOverviewDetails() { 
    2119    if(overviewdetail!="") { 
    22         $("#"+overviewdetail+"HiddenRows").css({ 
    23             "visibility": "collapse" 
    24         }); 
     20        $("#"+overviewdetail+"HiddenRows").hide(); 
    2521        overviewdetail = ""; 
    2622    } 
  • nugoctdwebapp/web/scripts/uploadscripts.js

    r151 r153  
    7777/* These 2 booleans are used to monitor if enough information is available in 
    7878 * order to procede to step 4 */ 
    79 upload_ready = false; 
    80 step_3_ready = false; 
     79var upload_ready = false; 
     80var step_3_ready = false; 
    8181 
    8282function init_step2() {