fix:

diff --git a/app/assets/images/home.gif b/app/assets/images/home.gif
new file mode 100644 (file)
index 0000000..65557d6
Binary files /dev/null and b/app/assets/images/home.gif differ

diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index c294c1f..90a6958 100644 (file)
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -242,11 +242,12 @@ class Locmare.ExtendForm extends Locmare.FormBase
   \r
   render: () ->\r
     this.$el.html('')\r
-    this.$el.append(@label.render().el) if not @label.hidden()\r
-    @div_fields = new Locmare.FormModule.Fields({\r
-      fields: @fields\r
-    })\r
-    this.$el.append(@div_fields.render().el)\r
+    if !@is_hidden()\r
+      this.$el.append(@label.render().el) if not @label.hidden()\r
+      @div_fields = new Locmare.FormModule.Fields({\r
+        fields: @fields\r
+      })\r
+      this.$el.append(@div_fields.render().el)\r
     this\r
   \r
   refresh: () ->\r
@@ -267,6 +268,9 @@ class Locmare.ExtendForm extends Locmare.FormBase
   val: () ->\r
     JSON.stringify(@item.attributes)\r
   \r
+  is_hidden: () ->\r
+    _.isEmpty(@manifest.field_names)\r
+  \r
   init_fields: () ->\r
     _.each @manifest.field_names, (field_name) =>\r
       field_manifest = @manifest.fields[field_name]\r

diff --git a/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee
index b06b798..8dc5163 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/helper/tail_angle.js.coffee
@@ -13,7 +13,7 @@ class Locmare.FormModule.FieldModule.HelperModule.TailAngle extends Locmare.Form
   \r
   render: () ->\r
     @attr = {\r
-      style: 'display: block'\r
+      #style: 'display: block' # row break?\r
     }\r
     this.$el.attr(@attr)\r
     this.$el.html('')\r

diff --git a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
index a707cef..914f051 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
@@ -8,11 +8,15 @@ class Locmare.FormModule.FieldModule.TagModule.NumberTag extends Locmare.FormMod
   \r
   render: () ->\r
     this.$el.html('')\r
+    sz = @options()['size']\r
     @attr = {\r
       type: 'number',\r
       name: @form_field_name(),\r
-      value: @value()\r
+      value: @value(),\r
+      \r
     }\r
+    if sz\r
+      @attr['style'] = Pettanr.to_style({width: Pettanr.to_s(sz) + 'em'})\r
     _.extend(@attr, @options())\r
     this.$el.attr(@attr)\r
     this\r

diff --git a/app/assets/javascripts/views/history.js.coffee b/app/assets/javascripts/views/history.js.coffee
index 9e1d893..5a07ce6 100644 (file)
--- a/app/assets/javascripts/views/history.js.coffee
+++ b/app/assets/javascripts/views/history.js.coffee
@@ -25,6 +25,7 @@ class Pettanr.Views.History extends Backbone.View
     @render()\r
   \r
   # push history\r
+  # options: str:page title\r
   push: (params, options) ->\r
     return if !@power\r
     @list.push(params, options)\r
@@ -49,6 +50,7 @@ class Pettanr.Views.History.List extends Backbone.View
       this.$el.append(button.render().el)\r
     this\r
   \r
+  # options: str:page title\r
   push: (params, options) ->\r
     _.last(@buttons).release() if !_.isEmpty(@buttons)\r
     if @buttons.length > @max_logs\r
@@ -81,7 +83,7 @@ class Pettanr.Views.History.List.Log extends Backbone.View
     @model = Manifest.manifest().models[@action.item_name].classify()\r
     icon = new Pettanr.Image.Icon({item: @model, title: @options, half: true})\r
     @button = new Tag.A({\r
-      attr: {href: '#'}, \r
+      attr: {href: '/' + @action.url(@params)}, \r
       content: icon.render().el\r
     })\r
     @listenTo(@button, 'click', @click)\r
@@ -116,7 +118,7 @@ class Pettanr.Views.History.Root extends Backbone.View
   initialize: (options) ->\r
     icon = new Pettanr.Views.Common.RootIcon()\r
     @button = new Tag.A({\r
-      attr: {href: '#'}, \r
+      attr: {href: '/'}, \r
       content: icon.render().el\r
     })\r
     @listenTo(@button, 'click', @click)\r

diff --git a/app/assets/javascripts/work/forms.js.coffee.erb b/app/assets/javascripts/work/forms.js.coffee.erb
index 9f05e94..03766ac 100644 (file)
--- a/app/assets/javascripts/work/forms.js.coffee.erb
+++ b/app/assets/javascripts/work/forms.js.coffee.erb
@@ -94,6 +94,11 @@
             },\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 80, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -190,6 +195,11 @@
             },\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 80, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -286,6 +296,11 @@
             },\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 80, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -388,6 +403,11 @@
             },\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 80, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -505,6 +525,11 @@
           caption: {\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 40, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -563,12 +588,6 @@
     uses: {\r
       default: {\r
         fields: {\r
-          caption: {\r
-            tag: {\r
-              type: 'text',\r
-            },\r
-            row_break: true,\r
-          },\r
           x: {\r
             tag: {\r
               type: 'number',\r
@@ -661,7 +680,6 @@
           },\r
         },\r
         field_names: [\r
-          'caption',\r
           'x',\r
           'y',\r
           'width',\r
@@ -679,6 +697,11 @@
           caption: {\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 40, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -717,12 +740,6 @@
               type: 'hidden',\r
             },\r
           },\r
-          caption: {\r
-            tag: {\r
-              type: 'text',\r
-            },\r
-            row_break: true,\r
-          },\r
           z: {\r
             label: {\r
               type: 'none',\r
@@ -752,7 +769,6 @@
           },\r
         },\r
         field_names: [\r
-          'caption',\r
           'id',\r
           'panel_id',\r
           'speech_balloon_template_id',\r
@@ -767,6 +783,11 @@
           caption: {\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 40, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -837,7 +858,6 @@
             tag: {\r
               type: 'number',\r
             },\r
-            row_break: true,\r
           },\r
           width: {\r
             tag: {\r
@@ -960,12 +980,6 @@
               type: 'select',\r
             },\r
           },\r
-          quotes: {\r
-            tag: {\r
-              type: 'text',\r
-            },\r
-            row_break: true,\r
-          },\r
           content: {\r
             label: {\r
               args: {\r
@@ -996,6 +1010,7 @@
                 },\r
               },\r
             },\r
+            row_break: true,\r
           },\r
           speech_balloon_template_module_name: {\r
             label: {\r
@@ -1021,7 +1036,6 @@
           'writing_format_id',\r
           'font_size',\r
           'text_align',\r
-          'quotes',\r
           'content',\r
           'fore_color',\r
           'id',\r
@@ -1095,12 +1109,6 @@
               type: 'hidden',\r
             },\r
           },\r
-          caption: {\r
-            tag: {\r
-              type: 'text',\r
-            },\r
-            row_break: true,\r
-          },\r
           repeat: {\r
             tag: {\r
               type: 'select',\r
@@ -1140,7 +1148,6 @@
           },\r
         },\r
         field_names: [\r
-          'caption',\r
           'repeat',\r
           'x',\r
           'y',\r
@@ -1156,6 +1163,11 @@
           caption: {\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 40, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r
@@ -1186,12 +1198,6 @@
               type: 'hidden',\r
             },\r
           },\r
-          caption: {\r
-            tag: {\r
-              type: 'text',\r
-            },\r
-            row_break: true,\r
-          },\r
           code: {\r
             label: {\r
               args: {\r
@@ -1248,7 +1254,6 @@
         field_names: [\r
           'id',\r
           'panel_id',\r
-          'caption',\r
           'code',\r
           'orientation',\r
           'xy',\r
@@ -1262,6 +1267,11 @@
           caption: {\r
             tag: {\r
               type: 'text',\r
+              args: {\r
+                options: {\r
+                  size: 40, \r
+                },\r
+              },\r
             },\r
             row_break: true,\r
           },\r

diff --git a/public/images/home.gif b/public/images/home.gif
new file mode 100644 (file)
index 0000000..65557d6
Binary files /dev/null and b/public/images/home.gif differ

diff --git a/public/local_manifest.json b/public/local_manifest.json
index 1e8cdd3..8adabae 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -2131,7 +2131,12 @@
                 }\r
               },\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 80\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             },\r
@@ -2227,7 +2232,12 @@
                 }\r
               },\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 80\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             },\r
@@ -2323,7 +2333,12 @@
                 }\r
               },\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 80\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             },\r
@@ -2425,7 +2440,12 @@
                 }\r
               },\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 80\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             },\r
@@ -2542,7 +2562,12 @@
           "fields": {\r
             "caption": {\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 40\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             },\r
@@ -2601,12 +2626,6 @@
       "uses": {\r
         "default": {\r
           "fields": {\r
-            "caption": {\r
-              "tag": {\r
-                "type": "text"\r
-              },\r
-              "row_break": true\r
-            },\r
             "x": {\r
               "tag": {\r
                 "type": "number"\r
@@ -2699,7 +2718,6 @@
             }\r
           },\r
           "field_names": [\r
-            "caption",\r
             "x",\r
             "y",\r
             "width",\r
@@ -2716,7 +2734,12 @@
           "fields": {\r
             "caption": {\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 40\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             }\r
@@ -2755,12 +2778,6 @@
                 "type": "hidden"\r
               }\r
             },\r
-            "caption": {\r
-              "tag": {\r
-                "type": "text"\r
-              },\r
-              "row_break": true\r
-            },\r
             "z": {\r
               "label": {\r
                 "type": "none"\r
@@ -2790,7 +2807,6 @@
             }\r
           },\r
           "field_names": [\r
-            "caption",\r
             "id",\r
             "panel_id",\r
             "speech_balloon_template_id",\r
@@ -2804,7 +2820,12 @@
           "fields": {\r
             "caption": {\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 40\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             }\r
@@ -2872,8 +2893,7 @@
               "label": {},\r
               "tag": {\r
                 "type": "number"\r
-              },\r
-              "row_break": true\r
+              }\r
             },\r
             "width": {\r
               "tag": {\r
@@ -2994,12 +3014,6 @@
                 "type": "select"\r
               }\r
             },\r
-            "quotes": {\r
-              "tag": {\r
-                "type": "text"\r
-              },\r
-              "row_break": true\r
-            },\r
             "content": {\r
               "label": {\r
                 "args": {\r
@@ -3055,7 +3069,6 @@
             "writing_format_id",\r
             "font_size",\r
             "text_align",\r
-            "quotes",\r
             "content",\r
             "fore_color",\r
             "id",\r
@@ -3129,12 +3142,6 @@
                 "type": "hidden"\r
               }\r
             },\r
-            "caption": {\r
-              "tag": {\r
-                "type": "text"\r
-              },\r
-              "row_break": true\r
-            },\r
             "repeat": {\r
               "tag": {\r
                 "type": "select",\r
@@ -3174,7 +3181,6 @@
             }\r
           },\r
           "field_names": [\r
-            "caption",\r
             "repeat",\r
             "x",\r
             "y",\r
@@ -3189,7 +3195,12 @@
           "fields": {\r
             "caption": {\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 40\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             }\r
@@ -3220,12 +3231,6 @@
                 "type": "hidden"\r
               }\r
             },\r
-            "caption": {\r
-              "tag": {\r
-                "type": "text"\r
-              },\r
-              "row_break": true\r
-            },\r
             "code": {\r
               "label": {\r
                 "args": {\r
@@ -3282,7 +3287,6 @@
           "field_names": [\r
             "id",\r
             "panel_id",\r
-            "caption",\r
             "code",\r
             "orientation",\r
             "xy",\r
@@ -3295,7 +3299,12 @@
           "fields": {\r
             "caption": {\r
               "tag": {\r
-                "type": "text"\r
+                "type": "text",\r
+                "args": {\r
+                  "options": {\r
+                    "size": 40\r
+                  }\r
+                }\r
               },\r
               "row_break": true\r
             }\r