optimacms 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef343515c2e1648a71a2a81bf9a5bd9ab047e4d1
-  data.tar.gz: 0d755da06153d9eed28027e122996da5abf94688
+  metadata.gz: 541eefdc59f607b5c4571a0dc5a7e9a42270ce21
+  data.tar.gz: 157c3f4c91050b4d477eff86029a263237d2323f
 SHA512:
-  metadata.gz: 1b6b2cdd3ef686dffa25f7cccd12e95494f5ced1a8adb9bb93b00fd6db0da98e66945a0d629c6056b2b5b5dd91dea9c79423c905d4f9a9086543da504d406565
-  data.tar.gz: 43982631e202c5ec32cec04846b6196fa2a69943a89e8a92dc2e26f7b558852a69cca8e3f2837394ac444aba49fabf8448738dc5e6268eb38a8b688f8f7b061b
+  metadata.gz: fa652ca931f2e805a3d3995416c2e91b72234ae6cb68dd8f92f2bb150317d679fe0d904d9d2e76c5193a69b5c723a61e70b5806e1978bd20d751fefa767cb947
+  data.tar.gz: ee36effdf20837a3b70fa4dcfbcc3264c3389a7c5f92736a10207626597e868ce85983407cd329970ccacd21eb55b82517684050d954f178e7147818e68c39e5

data/app/models/optimacms/page.rb

@@ -5,7 +5,7 @@ module Optimacms
     belongs_to :layout, :foreign_key => 'layout_id', :class_name => 'Template'
     belongs_to :template, :foreign_key => 'template_id', :class_name => 'Template'
     belongs_to :folder, :foreign_key => 'parent_id', :class_name => 'Page'
-    has_many :translations, :foreign_key => 'item_id', :class_name => 'PageTranslation'
+    has_many :translations, :foreign_key => 'item_id', :class_name => 'PageTranslation', :dependent => :destroy
     accepts_nested_attributes_for :translations
 
     #has_many :page_translations

data/app/views/optimacms/admin/pages/index.html.haml

@@ -14,23 +14,6 @@
 .filter
   = inline_filter_form_for(@filter)
 
-  -#= simple_form_for(:filter, url: '/', wrapper: :horizontal_search_form, wrapper_mappings: { check_boxes: :search_horizontal_radio_and_checkboxes,  radio_buttons: :search_horizontal_radio_and_checkboxes,          boolean: :search_horizontal_boolean        },
-  -#= simple_form_for(:filter, url: pages_url, wrapper: :inline_search_form, wrapper_mappings: { },
-        html: {:id=>'formFilter'}) do |f|
-    = hidden_field_tag 'cmd', 'apply'
-    = render 'tableview/filter_fields', filter: @filter, f: f
-    = render 'tableview/buttons_apply_clear_simple_form_inline', filter: @filter, f: f
-
-
-
-  -#= form_tag(search_pages_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
-    = hidden_field_tag 'cmd', 'apply'
-
-    = render :partial=>'tableview/filter_fields', :locals => {:filter=>@filter}
-
-    = render :partial=>'tableview/buttons_apply_clear', :locals => {:filter=>@filter}
-
-
 
 - if @parent
   =link_to 'HOME', pages_path(:parent_id=>0)
@@ -39,10 +22,8 @@
 
 %table.table.table-striped.table-bordered
   %tr
-    %th
-      -#= link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
-      = link_to 'Title', '#'
-    %th Name
+    %th= link_to_sortable_column :title, 'Title'
+    %th= link_to_sortable_column :name, 'Name'
     %th URL
     %th Template
     %th Commands

data/app/views/optimacms/admin/templates/_form.html.haml

@@ -15,7 +15,7 @@
       -#= f.input :basename, disabled: true, label: 'Name'
       -#= f.input :basedirpath, label: "Folder", :disabled=> true
       = f.input :path, disabled: true, label: 'File'
-      =link_to 'Rename', '#'
+      -#=link_to 'Rename', '#'
 
 
       -#= f.input :is_translated, label: "Translate?"
@@ -23,7 +23,7 @@
       - if @item.has_code?
         .form-group.template_content
           %label(for="inputContent" class="col-sm-2 col-md-1 control-label")
-            Template
+            Content
 
           .col-sm-8.col-md-8.control
             = f.input_field :content, as: :text, label: "Content", html: {:rows => 16, :cols => 120, :class=>'' }

data/app/views/optimacms/admin/templates/index.html.haml

@@ -14,15 +14,6 @@
 
 .filter
   = inline_filter_form_for(@filter)
-  -#= horizontal_filter_form_for(@filter)
-
-  -#= form_tag(search_templates_url(:action=>'index'), method: "post", :class=>'form-inline', :name=>'formFilter', :id=>'formFilter') do
-    = hidden_field_tag 'cmd', 'apply'
-
-    = render :partial=>'tableview/filter_fields', :locals => {:filter=>@filter}
-
-    = render :partial=>'tableview/buttons_apply_clear', :locals => {:filter=>@filter}
-
 
 
 - if @parent
@@ -36,10 +27,8 @@
 
 %table.table.table-striped.table-bordered
   %tr
-    %th
-      = link_to_sortable_column :title, 'Title'
-      -#= link_to 'Title', pages_path(:cmd=>'order', :orderby=>'title', :orderdir=>@filter.get_opposite_order_dir_for_column('title'))
-    %th Path
+    %th= link_to_sortable_column :title, 'Title'
+    %th= link_to_sortable_column :basepath, 'Path'
     %th Commands
 
   - @items.each do |item|

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.40"
+  VERSION = "0.1.41"
 end

data/spec/dummy/app/views/temp/_part2.html.haml

@@ -0,0 +1 @@
+rrr