Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --combined app/assets/javascripts/locmare/form.js.coffee
index 462d071,90a6958..6c7c147
--- 1/app/assets/javascripts/locmare/form.js.coffee
--- 2/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@@ -59,7 -59,11 +59,7 @@@ class Locmare.Form extends Locmare.Form
      @init_fields()\r
    \r
    render: () ->\r
 -    @attr = {\r
 -      method: @method_type(),\r
 -      action: @action_url()\r
 -    }\r
 -    this.$el.attr(@attr)\r
 +    this.$el.attr(@form_attr())\r
      this.$el.html('')\r
      @error_explanation = null\r
      @div_fields = new Locmare.FormModule.Fields({\r
@@@ -75,12 -79,6 +75,12 @@@
        @delegateEvents({'submit': @method_type()})\r
      this\r
    \r
 +  form_attr: () ->\r
 +    {\r
 +      method: @method_type(),\r
 +      action: @action_url()\r
 +    }\r
 +  \r
    refresh: () ->\r
      _.each @fields, (field) =>\r
        field.refresh()\r
@@@ -244,11 -242,12 +244,12 @@@ class Locmare.ExtendForm extends Locmar
    \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
@@@ -269,6 -268,9 +270,9 @@@
    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 --combined app/assets/javascripts/work/forms.js.coffee.erb
index 29a11a1,03766ac..857dcd7
--- 1/app/assets/javascripts/work/forms.js.coffee.erb
--- 2/app/assets/javascripts/work/forms.js.coffee.erb
+++ b/app/assets/javascripts/work/forms.js.coffee.erb
@@@ -94,6 -94,11 +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 +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 +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 +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 +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 +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 +680,6 @@@
            },\r
          },\r
          field_names: [\r
-           'caption',\r
            'x',\r
            'y',\r
            'width',\r
@@@ -679,6 -697,11 +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 +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 +769,6 @@@
            },\r
          },\r
          field_names: [\r
-           'caption',\r
            'id',\r
            'panel_id',\r
            'speech_balloon_template_id',\r
@@@ -767,6 -783,11 +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 +858,6 @@@
              tag: {\r
                type: 'number',\r
              },\r
-             row_break: true,\r
            },\r
            width: {\r
              tag: {\r
@@@ -960,12 -980,6 +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 +1010,7 @@@
                  },\r
                },\r
              },\r
+             row_break: true,\r
            },\r
            speech_balloon_template_module_name: {\r
              label: {\r
@@@ -1021,7 -1036,6 +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 +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 +1148,6 @@@
            },\r
          },\r
          field_names: [\r
-           'caption',\r
            'repeat',\r
            'x',\r
            'y',\r
@@@ -1156,6 -1163,11 +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 +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 +1254,6 @@@
          field_names: [\r
            'id',\r
            'panel_id',\r
-           'caption',\r
            'code',\r
            'orientation',\r
            'xy',\r
@@@ -1262,6 -1267,11 +1267,11 @@@
            caption: {\r
              tag: {\r
                type: 'text',\r
+               args: {\r
+                 options: {\r
+                   size: 40, \r
+                 },\r
+               },\r
              },\r
              row_break: true,\r
            },\r
@@@ -1272,25 -1282,6 +1282,25 @@@
        },\r
      },\r
    },\r
 +  original_picture: {\r
 +    uses: {\r
 +      multipart: {\r
 +        fields: {\r
 +          file: {\r
 +            label: {\r
 +              type: 'none',\r
 +            },\r
 +            tag: {\r
 +              type: 'file',\r
 +            },\r
 +          },\r
 +        },\r
 +        field_names: [\r
 +          'file',\r
 +        ]\r
 +      },\r
 +    },\r
 +  },\r
    original_picture_license_group: {\r
      uses: {\r
        default: {\r

diff --combined public/local_manifest.json
index 6f8d14a,8adabae..efb866e
--- 1/public/local_manifest.json
--- 2/public/local_manifest.json
+++ b/public/local_manifest.json
@@@ -2131,7 -2131,12 +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 +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 +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 +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 +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 +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 +2718,6 @@@
              }\r
            },\r
            "field_names": [\r
-             "caption",\r
              "x",\r
              "y",\r
              "width",\r
@@@ -2716,7 -2734,12 +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 +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 +2807,6 @@@
              }\r
            },\r
            "field_names": [\r
-             "caption",\r
              "id",\r
              "panel_id",\r
              "speech_balloon_template_id",\r
@@@ -2804,7 -2820,12 +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 +2893,7 @@@
                "label": {},\r
                "tag": {\r
                  "type": "number"\r
-               },\r
-               "row_break": true\r
+               }\r
              },\r
              "width": {\r
                "tag": {\r
@@@ -2994,12 -3014,6 +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 +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 +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 +3181,6 @@@
              }\r
            },\r
            "field_names": [\r
-             "caption",\r
              "repeat",\r
              "x",\r
              "y",\r
@@@ -3189,7 -3195,12 +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 +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 +3287,6 @@@
            "field_names": [\r
              "id",\r
              "panel_id",\r
-             "caption",\r
              "code",\r
              "orientation",\r
              "xy",\r
@@@ -3295,7 -3299,12 +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
@@@ -3306,25 -3315,6 +3315,25 @@@
          }\r
        }\r
      },\r
 +    "original_picture": {\r
 +      "uses": {\r
 +        "multipart": {\r
 +          "fields": {\r
 +            "file": {\r
 +              "label": {\r
 +                "type": "none"\r
 +              },\r
 +              "tag": {\r
 +                "type": "file"\r
 +              }\r
 +            }\r
 +          },\r
 +          "field_names": [\r
 +            "file"\r
 +          ]\r
 +        }\r
 +      }\r
 +    },\r
      "original_picture_license_group": {\r
        "uses": {\r
          "default": {\r