fix js filer

diff --git a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
index ac0b895..dee8293 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
@@ -15,9 +15,8 @@ class Locmare.FilerModule.BodyModule.FileBody extends Backbone.View
     _.each @collection().models, (item) ->\r
       c = _this.file_item_class()\r
       file_item = new c({'file_body': _this, 'item': item})\r
-      args = {'file_item': file_item}\r
-      template = _.template($("#" + file_item.template_name()).html())\r
-      _this.$el.append(template(args))\r
+      h = file_item.render().el.outerHTML\r
+      _this.$el.append(h)\r
     this\r
   \r
   file_item_class: () ->\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
index 65d8749..6c3aa0b 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item.js.coffee
@@ -13,7 +13,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItem extends Backbone.Vi
     @el.className = 'filer-item filer-item-' + @item.item_name()\r
   \r
   render: () ->\r
-    args = {'header': this}\r
+    args = {'file_item': this}\r
     template = _.template($("#" + @template_name()).html())\r
     this.$el.html(template(args))\r
     this\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
index 6007bde..722a7be 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header.js.coffee
@@ -1,7 +1,6 @@
 class Locmare.FilerModule.BodyModule.FileHeader extends Backbone.View\r
   tagName: 'li'\r
   id: ''\r
-  class: 'filer-head filer-head- file_header.item_name'\r
   \r
   initialize: (options) ->\r
     @body = options.body\r
@@ -35,6 +34,7 @@ class Locmare.FilerModule.BodyModule.FileHeader extends Backbone.View
     else\r
       Locmare.FilerModule.BodyModule.FileHeaderModule.None\r
     @edit = new c({'file_header': this, 'column_name': 'edit'})\r
+    @el.className = 'filer-head filer-head-' + @item_name()\r
   \r
   render: () ->\r
     args = {'file_header': this}\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
index 0bf8133..d8cd7bc 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header/base.js.coffee
@@ -1,8 +1,10 @@
 class Locmare.FilerModule.BodyModule.FileHeaderModule.Base extends Backbone.View\r
+  tagName: 'div'\r
   \r
   initialize: (options) ->\r
     @file_header = options.file_header\r
     @column_name = options.column_name\r
+    @el.className = 'filer-head-' + @column_name\r
   \r
   render: () ->\r
     args = {'header_column': this}\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee b/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
index 9c9000e..bf1fd63 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_header/show.js.coffee
@@ -1,7 +1,4 @@
 class Locmare.FilerModule.BodyModule.FileHeaderModule.Show extends Locmare.FilerModule.BodyModule.FileHeaderModule.Base\r
-  tagName: 'li'\r
-  id: ''\r
-  class: 'filer-head filer-head- file_header.item_name'\r
   \r
   template_file_name: () ->\r
     "show"\r

diff --git a/app/views/top/ap.html.erb b/app/views/top/ap.html.erb
index 84dc66d..77c2bf4 100644 (file)
--- a/app/views/top/ap.html.erb
+++ b/app/views/top/ap.html.erb
@@ -30,12 +30,12 @@
   </div>\r
 </script>\r
 <script type="text/template" id="templates-filer-file_header">\r
-  <&= file_header.symbol.render().el.innerHTML &>\r
-  <&= file_header.caption.render().el.innerHTML &>\r
-  <&= file_header.summary.render().el.innerHTML &>\r
-  <&= file_header.icon.render().el.innerHTML &>\r
-  <&= file_header.date.render().el.innerHTML &>\r
-  <&= file_header.edit.render().el.innerHTML &>\r
+  <&= file_header.symbol.render().el.outerHTML &>\r
+  <&= file_header.caption.render().el.outerHTML &>\r
+  <&= file_header.summary.render().el.outerHTML &>\r
+  <&= file_header.icon.render().el.outerHTML &>\r
+  <&= file_header.date.render().el.outerHTML &>\r
+  <&= file_header.edit.render().el.outerHTML &>\r
 </script>\r
 <script type="text/template" id="templates-filer-file_body">\r
   <&= file_body.file_item.render().el.outerHTML &>\r