Bläddra i källkod

Update generator

crobi 10 år sedan
förälder
incheckning
a966fd8d1e
5 ändrade filer med 41 tillägg och 12 borttagningar
  1. 19
    0
      generator/css/cards.css
  2. 3
    3
      generator/data/card_data_example.js
  3. 3
    2
      generator/generate.html
  4. 14
    5
      generator/js/cards.js
  5. 2
    2
      generator/js/ui.js

+ 19
- 0
generator/css/cards.css Visa fil

@@ -180,3 +180,22 @@
180 180
     margin-top: 0.5em;
181 181
     margin-bottom: 0.2em;
182 182
 }
183
+
184
+.card-bullet-line {
185
+    font-size: inherit;
186
+    color: black;
187
+    padding-left: 16px;
188
+    padding-bottom: 0;
189
+    margin-bottom: 0;
190
+    margin-top: 0;
191
+}
192
+
193
+.card-bullet {
194
+    margin-bottom: 0;
195
+    margin-top: 0;
196
+    font-size: inherit;
197
+}
198
+
199
+.card-element:last-of-type{
200
+    margin-bottom: 0;
201
+}

+ 3
- 3
generator/data/card_data_example.js Visa fil

@@ -106,9 +106,9 @@ var card_data_example = [
106 106
             "rule",
107 107
             "fill | 2",
108 108
             "description | Spells | You can use your action to cast the following spells:",
109
-            "text | - magic missile, 1st level (1 charge)",
110
-            "text | - magic missile, 2nd level (2 charges)",
111
-            "text | - magic missile, 3rd level (3 charges)",
109
+            "bullet | magic missile, 1st level (1 charge)",
110
+            "bullet | magic missile, 2nd level (2 charges)",
111
+            "bullet | magic missile, 3rd level (3 charges)",
112 112
             "fill | 3"
113 113
         ]
114 114
     },

+ 3
- 2
generator/generate.html Visa fil

@@ -2,6 +2,7 @@
2 2
 <html lang="en">
3 3
 <head>
4 4
     <title>RPG cards</title>
5
+    <meta charset="UTF-8">
5 6
     <!-- Library: jQuery -->
6 7
     <script type="text/javascript" src="lib/jquery/jquery.min.js" charset="utf-8"></script>
7 8
     <!-- Library: Bootstrap -->
@@ -45,7 +46,6 @@
45 46
                 <!--<h3>Menu</h3>-->
46 47
                 <form role="form" class="form-horizontal">
47 48
                     <input type="file" id="file-load" name="files[]" multiple class="form-control" style="display:none" />
48
-                    <a href="" id="file-save-link" style="display:none">Hidden download link</a>
49 49
                     <div class="form-group">
50 50
                         <div class="col-sm-6">
51 51
                             <button type="button" class="btn btn-info btn-block" id="button-help">Open Help</button>
@@ -67,7 +67,8 @@
67 67
                             <button type="button" class="btn btn-primary btn-block" id="button-sort-name">Sort by name</button>
68 68
                         </div>
69 69
                         <div class="col-sm-6">
70
-                            <button type="button" class="btn btn-primary btn-block" id="button-save">Save to file</button>
70
+                            <button type="button" class="btn btn-primary btn-block" id="button-save" onclick="ui_save_file()">Save to file</button>
71
+                            <a href="" download="rpg_cards.json" id="file-save-link" style="display:none">Hidden download link</a>
71 72
                         </div>
72 73
                     </div>
73 74
                     <div class="form-group">

+ 14
- 5
generator/js/cards.js Visa fil

@@ -72,7 +72,7 @@ function card_element_icon(card_data, options) {
72 72
 
73 73
 function card_element_subtitle(params, card_data, options) {
74 74
     var subtitle = params[0] || "";
75
-    return '<div class="card-subtitle">' + subtitle + '</div>';
75
+    return '<div class="card-element card-subtitle">' + subtitle + '</div>';
76 76
 }
77 77
 
78 78
 function card_element_ruler(params, card_data, options) {
@@ -89,7 +89,7 @@ function card_element_ruler(params, card_data, options) {
89 89
 
90 90
 function card_element_property(params, card_data, options) {
91 91
     var result = "";
92
-    result += '<div class="card-property-line">';
92
+    result += '<div class="card-element card-property-line">';
93 93
     result += '   <h4 class="card-property-name">' + params[0] + '</h4>';
94 94
     result += '   <p class="card-p card-property-text">' + params[1] + '</p>';
95 95
     result += '</div>';
@@ -98,7 +98,7 @@ function card_element_property(params, card_data, options) {
98 98
 
99 99
 function card_element_description(params, card_data, options) {
100 100
     var result = "";
101
-    result += '<div class="card-description-line">';
101
+    result += '<div class="card-element card-description-line">';
102 102
     result += '   <h4 class="card-description-name">' + params[0] + '</h4>';
103 103
     result += '   <p class="card-p card-description-text">' + params[1] + '</p>';
104 104
     result += '</div>';
@@ -107,12 +107,20 @@ function card_element_description(params, card_data, options) {
107 107
 
108 108
 function card_element_text(params, card_data, options) {
109 109
     var result = "";
110
-    result += '<div class="card-description-line">';
110
+    result += '<div class="card-element card-description-line">';
111 111
     result += '   <p class="card-p card-description-text">' + params[0] + '</p>';
112 112
     result += '</div>';
113 113
     return result;
114 114
 }
115 115
 
116
+function card_element_bullet(params, card_data, options) {
117
+    var result = "";
118
+    result += '<ul class="card-element card-bullet-line">';
119
+    result += '   <li class="card-bullet">' + params[0] + '</li>';
120
+    result += '</ul>';
121
+    return result;
122
+}
123
+
116 124
 function card_element_section(params, card_data, options) {
117 125
     var color = card_data_color_front(card_data, options);
118 126
     var section = params[0] || "";
@@ -121,7 +129,7 @@ function card_element_section(params, card_data, options) {
121 129
 
122 130
 function card_element_fill(params, card_data, options) {
123 131
     var flex = params[0] || "1";
124
-    return '<div class="card-fill" style="flex:' + flex + '"></div>';
132
+    return '<span class="card-fill" style="flex:' + flex + '"></span>';
125 133
 }
126 134
 
127 135
 function card_element_unknown(params, card_data, options) {
@@ -135,6 +143,7 @@ var card_element_generators = {
135 143
     ruler: card_element_ruler,
136 144
     description: card_element_description,
137 145
     text: card_element_text,
146
+    bullet: card_element_bullet,
138 147
     fill: card_element_fill,
139 148
     section: card_element_section
140 149
 };

+ 2
- 2
generator/js/ui.js Visa fil

@@ -141,7 +141,7 @@ function ui_save_file() {
141 141
     a.download = "rpg_cards.json";
142 142
     a.click();
143 143
 
144
-    URL.revokeObjectURL(url);
144
+    setTimeout(function () { URL.revokeObjectURL(url); }, 500);
145 145
 }
146 146
 
147 147
 function ui_update_selected_card() {
@@ -346,7 +346,7 @@ $(document).ready(function () {
346 346
     $("#file-load").change(ui_load_files);
347 347
     $("#button-clear").click(ui_clear_all);
348 348
     $("#button-load-sample").click(ui_load_sample);
349
-    $("#button-save").click(ui_save_file);
349
+    //$("#button-save").click(ui_save_file);
350 350
     $("#button-sort-name").click(ui_sort_by_name);
351 351
     $("#button-sort-icon").click(ui_sort_by_icon);
352 352
     $("#button-add-card").click(ui_add_new_card);

Loading…
Avbryt
Spara