Changeset 29622


Ignore:
Timestamp:
2014-12-12T22:37:57+13:00 (9 years ago)
Author:
davidb
Message:

Further restructuring of the display flags JSP page. Improved progress-bar loading

Location:
other-projects/nz-flag-design/trunk/similarity-2d
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed

  • other-projects/nz-flag-design/trunk/similarity-2d/display-flags.jsp

    r29621 r29622  
    33  <head>
    44    <meta charset="utf-8"/>
     5
     6    <link rel="stylesheet" href="//code.jquery.com/ui/1.11.2/themes/smoothness/jquery-ui.css" />
     7
     8    <link rel="stylesheet" href="style.css" />
     9
     10    <script src="//code.jquery.com/jquery-1.10.2.js"></script>
     11    <script src="//code.jquery.com/ui/1.11.2/jquery-ui.js"></script>
     12
     13    <script src="flag-processing.js"></script>
     14
     15    <script>
     16      $(function() {
     17        $( "#progressBar" ).progressbar({
     18          value: progressVal
     19        });
     20      });
     21    </script>
     22
     23
     24    <title>Display Flags</title>
     25
    526  </head>
    627
    … …  
    2546    </div>
    2647
     48   <div id="progressArea">
     49     <span id="loadingLabel">Loading: </span>
     50     <div id="progressBar"></div>
     51   </div>
     52
     53   <div id="flagArea"></div>
     54
     55
    2756    <script>
    2857
    2958      if (!is_jsp_active) {
    30         document.write("<div>Web server is no JSP active.  Unable to run flag comparison</div>");
     59        var mess = "<div>Web server is no JSP active.  Unable to run flag comparison</div>";
     60        $('#flagArea').append(mess);
    3161      }
    32       var i;
    33 
    34       var root_img_re = /^.*\/(.*?)\..*?$/;
    35 
    36       for (i=0; i<img_list.length; i++) {
    37     var img   = img_list[i];
    38         var img_matches = root_img_re.exec(img);
    39     var title = img_matches[1];
    40 
    41         document.write("<img src=\"" + img_list[i] + "\" "
    42         + "title=\"" + title + "\" "
    43         + "style=\"padding: 4px;\">\n");
    44       }
     62     
     63      displayFlags(img_list,$('#flagArea'),$('#progressArea'),$('#progressBar'));
    4564
    4665    </script>
Note: See TracChangeset for help on using the changeset viewer.