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

diff --git a/app/assets/javascripts/editor.js.coffee b/app/assets/javascripts/editor.js.coffee
index e2e48cd..6a62197 100644 (file)
--- a/app/assets/javascripts/editor.js.coffee
+++ b/app/assets/javascripts/editor.js.coffee
@@ -209,11 +209,20 @@ class Editor.EditorModule.DockModule.TabModule.BayLabel extends Editor.EditorMod
   render: () ->\r
     this.$el.html('')\r
     @el.className = @dom_class()\r
-    a = new Tag.A({attr: {href: '/#' + @body().dom_id()}, content: @caption})\r
+    a = new Tag.A({attr: {href: '#' + @body().dom_id()}, content: @caption})\r
     this.$el.html(a.render().el)\r
     this\r
   \r
 class Editor.EditorModule.DockModule.TabModule.BayBody extends Editor.EditorModule.DockModule.TabModule.Body\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+  \r
+  render: () ->\r
+    this.$el.html('')\r
+    this.$el.attr('id', @dom_id())\r
+    this\r
+  \r
   bay: () ->\r
     @parent\r
   \r
@@ -253,10 +262,21 @@ class Editor.EditorModule.DockModule.TabModule.BoardLabel extends Editor.EditorM
   dom_class: () ->\r
     @board().dom_class() + '-label'\r
   \r
+  with_destroy_button: () ->\r
+    true\r
+  \r
   render: () ->\r
     this.$el.html('')\r
-    @el.className = @dom_class()\r
-    this.$el.html(@element().element_face().render().el)\r
+    this.$el.attr('id', @dom_id())\r
+    this.$el.className = @dom_class()\r
+    linked_elements_tab = new Tag.A({\r
+      attr: {href: '#' + @board().body.dom_id() },\r
+      content: @element().element_face().render().el\r
+    })\r
+    this.$el.append(linked_elements_tab.render().el)\r
+    if @with_destroy_button()\r
+      destroy_button = new Editor.EditorModule.DestroyButton()\r
+      this.$el.append(destroy_button.render().el)\r
     this\r
   \r
 class Editor.EditorModule.DockModule.TabModule.BoardBody extends Editor.EditorModule.DockModule.TabModule.Body\r
@@ -275,3 +295,20 @@ class Editor.EditorModule.DockModule.TabModule.BoardBody extends Editor.EditorMo
   dom_class: () ->\r
     @board().dom_class() + '-body'\r
   \r
+class Editor.EditorModule.DestroyButton extends Backbone.View\r
+  tagName: 'button'\r
+  \r
+  render: () ->\r
+    this.$el.html('')\r
+    this.$el.button {\r
+      icons: {\r
+        primary: 'ui-icon-close', \r
+        secondary: null\r
+      }, \r
+      text: false\r
+    }\r
+    this\r
+  \r
+  dom_id: () ->\r
+    @dom_id() + '-destroy_button'\r
+  \r

diff --git a/app/assets/javascripts/editor/panel_editor.js.coffee b/app/assets/javascripts/editor/panel_editor.js.coffee
index 0808bad..0cfaee1 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor.js.coffee
@@ -20,6 +20,7 @@ class Editor.PanelEditor extends Backbone.View
     this.$el.append(@credits.render().el)\r
     rb = new Tag.RowBreak()\r
     this.$el.append(rb.render().el)\r
+    this.$el.tabs()\r
     this\r
   \r
   root_item: () ->\r

diff --git a/app/assets/javascripts/editor/panel_editor/dock.js.coffee b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
index 4fe7308..6fb3de4 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor/dock.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
@@ -99,18 +99,19 @@ class Editor.EditorModule.DockModule.TabModule.RootBayBody extends Editor.Editor
   \r
   initialize: (options) ->\r
     super(options)\r
-    @form = new Locmare.Form({\r
-      form_name: @root_item().item_name(), \r
-      item: @root_item(), \r
-      mounted: @mounted(), \r
-      submit: 'default', \r
-      operators: @operators\r
-    })\r
+    @form = new Locmare.Bucket.factory(\r
+      @root_item().item_name(), \r
+      @root_item(), \r
+      @mounted(), \r
+      'default', \r
+      @dock().editor().operators\r
+    )\r
     @bucket = new Editor.EditorModule.DockModule.FormBucket({\r
       parent: this, form: @form\r
     })\r
   \r
   render: () ->\r
+    super()\r
     @el.className = @bay().body.dom_class()\r
     this.$el.html(@bucket.render().el)\r
     this\r
@@ -143,142 +144,259 @@ class Editor.EditorModule.DockModule.ElementBay extends Editor.EditorModule.Dock
   \r
   render: () ->\r
     this.$el.html('')\r
-    _this = this\r
-    _.each @tabs, (tab) ->\r
-      _this.$el.append(tab.label.render().el)\r
-    this.$el.append('bdy')\r
-    rb = new Tag.RowBreak()\r
-    this.$el.append(rb.render().el)\r
+    this.$el.attr('id', @body.dom_id())\r
+    elements_tabs = new Editor.EditorModule.DockModule.ElementBay.ElementsTabs({\r
+      tabs: @tabs\r
+    })\r
+    this.$el.append(elements_tabs.render().el)\r
+    elements_tabs.$el.tabs()\r
+    elements_tabs.$el.addClass('ui-tabs-vertical ui-helper-clearfix')\r
+    $("li", elements_tabs.$el).removeClass('ui-corner-top')\r
+    $("li", elements_tabs.$el).addClass('ui-corner-left')\r
     this\r
   \r
   elements: () ->\r
     @root_item().scenario_elements()\r
   \r
+class Editor.EditorModule.DockModule.ElementBay.ElementsTabs extends Backbone.View\r
+  tagName: 'div'\r
+  className: 'elements_tabs ui-tabs-vertical ui-helper-clearfix'\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+    @tabs = options.tabs\r
+  \r
+  render: () ->\r
+    this.$el.html('')\r
+    _this = this\r
+    labels = _.map @tabs, (tab) ->\r
+      tab.label\r
+    inner_elements_tabs = new Editor.EditorModule.DockModule.ElementBay.InnerElementsTabs({\r
+      labels: labels\r
+    })\r
+    this.$el.append(inner_elements_tabs.render().el)\r
+    _.each @tabs, (tab) ->\r
+      _this.$el.append(tab.body.render().el)\r
+    this\r
+  \r
+class Editor.EditorModule.DockModule.ElementBay.InnerElementsTabs extends Backbone.View\r
+  tagName: 'ul'\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+    @labels = options.labels\r
+  \r
+  render: () ->\r
+    this.$el.html('')\r
+    _this = this\r
+    _.each @labels, (label) ->\r
+      _this.$el.append(label.render().el)\r
+    this\r
+  \r
 class Editor.EditorModule.DockModule.TabModule.ElementBayLabel extends Editor.EditorModule.DockModule.TabModule.BayLabel\r
   \r
 class Editor.EditorModule.DockModule.TabModule.ElementBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
   \r
+  render: () ->\r
+    @body.render()\r
+  \r
 class Editor.EditorModule.DockModule.ElementBoard extends Editor.EditorModule.DockModule.Board\r
   \r
   initialize: (options) ->\r
     super(options)\r
     @element = options.element\r
   \r
+  dom_id: () ->\r
+    super() + '-' + @element.get('id') + '-'  # use tab index\r
+  \r
 class Editor.EditorModule.DockModule.TabModule.ElementBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
   \r
 class Editor.EditorModule.DockModule.TabModule.ElementBoardBody extends Editor.EditorModule.DockModule.TabModule.BoardBody\r
   \r
   initialize: (options) ->\r
     super(options)\r
-    @form = new Locmare.Bucket({\r
-      bucket_name: @element().item_name(), \r
-      item: @element(), \r
-      mounted: @mounted(), \r
-      submit: null, \r
-      operators: @operators\r
-    })\r
+    @form = Locmare.Bucket.factory(\r
+      @element().item_name(), \r
+      @element(), \r
+      @mounted(), \r
+      null, \r
+      @dock().editor().operators\r
+    )\r
     @bucket = new Editor.EditorModule.DockModule.FormBucket({\r
       parent: this, form: @form\r
     })\r
   \r
+  render: () ->\r
+    this.$el.attr('id', @dom_id())\r
+    this.$el.html(@bucket.render().el)\r
+    this\r
+  \r
   mounted: () ->\r
     true\r
   \r
   element: () ->\r
     @parent.element\r
   \r
-class Editor.EditorModule.DockModule.PriorityBay extends Editor.EditorModule.DockModule.BoardBay\r
+class Editor.EditorModule.DockModule.ScenarioBay extends Editor.EditorModule.DockModule.BoardBay\r
   \r
   initialize: (options) ->\r
     super(options)\r
     _this = this\r
     i = 0\r
     _.each @elements(), (element) ->\r
-      tab = new Editor.EditorModule.DockModule.PriorityBoard({\r
-        parent: this, index: i, name: element.item_name(), element: element\r
+      tab = new Editor.EditorModule.DockModule.ScenarioBoard({\r
+        parent: _this, index: i, name: element.item_name(), element: element\r
       })\r
       _this.add_tab(\r
         tab, \r
-        new Editor.EditorModule.DockModule.TabModule.PriorityBoardLabel({parent: tab, name: element.item_name()}), \r
-        new Editor.EditorModule.DockModule.TabModule.PriorityBoardBody({parent: tab})\r
+        new Editor.EditorModule.DockModule.TabModule.ScenarioBoardLabel({parent: tab, caption: element.item_name()}), \r
+        new Editor.EditorModule.DockModule.TabModule.ScenarioBoardBody({parent: tab})\r
       )\r
       i++\r
   \r
+  render: () ->\r
+    this.$el.html('')\r
+    this.$el.attr('id', @body.dom_id())\r
+    _this = this\r
+    elements_tabs = new Editor.EditorModule.DockModule.ScenarioBay.ScenarioTabs({\r
+      tabs: @tabs\r
+    })\r
+    this.$el.append(elements_tabs.render().el)\r
+    _.each @tabs, (tab) ->\r
+      _this.$el.append(tab.body.render().el)\r
+    elements_tabs.$el.tabs()\r
+    this\r
+  \r
   elements: () ->\r
     @root_item().scenario_elements()\r
   \r
   class_name: () ->\r
-    "zsort-box"\r
+    "tsort-box"\r
   \r
-class Editor.EditorModule.DockModule.TabModule.PriorityBayLabel extends Editor.EditorModule.DockModule.TabModule.BayLabel\r
+class Editor.EditorModule.DockModule.ScenarioBay.ScenarioTabs extends Backbone.View\r
+  tagName: 'ul'\r
+  className: 'tsort'\r
   \r
-class Editor.EditorModule.DockModule.TabModule.PriorityBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
+  initialize: (options) ->\r
+    super(options)\r
+    @tabs = options.tabs\r
   \r
-class Editor.EditorModule.DockModule.PriorityBoard extends Editor.EditorModule.DockModule.Board\r
+  render: () ->\r
+    this.$el.html('')\r
+    _this = this\r
+    _.each @tabs, (tab) ->\r
+      _this.$el.append(tab.label.render().el)\r
+    this\r
+  \r
+class Editor.EditorModule.DockModule.TabModule.ScenarioBayLabel extends Editor.EditorModule.DockModule.TabModule.BayLabel\r
+  \r
+class Editor.EditorModule.DockModule.TabModule.ScenarioBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+  \r
+class Editor.EditorModule.DockModule.ScenarioBoard extends Editor.EditorModule.DockModule.Board\r
   \r
   initialize: (options) ->\r
     super(options)\r
     @element = options.element\r
   \r
-  mounted: () ->\r
-    false\r
+class Editor.EditorModule.DockModule.TabModule.ScenarioBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
   \r
-class Editor.EditorModule.DockModule.TabModule.PriorityBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
+  with_destroy_button: () ->\r
+    false\r
   \r
-class Editor.EditorModule.DockModule.TabModule.PriorityBoardBody extends Editor.EditorModule.DockModule.TabModule.BoardBody\r
+class Editor.EditorModule.DockModule.TabModule.ScenarioBoardBody extends Editor.EditorModule.DockModule.TabModule.BoardBody\r
   \r
   initialize: (options) ->\r
     super(options)\r
-    @bucket = new Editor.EditorModule.DockModule.PriorityBucket({\r
+    @bucket = new Editor.EditorModule.DockModule.ScenarioBucket({\r
       parent: this\r
     })\r
-    \r
-#    form_manager = Pettanr::Application::manifest.form_managers[self.root_item.form_name]\r
-#    form = form_manager.open self.root_item, @dock_body.dock.editor.operators, mounted\r
-#    bucket = Bucket.new self,form\r
   \r
-class Editor.EditorModule.DockModule.ScenarioBay extends Editor.EditorModule.DockModule.BoardBay\r
+class Editor.EditorModule.DockModule.PriorityBay extends Editor.EditorModule.DockModule.BoardBay\r
   \r
   initialize: (options) ->\r
     super(options)\r
     _this = this\r
     i = 0\r
     _.each @elements(), (element) ->\r
-      tab = new Editor.EditorModule.DockModule.ScenarioBoard({\r
-        parent: this, index: i, name: element.item_name(), element: element\r
+      tab = new Editor.EditorModule.DockModule.PriorityBoard({\r
+        parent: _this, index: i, name: element.item_name(), element: element\r
       })\r
       _this.add_tab(\r
         tab, \r
-        new Editor.EditorModule.DockModule.TabModule.ScenarioBoardLabel({parent: tab, caption: element.item_name()}), \r
-        new Editor.EditorModule.DockModule.TabModule.ScenarioBoardBody({parent: tab})\r
+        new Editor.EditorModule.DockModule.TabModule.PriorityBoardLabel({parent: tab, name: element.item_name()}), \r
+        new Editor.EditorModule.DockModule.TabModule.PriorityBoardBody({parent: tab})\r
       )\r
       i++\r
   \r
+  render: () ->\r
+    this.$el.html('')\r
+    this.$el.attr('id', @body.dom_id())\r
+    _this = this\r
+    elements_tabs = new Editor.EditorModule.DockModule.PriorityBay.PriorityTabs({\r
+      tabs: @tabs\r
+    })\r
+    this.$el.append(elements_tabs.render().el)\r
+    _.each @tabs, (tab) ->\r
+      _this.$el.append(tab.body.render().el)\r
+    elements_tabs.$el.tabs()\r
+    this\r
+  \r
   elements: () ->\r
     @root_item().scenario_elements()\r
   \r
   class_name: () ->\r
-    "tsort-box"\r
+    "zsort-box"\r
   \r
-class Editor.EditorModule.DockModule.TabModule.ScenarioBayLabel extends Editor.EditorModule.DockModule.TabModule.BayLabel\r
+class Editor.EditorModule.DockModule.PriorityBay.PriorityTabs extends Backbone.View\r
+  tagName: 'ul'\r
+  className: 'zsort'\r
   \r
-class Editor.EditorModule.DockModule.TabModule.ScenarioBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
+  initialize: (options) ->\r
+    super(options)\r
+    @tabs = options.tabs\r
   \r
-class Editor.EditorModule.DockModule.ScenarioBoard extends Editor.EditorModule.DockModule.Board\r
+  render: () ->\r
+    this.$el.html('')\r
+    _this = this\r
+    _.each @tabs, (tab) ->\r
+      _this.$el.append(tab.label.render().el)\r
+    this\r
+  \r
+class Editor.EditorModule.DockModule.TabModule.PriorityBayLabel extends Editor.EditorModule.DockModule.TabModule.BayLabel\r
+  \r
+class Editor.EditorModule.DockModule.TabModule.PriorityBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+  \r
+class Editor.EditorModule.DockModule.PriorityBoard extends Editor.EditorModule.DockModule.Board\r
   \r
   initialize: (options) ->\r
     super(options)\r
     @element = options.element\r
   \r
-class Editor.EditorModule.DockModule.TabModule.ScenarioBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
+  mounted: () ->\r
+    false\r
   \r
-class Editor.EditorModule.DockModule.TabModule.ScenarioBoardBody extends Editor.EditorModule.DockModule.TabModule.BoardBody\r
+class Editor.EditorModule.DockModule.TabModule.PriorityBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
+  \r
+  with_destroy_button: () ->\r
+    false\r
+  \r
+class Editor.EditorModule.DockModule.TabModule.PriorityBoardBody extends Editor.EditorModule.DockModule.TabModule.BoardBody\r
   \r
   initialize: (options) ->\r
     super(options)\r
-    @bucket = new Editor.EditorModule.DockModule.ScenarioBucket({\r
+    @bucket = new Editor.EditorModule.DockModule.PriorityBucket({\r
       parent: this\r
     })\r
+    \r
+#    form_manager = Pettanr::Application::manifest.form_managers[self.root_item.form_name]\r
+#    form = form_manager.open self.root_item, @dock_body.dock.editor.operators, mounted\r
+#    bucket = Bucket.new self,form\r
   \r
 class Editor.EditorModule.DockModule.NewBay extends Editor.EditorModule.DockModule.BoardBay\r
   \r
@@ -288,6 +406,9 @@ class Editor.EditorModule.DockModule.TabModule.NewBayLabel extends Editor.Editor
 \r
 class Editor.EditorModule.DockModule.TabModule.NewBayBody extends Editor.EditorModule.DockModule.TabModule.BayBody\r
   \r
+  initialize: (options) ->\r
+    super(options)\r
+  \r
 class Editor.EditorModule.DockModule.NewBoard extends Editor.EditorModule.DockModule.Board\r
   \r
 class Editor.EditorModule.DockModule.TabModule.NewBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r

diff --git a/app/assets/javascripts/locmare/bucket.js.coffee b/app/assets/javascripts/locmare/bucket.js.coffee
index 64f939c..ece55d1 100644 (file)
--- a/app/assets/javascripts/locmare/bucket.js.coffee
+++ b/app/assets/javascripts/locmare/bucket.js.coffee
@@ -13,7 +13,7 @@ class Locmare.Bucket extends Backbone.View
         action: '/' + item.table_name() + '/' + Pettanr.to_s(item.get('id'))\r
       })\r
     else\r
-      new Locmare.Form({\r
+      Locmare.Form.factory({\r
         form_name: bucket_or_form_name, \r
         item: item, \r
         mounted: mounted, \r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee
index 43031f8..bb5eb7d 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/icon/default.js.coffee
@@ -16,7 +16,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.IconItemColum
     })\r
     this.$el.html(a.render().el)\r
     @delegateEvents({\r
-      'click .face': 'profiler'\r
+      'click .face': 'profiler',\r
     })\r
     this\r
   \r

diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index 9a32fbd..f9ec80f 100644 (file)
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -22,6 +22,10 @@ class Locmare.FormBase extends Backbone.View
       @root_form_name = @form_name\r
     @manifest = LocalManifest.manifest().forms[@form_name]\r
     @fields = {}\r
+    @on('change:field', @change)\r
+  \r
+  change: (field) ->\r
+    console.log(field.field_name)\r
   \r
   fold_extend_settings: (params) ->\r
     @item.my_class().fold_extend_settings params[@item.item_name()]\r
@@ -39,6 +43,13 @@ class Locmare.FormBase extends Backbone.View
   \r
 class Locmare.Form extends Locmare.FormBase\r
   \r
+  @factory: (options) ->\r
+    custom_form = Pettanr.Views[Pettanr.camelize(options.item.model_name())].Form\r
+    if custom_form\r
+      new custom_form(options)\r
+    else\r
+      new Locmare.Form(options)\r
+  \r
   initialize: (options) ->\r
     super(options)\r
     @submit = options.submit\r
@@ -59,7 +70,7 @@ class Locmare.Form extends Locmare.FormBase
     this.$el.html('')\r
     @error_explanation = null\r
     @div_fields = new Locmare.FormModule.Fields({\r
-      fields: @fields\r
+      parent: this, fields: @fields\r
     })\r
     #this.$el.append(@error_explanation.render().el) if not @error_explanation\r
     this.$el.append(@div_fields.render().el)\r
@@ -166,6 +177,7 @@ class Locmare.FormModule.Fields extends Backbone.View
   className: 'fields'\r
   \r
   initialize: (options) ->\r
+    @parent = options.parent\r
     @fields = options.fields\r
   \r
   render: () ->\r

diff --git a/app/assets/javascripts/locmare/form/field.js.coffee b/app/assets/javascripts/locmare/form/field.js.coffee
index 3a92a9e..4b559a1 100644 (file)
--- a/app/assets/javascripts/locmare/form/field.js.coffee
+++ b/app/assets/javascripts/locmare/form/field.js.coffee
@@ -11,6 +11,7 @@ class Locmare.FormModule.Field extends Backbone.View
     @helpers = new Locmare.FormModule.FieldModule.Helpers({field: this, field_manifest: @field_manifest})\r
     @rb = @row_break()\r
     @options = {'data-model': @field_manifest.form_name}\r
+    @on('change', @change)\r
   \r
   render: () ->\r
     this.$el.html('')\r
@@ -19,6 +20,9 @@ class Locmare.FormModule.Field extends Backbone.View
     this.$el.append(@helpers.render().el)\r
     this\r
   \r
+  change: () ->\r
+    @form.trigger('change:field', this)\r
+    \r
   mounted: () ->\r
     if @form.mounted\r
       0\r

diff --git a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
index 9f2e413..2da8777 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/base.js.coffee
@@ -4,7 +4,7 @@ class Locmare.FormModule.FieldModule.TagModule.Base extends Backbone.View
   initialize: (options) ->\r
     @field = options.field\r
     @tag_manifest = options.tag_manifest\r
-  \r
+    \r
   form_field_name: () ->\r
     @field.form_field_name()\r
   \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 a55ae71..7054991 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
@@ -1,4 +1,10 @@
 class Locmare.FormModule.FieldModule.TagModule.NumberTag extends Locmare.FormModule.FieldModule.TagModule.Base\r
+  events: {\r
+    'change': 'change'\r
+  }\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
   \r
   render: () ->\r
     this.$el.html('')\r
@@ -11,3 +17,6 @@ class Locmare.FormModule.FieldModule.TagModule.NumberTag extends Locmare.FormMod
     this.$el.attr(@attr)\r
     this\r
   \r
+  change: () ->\r
+    @field.trigger('change')\r
+  \r

diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
index f3db69f..a88d904 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
@@ -51,7 +51,7 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod
         {id: filter_id}\r
       else\r
         {}\r
-      list = Locmare.ListGroup.list(resource_model_name, resource_list_name, @form().operators, {})\r
+      list = Locmare.ListGroup.list(resource_controller_name, resource_action_name, @form().operators, {})\r
       list.open((page_status) ->\r
         members = _.map list.models, (member) ->\r
           [member.get(caption_name), member.get('id')]\r

diff --git a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
index 073b195..87c667a 100644 (file)
--- a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
@@ -16,7 +16,5 @@ class Locmare.FormModule.FieldModule.TagModule.TextTag extends Locmare.FormModul
     this\r
   \r
   change: () ->\r
-    console.log this.$el.val()\r
-    @item().set(@field.field_name, this.$el.attr('value'))\r
-    console.log @item().attributes\r
+    @field.trigger('change')\r
   \r

diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index eb01666..8093b36 100644 (file)
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -31,7 +31,7 @@ $ ->
   window.onbeforeunload = (e)->\r
     return('leave?')\r
   window.router = new Pettanr.Router()\r
-  Backbone.history.start({silent: true, pushState: true})\r
+  Backbone.history.start({silent: true, pushState: true, root: '/'})\r
   \r
   # try getting current user(copy paste from users/index)\r
   user = new Pettanr.User.Current()\r

diff --git a/app/assets/javascripts/manifest/model/attribute/source/model.js.coffee b/app/assets/javascripts/manifest/model/attribute/source/model.js.coffee
index 328f58c..0f4dd21 100644 (file)
--- a/app/assets/javascripts/manifest/model/attribute/source/model.js.coffee
+++ b/app/assets/javascripts/manifest/model/attribute/source/model.js.coffee
@@ -3,7 +3,7 @@ class Manifest.ModelModule.AttributeModule.SourceModule.ModelSource extends Mani
   set_default: () ->\r
     super()\r
     @args['resource_item_name'] ||= (@parent.name.replace('_id', ''))\r
-    @args['resource_action_name'] ||= 'select_items'\r
+    @args['resource_action_name'] ||= 'index'\r
     @args['select_item_name'] ||= @item_name() + '_' + @parent.name.replace('_id', '') + '_items'\r
     @args['caption_name'] ||= 'caption'\r
     \r

diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index 1f0c97c..70be1d5 100644 (file)
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -55,4 +55,7 @@ class Pettanr.Panel extends Peta.Root
       @url = @url + @get('id')\r
     if options.with_elements\r
       @url = @url + '?with_elements=true'\r
+    @bind('change:width', () ->\r
+      console.log('cng')\r
+    )\r
   \r

diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee
index a917530..f267f65 100644 (file)
--- a/app/assets/javascripts/pettanr.js.coffee
+++ b/app/assets/javascripts/pettanr.js.coffee
@@ -179,7 +179,7 @@ class Pettanr
         @render_form()\r
     \r
     render_form: () ->\r
-      @form = new Locmare.Form({\r
+      @form = Locmare.Form.factory({\r
         form_name: @item.item_name(), \r
         item: @item, \r
         mounted: true, \r

diff --git a/app/assets/javascripts/views/panels/form.js.coffee b/app/assets/javascripts/views/panels/form.js.coffee
new file mode 100644 (file)
index 0000000..7075c4d
--- /dev/null
+++ b/app/assets/javascripts/views/panels/form.js.coffee
@@ -0,0 +1,7 @@
+class Pettanr.Views.Panel.Form extends Locmare.Form\r
+  \r
+  initialize: (options) ->\r
+    super(options)\r
+    'width'\r
+    'height'\r
+    'border'\r

diff --git a/app/assets/javascripts/views/speech_balloons/element_face.js.coffee b/app/assets/javascripts/views/speech_balloons/element_face.js.coffee
index 532b0c7..3a8c175 100644 (file)
--- a/app/assets/javascripts/views/speech_balloons/element_face.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/element_face.js.coffee
@@ -30,7 +30,7 @@ class Pettanr.Views.SpeechBalloon.ElementFace extends Backbone.View
     name = Pettanr.truncate(speech.get('content'), 15)\r
     caption = new Tag.Span({class_name: 'elements-tab-face-caption', content: name})\r
     this.$el.append(caption.render().el)\r
-    fe = new Tag.Div({class_name: 'elements-tab-face-end'})\r
-    this.$el.append(fe.render().el)\r
+    rb = new Tag.RowBreak()\r
+    this.$el.append(rb.render().el)\r
     this\r
   \r

diff --git a/app/assets/stylesheets/test.css.scss b/app/assets/stylesheets/test.css.scss
index f88250c..768a1ee 100644 (file)
--- a/app/assets/stylesheets/test.css.scss
+++ b/app/assets/stylesheets/test.css.scss
@@ -56,6 +56,18 @@ select.error {
   position:    absolute;
 }
 
+// hide number field's spinner
+  //for chrome
+  input[type=number]::-webkit-outer-spin-button,
+  input[type=number]::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+      margin: 0;
+  }
+  // for firefox
+  input[type=number] {
+      -moz-appearance:textfield;
+  }
+
 .pettanr-comic-wrapper {
   margin:  1em auto;
 }