Changeset 29906 for other-projects/nz-flag-design/trunk/main-form

Timestamp:

2015-05-20T23:25:37+12:00 (9 years ago)

Author:

davidb

Message:

Changes resulting from writing the TPDL submission

Location:

other-projects/nz-flag-design/trunk/main-form

Files:

• choose-canvas.html (modified) (3 diffs)
• choose-palette.html (modified) (2 diffs)
• iterative-design.html (modified) (5 diffs)

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

@@ -51 +51 @@
     <script src="../similarity-2d/flag-processing.js"></script>
 
-    <scriptXXX src="choose-canvas.js" />
+    <style>
+      a[href^="http://"]:after, 
+      a[href^="https://"]:after {
+        content: url(http://upload.wikimedia.org/wikipedia/commons/6/64/Icon_External_Link.png);
+        margin: 0 0 0 5px;
+      }
+    </style>
 
     <script type="text/javascript">
@@ -64 +70 @@
                                colourPots: colourPotSwatch.slice(0,3)
                              };
+    var isoCountryCode = null;
+
 
 
@@ -287 +295 @@
         // now change the flag tooltip labels into their country names
         $.getJSON( "../similarity-2d/iso-3166-keyed-by-alpha-2-countrycodes.json", function(data) {
-        
+        isoCountryCodes = data;
+
             $.each( data, function( iso2_key, country_name ) {
         var $img = $('#aspect-ratio-'+iso2_key.toLowerCase());

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

@@ -94 +94 @@
       
             if (typeof flagCanvasSettings !== 'undefined') {
-                console.log("**** cp changed, !! selectedColourPotID = " + selectedColourPotID + " typeof = " + typeof(selectedColourPotID));
-                //var colour_pot_pos = selectedColourPotID.substring(10); // strip off 'colour-pos'
                 var colour_pot_pos = selectedColourPotID.replace("colour-pot","");
-                //colour_pot_pos = 0;
-                console.log("**** done replace");                   
                 flagCanvasSettings.colourPots[colour_pot_pos] = colour.toHexString();
         }
@@ -240 +236 @@
       selectedColourPot = colourPotElem;
       selectedColourPotID = colourPotElem.id;
-      console.log("**** cp clicked, selectedColourPotID = " + selectedColourPotID);                 
       selectedColourPickerID = selectedColourPotID.replace("colour-pot","colour-picker");
       selectedColourPickerDivID = selectedColourPotID.replace("colour-pot","colour-picker-div");

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

@@ -46 +46 @@
 
                                 <li>
-                                    <h2><span title="Click to Open/Close">Flag Similarity</span></h2>
+                                    <h2><span title="Compare with world flags: click to open/close">World Flags Similarity</span></h2>
 
                                     <div id="similarity-2d-div">
@@ -54 +54 @@
                                     </div>
                                 </li>
+
+
+                                <li>
+                                    <h2><span title="Compare with alternative NZ flag designs: click to open/close">Alternative NZ Flags Designs</span></h2>
+
+                                    <div id="similarity-2d-nz-div">
+                                        <iframe src="../similarity-2d/display-flags.jsp?imagesDir=import-nz&mode=nz" 
+                                        style="width: 100%; height: 100%"
+                                        id="similarity-2d-nz-iframe" ></iframe>
+                                    </div>
+                                </li>
+
+
                                 <li>
                                     <h2><span title="Click to Open/Close">Render 3D</span></h2>
@@ -130 +143 @@
 
                 function reconfigureSvgCanvas(settings) {
-                    console.log("*** entered reconfigureSvgCanvas");
-                    console.log("*** settings: background=" + settings.backgroundColor);
-                    console.log("*** settings: w x h = " + settings.width + " x " + settings.height);
+                    //console.log("*** entered reconfigureSvgCanvas");
+                    //console.log("*** settings: background=" + settings.backgroundColor);
+                    //console.log("*** settings: w x h = " + settings.width + " x " + settings.height);
 
                     var design_frame = document.getElementById('design-2d-iframe');
@@ -270 +283 @@
                     $('#design-2d-iframe').attr("src","svg-edit-trunk/editor/svg-editor.html?noStorageOnLoad=1");
                     $('#design-2d-iframe').load(function() {
-                        console.log("*** loaded sgv iframe: " + this);
+                        console.log("*** loaded svg iframe: " + this);
 
                         var design_frame = document.getElementById('design-2d-iframe');
@@ -281 +294 @@
                     //if (typeof flagCanvasSettings !== 'undefined') {
                 setTimeout(function() {
-                  console.log("**** design frame = " + design_frame);
-                  console.log("**** design frame content window = " + design_frame.contentWindow);
+                  //console.log("**** design frame = " + design_frame);
+                  //console.log("**** design frame content window = " + design_frame.contentWindow);
                   design_frame.contentWindow.setSVGEditorColourPalette(flagCanvasSettings);
                 }, 500);