Selaa lähdekoodia

Proper setting for the page background color

crobi 10 vuotta sitten
vanhempi
commit
b24856d0bd
3 muutettua tiedostoa jossa 48 lisäystä ja 5 poistoa
  1. 22
    4
      generator/generate.html
  2. 5
    1
      generator/js/cards.js
  3. 21
    0
      generator/js/ui.js

+ 22
- 4
generator/generate.html Näytä tiedosto

@@ -82,12 +82,12 @@
82 82
                             <button type="button" class="btn btn-success btn-block" id="button-generate">Generate</button>
83 83
                         </div>
84 84
                     </div>
85
-                    <span class="help-block">Generated cards open in a new tab or window.</span>
85
+                    <!--<span class="help-block">Generated cards open in a new tab or window.</span>-->
86 86
                 </form>
87
-                <h3>Sizes</h3>
87
+                <h3>Page settings</h3>
88 88
                 <form role="form" class="form-horizontal">
89 89
                     <div class="form-group">
90
-                        <label for="page-size" class="col-sm-4 control-label">Page</label>
90
+                        <label for="page-size" class="col-sm-4 control-label">Page Size</label>
91 91
                         <div class="col-sm-8">
92 92
                             <select class="form-control" id="page-size" data-option="page_size">
93 93
                                 <option value="A4" selected>A4</option>
@@ -97,7 +97,7 @@
97 97
                         </div>
98 98
                     </div>
99 99
                     <div class="form-group">
100
-                        <label for="card-size" class="col-sm-4 control-label">Card</label>
100
+                        <label for="card-size" class="col-sm-4 control-label">Card Size</label>
101 101
                         <div class="col-sm-8">
102 102
                             <select class="form-control" id="card-size" data-option="card_size">
103 103
                                 <option value="225x35">2.25&quot; x 3.5&quot; (Bridge)</option>
@@ -129,6 +129,24 @@
129 129
                             </select>
130 130
                         </div>
131 131
                     </div>
132
+                    <div class="form-group">
133
+                        <label for="foreground-color" class="col-sm-4 control-label">Front color</label>
134
+                        <div class="col-sm-8">
135
+                            <div class="input-group">
136
+                                <select id="foreground_color_selector" class="colorselector-data"></select>
137
+                                <input type="text" id="foreground-color" class="form-control" placeholder="Front page color" data-property="color" value="white">
138
+                            </div>
139
+                        </div>
140
+                    </div>
141
+                    <div class="form-group">
142
+                        <label for="background-color" class="col-sm-4 control-label">Back color</label>
143
+                        <div class="col-sm-8">
144
+                            <div class="input-group">
145
+                                <select id="background_color_selector" class="colorselector-data"></select>
146
+                                <input type="text" id="background-color" class="form-control" placeholder="Back page color" data-property="color" value="white">
147
+                            </div>
148
+                        </div>
149
+                    </div>
132 150
                 </form>
133 151
                 <h3>Default values</h3>
134 152
                 <form role="form" class="form-horizontal">

+ 5
- 1
generator/js/cards.js Näytä tiedosto

@@ -3,6 +3,8 @@
3 3
 // ============================================================================
4 4
 function card_default_options() {
5 5
     return {
6
+        foreground_color: "white",
7
+        background_color: "white",
6 8
         default_color: "black",
7 9
         default_icon: "ace",
8 10
         default_title_size: "13",
@@ -301,7 +303,9 @@ function card_pages_wrap(pages, options) {
301 303
     for (var i = 0; i < pages.length; ++i) {
302 304
         var style = "";
303 305
         if ((options.card_arrangement == "doublesided") &&  (i % 2 == 1)) {
304
-            style += 'style="background-color:'+options.default_color+'"';
306
+            style += 'style="background-color:' + options.background_color + '"';
307
+        } else {
308
+            style += 'style="background-color:' + options.foreground_color + '"';
305 309
         }
306 310
         result += '<page class="page page-preview" size="' + size + '" ' + style + '>\n';
307 311
         result += pages[i].join("\n");

+ 21
- 0
generator/js/ui.js Näytä tiedosto

@@ -209,6 +209,18 @@ function ui_setup_color_selector() {
209 209
             ui_set_card_color(value);
210 210
         }
211 211
     });
212
+    $('#foreground_color_selector').colorselector({
213
+        callback: function (value, color, title) {
214
+            $("#foreground-color").val(title);
215
+            ui_set_foreground_color(value);
216
+        }
217
+    });
218
+    $('#background_color_selector').colorselector({
219
+        callback: function (value, color, title) {
220
+            $("#background-color").val(title);
221
+            ui_set_background_color(value);
222
+        }
223
+    });
212 224
 
213 225
     // Styling
214 226
     $(".dropdown-colorselector").addClass("input-group-addon color-input-addon");
@@ -219,6 +231,14 @@ function ui_set_default_color(color) {
219 231
     ui_render_selected_card();
220 232
 }
221 233
 
234
+function ui_set_foreground_color(color) {
235
+    card_options.foreground_color = color;
236
+}
237
+
238
+function ui_set_background_color(color) {
239
+    card_options.background_color = color;
240
+}
241
+
222 242
 function ui_change_option() {
223 243
     var property = $(this).attr("data-option");
224 244
     var value = $(this).val();
@@ -390,6 +410,7 @@ $(document).ready(function () {
390 410
     $("#page-columns").change(ui_change_option);
391 411
     $("#card-arrangement").change(ui_change_option);
392 412
     $("#card-size").change(ui_change_option);
413
+    $("#background-color").change(ui_change_option);
393 414
 
394 415
     $("#default-color").change(ui_change_default_color);
395 416
     $("#default-icon").change(ui_change_default_icon);

Loading…
Peruuta
Tallenna