Changeset 29767


Ignore:
Timestamp:
03/06/15 17:03:47 (6 years ago)
Author:
davidb
Message:

Changes in refining the project to be demoed at the end-of-summer presentations. Note this commit was made after the event.

Location:
other-projects/nz-flag-design/trunk/main-form
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nz-flag-design/trunk/main-form/choose-palette.html

    r29740 r29767  
    55    <meta name="viewport" content="width=device-width, initial-scale=1"/>
    66    <title>Choose Palette</title>   
     7
    78  </head>
    89  <body>
     
    2829    <p>       
    2930        <div id="palette">
    30             <img src="images/palette/palette2.png" id="paletteImage" height="500" alt="Palette"></img>
     31            <img src="images/palette/palette2.png" id="paletteImage" height="460" alt="Palette"></img>
    3132
    3233            <div onclick="newSelectedCircle('circleBackground')" id="paletteCircleBackground" class="paletteCircle">
    3334                <svg height="104" width="104">
    3435                    <circle id="circleBackground" cx="52" cy="52" r="50" stroke="black" stroke-width="1" fill="#000066"/>
    35                     <text id="circleText1" x="32" y="35" fill="white" font-size="15">FLAG</text>
    36                     <text id="circleText2" x="5" y="55" fill="white" font-size="13">BACKGROUND</text>
    37                     <text id="circleText3" x="22" y="75" fill="white" font-size="15">COLOUR</text>
     36             <text id="circleText1" x="32" y="35" fill="white" font-size="13">FLAG</text>
     37                    <text id="circleText2" x="5" y="55" fill="white" font-size="12">BACKGROUND</text>
     38                    <text id="circleText3" x="22" y="75" fill="white" font-size="13">COLOUR</text>
    3839                </svg>
    3940            </div>
     
    8586        </div>
    8687
    87         <h2>Use this slider to change the number of colours that will be used in your flag!</h2>
     88        <p>Use slider to change the number of colours that will be used in your flag:</p>
    8889
    8990        <input id="numColoursSlider" type="range" min="0" max="7" value="2" steps="7" onchange="showCircles(this.value)"/>
    90         <h2>Advice for flag design!</h2>   
     91
     92    <br />
     93        <h2><a href="http://www.nava.org/flag-design/good-flag-bad-flag/5-basic-principles-flag-design" target="_blank">Help on flag design</a></h2>   
    9194    </p>
    9295       
    9396    <script>
    94         // Flag settings - used to initialise the svg canvas to the user's preferences
    95         var flagCanvasSettings = { backgroundColor: "#000066", width: 800, height: 400 };
    9697
    9798        // Visibly toggle between which palette circle is currently selected
     
    168169            maxSelectionSize: 10,
    169170            palette: [
    170                 ["#000","#444","#666","#999","#ccc","#eee","#f3f3f3","#fff"],
    171                 ["000066", "#CC0000", "000066", "#CC0000", "000066", "#CC0000", "000066", "#CC0000"],
    172                 ["#e06666","#f6b26b","#ffd966","#93c47d","#76a5af","#6fa8dc","#8e7cc3","#c27ba0"],
    173                 ["#f00","#f90","#ff0","#0f0","#0ff","#00f","#90f","#f0f"],
    174                 ["#c00","#e69138","#f1c232","#6aa84f","#45818e","#3d85c6","#674ea7","#a64d79"],
    175                 ["#900","#b45f06","#bf9000","#38761d","#134f5c","#0b5394","#351c75","#741b47"],
    176                 ["#600","#783f04","#7f6000","#274e13","#0c343d","#073763","#20124d","#4c1130"]
     171        ["#000", "hsv  0  100 100"],
     172        ["#444", "hsv  40 100 100"],
     173        ["#666", "hsv  80 100 100"],
     174        ["#999", "hsv 120 100 100"],
     175        ["#ccc", "hsv 140 100 100"],
     176        ["#eee", "hsv 160 100 100"],
     177        ["#fff", "hsv 180 100 100"]
    177178            ]
    178179            //selectionPalette: [string]
  • other-projects/nz-flag-design/trunk/main-form/css/styles.css

    r29740 r29767  
    10141014
    10151015/* Positions of the palette circles on the palette */
     1016/*
    10161017#paletteCircleBackground { top: 75px; left: 150px }
    10171018#paletteCircle1 { top: 35px; left: 295px }
     
    10221023#paletteCircle6 { top: 355px; left: 480px; display: none }
    10231024#paletteCircle7 { top: 345px; left: 335px; display: none }
     1025*/
     1026
     1027#paletteCircleBackground { top: 75px; left: 150px }
     1028#paletteCircle1 { top: 35px; left: 295px }
     1029#paletteCircle2 { top: 50px; left: 450px }
     1030#paletteCircle3 { top: 105px; left: 585px; display: none }
     1031#paletteCircle4 { top: 210px; left: 670px; display: none }
     1032#paletteCircle5 { top: 310px; left: 590px; display: none }
     1033#paletteCircle6 { top: 335px; left: 445px; display: none }
     1034#paletteCircle7 { top: 325px; left: 300px; display: none }
    10241035
    10251036#pickerDiv {
     
    10281039    padding: 0 50px 0 0;
    10291040}
     1041
     1042.sp-picker-container {
     1043  color: black;
     1044}
  • other-projects/nz-flag-design/trunk/main-form/index.html

    r29740 r29767  
    5454    <title>Enter Name</title>
    5555
     56    <script>
     57        // Flag settings - used to initialise the svg canvas to the user's preferences
     58        var flagCanvasSettings = { backgroundColor: "#000066", width: 800, height: 400 };
     59    </script>
     60
     61
    5662  </head>
    5763  <body>
     
    7480      <div class="story-title">
    7581        <h1 id="enter-name-header" class="center">Enter Name</h1>
    76         <p class="center">-- xx </p>
     82<!--
     83        <p class="center">- - xx </p>
     84-->
    7785        <p>
    78           Name:
    79           <form>
    80         <input type="text" />
    81           </form>
     86          Your Name:
    8287        </p>
     88        <form>
     89          <input type="text" />
     90        </form>
    8391      </div>
    8492      <!-- end of putting custom content -->
  • other-projects/nz-flag-design/trunk/main-form/iterative-design.html

    r29740 r29767  
    44        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>   
    55        <meta name="viewport" content="width=device-width, initial-scale=1"/>
     6
     7    <!-- jQuery -->
     8    <script src="lib/jquery-1.11.1.min.js"></script>
    69
    710        <title>Iterative Design</title>
     
    6669
    6770            <script>
    68                 var activatedAccordion    = false;
     71                var activatedAccordion      = false;
    6972                var activatedSVGEditorFrame = false;
    7073
     
    9093
    9194                        // Look up jsession id; if not present fall back to use a timestamp
    92                         var jsession_id = $.cookie('JSESSIONID') || new Date().getTime();
     95                        //var jsession_id = $.cookie('JSESSIONID') || new Date().getTime();
     96                        var jsession_id = $.cookie('JSESSIONID') + "-" + new Date().getTime();
    9397                        console.log("jsession id = " + jsession_id);
    9498                        var imageFilename = "flag-" + jsession_id + ".png";
     
    186190
    187191                function activateAccordion() {
     192                    console.log("activateAccordion()");
     193
    188194                    var la_x_dim = $(window).width() * 0.70;
    189195                    var la_y_dim = $(window).height() * 0.67;
     
    198204                            containerHeight : la_y_dim,
    199205                            onTriggerSlide : function() {
     206                                console.log("onTriggerSlide: this = " + this);
    200207                                console.log("onTriggerSlide: id = " + this[0].id);
    201208                                if (this[0].id == "render-3d-div") {
Note: See TracChangeset for help on using the changeset viewer.