mokio 0.0.8 → 0.0.9

data/app/assets/stylesheets/backend/plugins/forms/select2/{select2.css → select2.css.scss}

@@ -211,13 +211,13 @@ Version: 3.0 Timestamp: Tue Jul 31 21:09:16 PDT 2012
 }
 
 .select2-search input.select2-active {
-    background: #fff url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%;
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
-    background: url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: #fff image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%;
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
 }
 
 
@@ -339,7 +339,7 @@ disabled look for already selected choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
-    background: #f4f4f4 url(backend/plugins/forms/select2/spinner.gif) no-repeat 100%;
+    background: #f4f4f4 image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100%;
 }
 
 .select2-more-results {
@@ -425,7 +425,7 @@ disabled look for already selected choices in the results dropdown
 }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff url(backend/plugins/forms/select2/spinner.gif) no-repeat 100% !important;
+    background: #fff image-url('backend/plugins/forms/select2/spinner.gif') no-repeat 100% !important;
 }
 
 .select2-default {
@@ -473,7 +473,7 @@ disabled look for already selected choices in the results dropdown
   width: 12px;
   height: 13px;
   font-size: 1px;
-  background: url(backend/plugins/forms/select2/select2.png) right top no-repeat;
+  background: image-url('backend/plugins/forms/select2/select2.png') right top no-repeat;
   outline: none;
 }
 

data/app/assets/stylesheets/backend/supr-theme/{jquery-ui-timepicker-addon.css → jquery-ui-timepicker-addon.css.scss}

@@ -10,5 +10,5 @@
 .ui_tpicker_hour_label{margin-left: 10px;float: left;margin-top: -8px;}
 .ui_tpicker_minute_label {margin-left: 10px;float: left;margin-top: -8px;}
 .ui-datepicker-buttonpane button.ui-datepicker-current{
-	background: #9FC569 url(images/ui-bg_glass_55_9fc569_1x400.png) 50% 50% repeat-x;
+	background: #9FC569 image-url('ui-bg_glass_55_9fc569_1x400.png') 50% 50% repeat-x;
 }

data/app/assets/stylesheets/backend/supr-theme/{jquery.ui.datepicker.css → jquery.ui.datepicker.css.scss}

@@ -1,76 +1,76 @@
-/*!
- * jQuery UI Datepicker 1.8.21
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 100%; padding: 0; display: none; z-index: 9999; max-width: 318px; }
-.ui-datepicker .ui-datepicker-header { 
-  background: url("backend/patterns/2.png") repeat scroll 0 0 rgba(0, 0, 0, 0);
-  position:relative; 
-  padding:.5em 0; 
-  margin-top:-1px; 
-  margin-left: -1px; 
-  margin-right:-1px; 
-}
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 7px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:4px; background:url(backend/icons/left-arrow.png) no-repeat; }
-.ui-datepicker .ui-datepicker-next { right:4px; background:url(backend/icons/right-arrow.png) no-repeat;}
-.ui-datepicker .ui-datepicker-prev-hover { border:none; top:7px; opacity:0.7; filter:alpha(opacity=70);}
-.ui-datepicker .ui-datepicker-next-hover { border:none; top:7px; opacity:0.7; filter:alpha(opacity=70);}
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: none; }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker table thead {border-bottom: 1px solid #C4C4C4; line-height: 12px;}
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .5em; text-align: center; text-decoration: none;border:none !important;}
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}
+/*!
+ * jQuery UI Datepicker 1.8.21
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 100%; padding: 0; display: none; z-index: 9999; max-width: 318px; }
+.ui-datepicker .ui-datepicker-header { 
+  background: image-url("backend/patterns/2.png") repeat scroll 0 0 rgba(0, 0, 0, 0);
+  position:relative; 
+  padding:.5em 0; 
+  margin-top:-1px; 
+  margin-left: -1px; 
+  margin-right:-1px; 
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 7px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:4px; background:image-url('backend/icons/left-arrow.png') no-repeat; }
+.ui-datepicker .ui-datepicker-next { right:4px; background:image-url('backend/icons/right-arrow.png') no-repeat;}
+.ui-datepicker .ui-datepicker-prev-hover { border:none; top:7px; opacity:0.7; filter:alpha(opacity=70);}
+.ui-datepicker .ui-datepicker-next-hover { border:none; top:7px; opacity:0.7; filter:alpha(opacity=70);}
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: none; }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker table thead {border-bottom: 1px solid #C4C4C4; line-height: 12px;}
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .5em; text-align: center; text-decoration: none;border:none !important;}
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}

data/app/assets/stylesheets/backend/supr-theme/jquery.ui.supr.css.scss

@@ -3,7 +3,7 @@
 @import "backend/supr-theme/jquery.ui.resizable";
 @import "backend/supr-theme/jquery.ui.dialog";
 @import "backend/supr-theme/jquery.ui.slider";
-@import "backend/supr-theme/jquery.ui.datepicker";
+@import "jquery.ui.datepicker";
 @import "backend/supr-theme/jquery.ui.progressbar";
 /*@import "jquery-ui-timepicker-addon";*/
 @import "backend/supr-theme/jquery.ui.autocomplete";

data/app/assets/stylesheets/backend/supr-theme/jquery.ui.theme.css.scss

@@ -5,7 +5,7 @@
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: 'Droid Sans', Helvetica, Arial, sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #c4c4c4; background: #ffffff image-url('backend/ui-bg_flat_75_ffffff_40x100.png') 50% 50% repeat-x; color: #353535; }
 .ui-widget-content a { color: #353535; }
-.ui-widget-header { border: 1px solid #c4c4c4; background: #f4f4f4 url(backend/patterns/2-1.png) 50% 50% repeat; color: #353535; font-weight: bold; }
+.ui-widget-header { border: 1px solid #c4c4c4; background: #f4f4f4 image-url('backend/patterns/2-1.png') 50% 50% repeat; color: #353535; font-weight: bold; }
 .ui-widget-header a { color: #353535; }
 
 
@@ -47,7 +47,7 @@
 	border-radius: 2px;
 	-webkit-border-radius:2px;
 	-moz-border-radius:2px;
-	background: #9fc569 url(backend/ui-bg_glass_55_9fc569_1x400.png) 50% 50% repeat-x; 
+	background: #9fc569 image-url('ui-bg_glass_55_9fc569_1x400.png') 50% 50% repeat-x;
 	color: #363636; 
 
 }

data/app/datatables/commons_datatable.rb

@@ -92,12 +92,13 @@ private
       else
 
       columns = ''
-      @obj_class.column_names.each do |c|
-        columns << c
+      first_col = true
+      @obj_class.columns.each do |c|
+        next unless [:string, :text].include? c.type
+        columns << " OR " unless first_col
+        columns << c.name
         columns << ' LIKE :kw'
-        if c != @obj_class.column_names.last
-          columns << " OR "
-        end
+        first_col = false
       end
 
       collection = @obj_class.order("#{sort_column} #{sort_direction}").where("#{columns}",:kw=>"%#{params[:sSearch]}%")

data/app/views/mokio/articles/_form.html.slim

@@ -1,15 +1,14 @@
-- cache [:form, obj] do
-  = render :partial => "mokio/common/main_pic", locals: {f:f}
-  = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
-  = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
-  = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
-  = f.input :title, disabled: !obj.display_editable_field?('title')
-  = f.input :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
-  = f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
-  = f.input :display_from, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) },  disabled: !obj.display_editable_field?('display_from')
-  = f.input :display_to, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) },  disabled: !obj.display_editable_field?('display_to')
-  .row-fluid
-    label.form-label.span2
-      = t('menus.content_assoc')
-    .span10
-      =collection_select(:article, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
+= render :partial => "mokio/common/main_pic", locals: {f:f}
+= f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
+= f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
+= f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
+= f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
+= f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
+= f.input :display_from, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) },  disabled: !obj.display_editable_field?('display_from')
+= f.input :display_to, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) },  disabled: !obj.display_editable_field?('display_to')
+.row-fluid
+  label.form-label.span2
+    = t('menus.content_assoc')
+  .span10
+    =collection_select(:article, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)

data/app/views/mokio/backend/common/_form_content.html.haml

@@ -7,7 +7,7 @@
       = simple_form_for [:backend, obj], :html => { :class => 'form-horizontal' } do |f|
         = render :partial => "mokio/backend/common/gmap", locals: {obj: obj, f: f} if obj.class.has_gmap_enabled?
         = render :partial => "mokio/backend/common/meta", locals: {obj: obj, f: f} if obj.class.has_meta_enabled?
-     
+
         = render :partial => "mokio/backend/#{obj.class.to_s.tableize}/form", :locals => {f: f, obj: obj}
         
         - if params[:action] != "edit" || !has_data_files?(obj)

data/app/views/mokio/backend/contacts/_form.html.haml

@@ -31,7 +31,7 @@
               = "%content% - Treść"
 
       = t.input :tpl, :label => "",  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }
-   
+
 
 = f.hidden_field :contact, value: true
 = f.hidden_field :intro, value: ""

data/app/views/mokio/backend/dashboard/show.html.haml

@@ -9,27 +9,27 @@
   - unless @loose_content.empty?
     = render :template => "mokio/backend/dashboard/tbl_content", |
       locals: { collection: @loose_content, | 
-                title_msg: bt('content_not_in_menu'), | 
-                label_msg: bt("all_dashboard"), |
-                more: @more_loose_content, |
-                more_link: only_loose_backend_contents_path }
+      title_msg: bt('content_not_in_menu'), |
+      label_msg: bt("all_dashboard"), |
+      more: @more_loose_content, |
+      more_link: only_loose_backend_contents_path }
 
   - unless @empty_menu.empty?
     = render :template => "mokio/backend/dashboard/tbl_content", |
       locals: { collection: @empty_menu, | 
-                title_msg: bt('menu_with_invisible'), | 
-                label_msg: bt("all_dashboard"), | 
-                more: @more_empty_menu, |
-                more_link: only_loose_backend_contents_path }
+      title_msg: bt('menu_with_invisible'), |
+      label_msg: bt("all_dashboard"), |
+      more: @more_empty_menu, |
+      more_link: only_loose_backend_contents_path }
 
 .row-fluid
   = render :template => "mokio/backend/dashboard/tbl_content", |
     locals: { collection: @last_updated, | 
-              title_msg: bt('last_updated_content'), | 
-              label_msg: bt("last_updated"), | 
-              more: @last_updated.any? ? @last_updated.first.updated_at.strftime("%d-%m-%Y") : "" }
+    title_msg: bt('last_updated_content'), |
+    label_msg: bt("last_updated"), |
+    more: @last_updated.any? ? @last_updated.first.updated_at.strftime("%d-%m-%Y") : "" }
   = render :template => "mokio/backend/dashboard/tbl_content", |
     locals: { collection: @last_created, | 
-              title_msg: bt('last_created_content'), | 
-              label_msg: bt("last_created"), | 
-              more: @last_created.any? ? @last_created.first.updated_at.strftime("%d-%m-%Y") : "" }
+    title_msg: bt('last_created_content'), |
+    label_msg: bt("last_created"), |
+    more: @last_created.any? ? @last_created.first.updated_at.strftime("%d-%m-%Y") : "" }

data/app/views/mokio/contacts/_form.html.slim

@@ -1,16 +1,15 @@
-- cache [:form, obj] do
-  = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
-  = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
-  = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
-  = f.input :title, disabled: !obj.display_editable_field?('title')
-  = f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
+= f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
+= f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
+= f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
+= f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
 
-  = f.input :recipient_emails, :as => :string, :input_html => { :class => "recipients span10" }, disabled: !obj.display_editable_field?('recipient_emails')
-  .row-fluid
-    label.form-label.span2
-      = t('menus.content_assoc')
-    .span10
-      =collection_select(:contact, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
+= f.input :recipient_emails, :as => :string, :input_html => { :class => "recipients span10" }, disabled: !obj.display_editable_field?('recipient_emails')
+.row-fluid
+  label.form-label.span2
+    = t('menus.content_assoc')
+  .span10
+    =collection_select(:contact, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
 
 
 .contaner

data/app/views/mokio/external_scripts/_form.html.slim

@@ -1,3 +1,2 @@
-- cache [:form, obj] do
-  = f.input :name
-  = f.input :script
+= f.input :name
+= f.input :script

data/app/views/mokio/langs/_form.html.slim

@@ -1,4 +1,3 @@
-- cache [:form, obj] do
-  = f.input :name
-  = f.input :shortname
-  = f.input :active, :wrapper => :active_checkbox,:input_html => { :checked => true }, disabled: !obj.display_editable_field?('active')
+= f.input :name
+= f.input :shortname
+= f.input :active, :wrapper => :active_checkbox,:input_html => { :checked => true }, disabled: !obj.display_editable_field?('active')

data/app/views/mokio/menus/_form.html.haml

@@ -31,7 +31,8 @@
 = f.input :target, :collection => [[bt("current_window_inside",Mokio::Menu), nil], [bt("new_window",Mokio::Menu), "_blank"]], include_blank: false, disabled: !@menu.display_editable_field?('target')
 
 .row-fluid
-  %label.form-label.span2 Moduły statyczne
+  %label.form-label.span2
+    = btc("blocks", 'Menu')
   .span10
     .tabs_wrap
       %ul.nav.nav-tabs.pattern{:id => "tabs_modules"}

data/app/views/mokio/module_positions/_form.html.slim

@@ -1,3 +1,2 @@
-- cache [:form, obj] do
-  = f.input :name
-  = f.input :tpl
+= f.input :name
+= f.input :tpl

data/app/views/mokio/mov_galleries/_form_inputs.html.slim

@@ -1,17 +1,16 @@
-- cache [:form, obj] do
-  = render :partial => "mokio/common/main_pic", locals: {f:f}
-  = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
-  = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
-  = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
-  = f.input :title, disabled: !obj.display_editable_field?('title')
-  = f.input :intro, label: btc("intro", 'mov_gallery'),  :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
-  = f.input :content, :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }, disabled: !obj.display_editable_field?('content')
-  = f.input :display_from,  :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !obj.display_editable_field?('display_from')
-  = f.input :display_to,    :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !obj.display_editable_field?('display_to')
-  .row-fluid
-    label.form-label.span2
-      = t('menus.content_assoc')
-    .span10
-      =collection_select(:mov_gallery, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
+= render :partial => "mokio/common/main_pic", locals: {f:f}
+= f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
+= f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
+= f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
+= f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :intro, label: btc("intro", 'mov_gallery'),  :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
+= f.input :content, :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }, disabled: !obj.display_editable_field?('content')
+= f.input :display_from,  :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) }, disabled: !obj.display_editable_field?('display_from')
+= f.input :display_to,    :wrapper => :date, :as => :string, :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) }, disabled: !obj.display_editable_field?('display_to')
+.row-fluid
+  label.form-label.span2
+    = t('menus.content_assoc')
+  .span10
+    =collection_select(:mov_gallery, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)