Changeset 29787 for other-projects/nz-flag-design/trunk/main-form/choose-canvas.html

Timestamp:

2015-03-17T00:27:22+13:00 (9 years ago)

Author:

davidb

Message:

Changes to support storing on the server side of the HSV histogram calculations

File:

• other-projects/nz-flag-design/trunk/main-form/choose-canvas.html (modified) (6 diffs)

other-projects/nz-flag-design/trunk/main-form/choose-canvas.html

@@ -74 +74 @@
         $.getJSON( "../similarity-2d/flag-aspect-ratios-json.jsp", function( data ) {
 
-            var scale_to_y_dim = 130;
+
+            //var scale_to_y_dim = 130;
+
+            // express scale_to_y_dim to use relative to height of window
+
+            var la_y_dim = $(window).height() - $('#aspect-ratio-div').position().top;
+            var scale_to_y_dim = la_y_dim/4;
+
+            //alert("scale_to_y_dim = " + scale_to_y_dim);
 
             var items = [];
@@ -131 +139 @@
                 p--;
               }
-/*
-              var nz_prioritized_flags = ratio_table.flags.sort( function (a, b) {
-                var a_title = a.replace(/^.*\//,"").replace(/\.(.*?)$/,"");
-                if (a_title == "nz") { 
-                  return -1;
-                }
-                else {
-                  return 0;
-                }
-              });
-*/
 
               $.each(nz_prioritized_flags, function(index, flag_filename) {                
@@ -174 +171 @@
 
           $('#aspect-ratio-div').append("<div class='centredDiv' style='width: 100%'>"+items.join("\n")+"</div>");
+
+
+          // now change the flag tooltip labels into their country names
+          $.getJSON( "../similarity-2d/iso-3166-keyed-by-alpha-2-countrycodes.json", function( data ) {
+
+          });
+
         });
       });
@@ -202 +206 @@
       <h2>Canvas Size</h2>          
       
-        <div class="dialog" id="dialog" title="Ratio Select Dialog" width="800px">
+        <div class="dialog" id="dialog" title="Flat Aspect Ratio Selection Panel" widthXX="800px">
             <br><br>
             <h2>Please choose from the following aspect ratios.</h2>
@@ -257 +261 @@
             }                               
             }
+
+
         </script>
         
@@ -264 +270 @@
     
       </div><!-- /content -->
+
+<!-- make persistent?
+      <div data-role="footer" style="width:100%;">
+    COSI: Centre of Open Source Innovation @ The University of Waikato.
+      </div>
+-->
       
     </div><!-- /page -->