optimacms 0.1.53 → 0.1.54

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

@@ -1,108 +1,108 @@
-.row
-  .col-md-12
-    =horizontal_simple_form_for @item do |f|
-      = f.input :title, label: "Title"
-      = f.input :url, as: :string, label: "URL"
-      = f.association :layout, label: "Layout", collection: @layouts
-      = f.input :content, as: :textarea_tinymce, label: "Content", input_html: {:rows => 16, :cols => 120}
-
-      = f.button :submit_cancel, 'Save', :cancel=>@url_back
-
-      -#=f.submit 'Сохранить', :class=>'btn btn-sm btn-primary'
-      -#=link_to 'Отмена', '#', :class=>'btn btn-sm btn-default', :id=>'link_form_cancel'
-
-
-
-
--#<script type="text/javascript" src="/js/tinymce4/tinymce.min.js"></script>
--#<script type="text/javascript" src="/js/tiny_mce/tiny_mce.js"></script>
-
-
--#= javascript_include_tag "tinymce-jquery"
--#= tinymce_assets
-
--#= tinymce :uploadimage_form_url => tinymce_uploadimage_url, :relative_urls => false, remove_script_host: true, image_advtab: true
--#= tinymce_javascript_tag "tinymce_assets"
-
-
-
-
--#:javascript
-  // tinymce 4
-  tinymce.init({
-      selector: "textarea",
-      theme: "modern",
-      plugins: [
-          "advlist autolink lists link image charmap print preview hr anchor pagebreak",
-          "searchreplace wordcount visualblocks visualchars code fullscreen",
-          "insertdatetime media nonbreaking save table contextmenu directionality",
-          "emoticons template paste textcolor colorpicker textpattern"
-      ],
-      toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
-      toolbar2: "print preview media | forecolor backcolor emoticons",
-      image_advtab: true,
-
-      //file_browser_callback : 'myFileBrowser',
-      //image_list: "/mylist.php",
-      /*
-      image_list: [
-        {title: 'MemorialDay2013.jpg', value: '../data/emailpics/MemorialDay2013.jpg'},
-        {title: 'MAPMAY.jpg', value: '../data/emailpics/MAPMAY.jpg'}
-      ],
-      */
-      templates: [
-          {title: 'Test template 1', content: 'Test 1'},
-          {title: 'Test template 2', content: 'Test 2'}
-      ]
-  });
-
-
-  function myFileBrowser(field_name, url, type, win) {
-    console.log('1');
-
-    /* Here goes the URL to your server-side script which manages all file browser things. */
-    // alert("Field_Name: " + field_name + "nURL: " + url + "nType: " + type + "nWin: " + win); // debug/testing
-
-
-    var cmsURL       = '/assetManager/getAllImages';     // your URL could look like "/scripts/my_file_browser.php"
-    var searchString = window.location.search; // possible parameters
-    if (searchString.length < 1) {
-      // add "?" to the URL to include parameters (in other words: create a search string because there wasn't one before)
-      searchString = "?";
-    }
-
-
-    tinyMCE.activeEditor.windowManager.open({
-      file            : cmsURL,
-      title           : 'My File Browser',
-      width           : 420,  // Your dimensions may differ - toy around with them!
-      height          : 400,
-      resizable       : "yes",
-      inline          : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
-      close_previous          : "no"
-      },
-      {
-      window  : win,
-      input   : field_name
-      }
-    );
-
-
-    var win     = tinyMCEPopup.getWindowArg("window");
-    var input   = tinyMCEPopup.getWindowArg("input");
-    var res     = tinyMCEPopup.getWindowArg("resizable");
-    var inline  = tinyMCEPopup.getWindowArg("inline");
-
-    //win.document.forms[0].elements[field_name].value = input;
-
-
-    return false;
-  }
-
-
-
-:coffeescript
-  $ ->
-    $("#link_form_cancel").click (e) ->
-      e.preventDefault()
+.row
+  .col-md-12
+    =horizontal_simple_form_for @item do |f|
+      = f.input :title, label: "Title"
+      = f.input :url, as: :string, label: "URL"
+      = f.association :layout, label: "Layout", collection: @layouts
+      = f.input :content, as: :textarea_tinymce, label: "Content", input_html: {:rows => 16, :cols => 120}
+
+      = f.button :submit_cancel, 'Save', :cancel=>@url_back
+
+      -#=f.submit 'Сохранить', :class=>'btn btn-sm btn-primary'
+      -#=link_to 'Отмена', '#', :class=>'btn btn-sm btn-default', :id=>'link_form_cancel'
+
+
+
+
+-#<script type="text/javascript" src="/js/tinymce4/tinymce.min.js"></script>
+-#<script type="text/javascript" src="/js/tiny_mce/tiny_mce.js"></script>
+
+
+-#= javascript_include_tag "tinymce-jquery"
+-#= tinymce_assets
+
+-#= tinymce :uploadimage_form_url => tinymce_uploadimage_url, :relative_urls => false, remove_script_host: true, image_advtab: true
+-#= tinymce_javascript_tag "tinymce_assets"
+
+
+
+
+-#:javascript
+  // tinymce 4
+  tinymce.init({
+      selector: "textarea",
+      theme: "modern",
+      plugins: [
+          "advlist autolink lists link image charmap print preview hr anchor pagebreak",
+          "searchreplace wordcount visualblocks visualchars code fullscreen",
+          "insertdatetime media nonbreaking save table contextmenu directionality",
+          "emoticons template paste textcolor colorpicker textpattern"
+      ],
+      toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
+      toolbar2: "print preview media | forecolor backcolor emoticons",
+      image_advtab: true,
+
+      //file_browser_callback : 'myFileBrowser',
+      //image_list: "/mylist.php",
+      /*
+      image_list: [
+        {title: 'MemorialDay2013.jpg', value: '../data/emailpics/MemorialDay2013.jpg'},
+        {title: 'MAPMAY.jpg', value: '../data/emailpics/MAPMAY.jpg'}
+      ],
+      */
+      templates: [
+          {title: 'Test template 1', content: 'Test 1'},
+          {title: 'Test template 2', content: 'Test 2'}
+      ]
+  });
+
+
+  function myFileBrowser(field_name, url, type, win) {
+    console.log('1');
+
+    /* Here goes the URL to your server-side script which manages all file browser things. */
+    // alert("Field_Name: " + field_name + "nURL: " + url + "nType: " + type + "nWin: " + win); // debug/testing
+
+
+    var cmsURL       = '/assetManager/getAllImages';     // your URL could look like "/scripts/my_file_browser.php"
+    var searchString = window.location.search; // possible parameters
+    if (searchString.length < 1) {
+      // add "?" to the URL to include parameters (in other words: create a search string because there wasn't one before)
+      searchString = "?";
+    }
+
+
+    tinyMCE.activeEditor.windowManager.open({
+      file            : cmsURL,
+      title           : 'My File Browser',
+      width           : 420,  // Your dimensions may differ - toy around with them!
+      height          : 400,
+      resizable       : "yes",
+      inline          : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
+      close_previous          : "no"
+      },
+      {
+      window  : win,
+      input   : field_name
+      }
+    );
+
+
+    var win     = tinyMCEPopup.getWindowArg("window");
+    var input   = tinyMCEPopup.getWindowArg("input");
+    var res     = tinyMCEPopup.getWindowArg("resizable");
+    var inline  = tinyMCEPopup.getWindowArg("inline");
+
+    //win.document.forms[0].elements[field_name].value = input;
+
+
+    return false;
+  }
+
+
+
+:coffeescript
+  $ ->
+    $("#link_form_cancel").click (e) ->
+      e.preventDefault()
       window.location = "#{@url_back}";

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

@@ -1,48 +1,48 @@
-.row
-  .col-md-12
-    .panel.panel-default
-      .panel-body
-        .pad20
-          %b Meta
-          #meta_translation
-            %ul.nav.nav-tabs
-              - @languages.each do |lang|
-                - t = lang.blank? ? 'Default' : lang
-                %li(role="presentation")
-                  =link_to t, '#', :class=>'link_meta_tab', :data=>{:lang=>lang}
-
-            = f.simple_fields_for :translations do |fmeta|
-              - tran = fmeta.object
-              - lang = tran.lang
-
-
-              %div{:class=>['cont', "meta_cont_"+lang]}
-                =fmeta.input :lang, :readonly=>true
-                =fmeta.input :meta_title, label: 'Title'
-                =fmeta.input :meta_keywords, label: 'Keywords'
-                =fmeta.input :meta_description, as: :text, label: 'Description'
-
-  -# @languages.all.each do |r|
-    - lang = r.lang
-    - name = "meta_keywords_#{lang}"
-    .form-group
-      %label(for="#{name}") Keywords
-      =f.input_field :"meta_keywords[#{lang}]", :class=>"form-control", :placeholder=>"Keywords"
-
-
-:javascript
-  $(document).ready(function() {
-    meta_show_cont('');
-
-    $('#meta_translation .link_meta_tab').click(function(e){
-      e.preventDefault();
-      meta_show_cont($(this).data('lang'));
-    });
-
-
-  });
-
-  function meta_show_cont(lang){
-    $('#meta_translation .cont').hide();
-    $('#meta_translation .cont.meta_cont_'+lang).show();
-  }
+.row
+  .col-md-12
+    .panel.panel-default
+      .panel-body
+        .pad20
+          %b Meta
+          #meta_translation
+            %ul.nav.nav-tabs
+              - @languages.each do |lang|
+                - t = lang.blank? ? 'Default' : lang
+                %li(role="presentation")
+                  =link_to t, '#', :class=>'link_meta_tab', :data=>{:lang=>lang}
+
+            = f.simple_fields_for :translations do |fmeta|
+              - tran = fmeta.object
+              - lang = tran.lang
+
+
+              %div{:class=>['cont', "meta_cont_"+lang]}
+                =fmeta.input :lang, :readonly=>true
+                =fmeta.input :meta_title, label: 'Title'
+                =fmeta.input :meta_keywords, label: 'Keywords'
+                =fmeta.input :meta_description, as: :text, label: 'Description'
+
+  -# @languages.all.each do |r|
+    - lang = r.lang
+    - name = "meta_keywords_#{lang}"
+    .form-group
+      %label(for="#{name}") Keywords
+      =f.input_field :"meta_keywords[#{lang}]", :class=>"form-control", :placeholder=>"Keywords"
+
+
+:javascript
+  $(document).ready(function() {
+    meta_show_cont('');
+
+    $('#meta_translation .link_meta_tab').click(function(e){
+      e.preventDefault();
+      meta_show_cont($(this).data('lang'));
+    });
+
+
+  });
+
+  function meta_show_cont(lang){
+    $('#meta_translation .cont').hide();
+    $('#meta_translation .cont.meta_cont_'+lang).show();
+  }

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

@@ -1,5 +1,5 @@
-%h1 Edit Page
-
-= render 'form'
-
-
+%h1 Edit Page
+
+= render 'form'
+
+

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

@@ -1,15 +1,15 @@
-.page-header
-  .row
-    .col-md-6
-      %h1
-        Edit page folder
-        %small
-          <i class="ace-icon fa fa-angle-double-right"></i>
-          enter title
-    .col-md-4
-      =link_to 'Back to pages', @url_back
-
-
-.row
-  .col-md-12
-    = render 'form_folder'
+.page-header
+  .row
+    .col-md-6
+      %h1
+        Edit page folder
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          enter title
+    .col-md-4
+      =link_to 'Back to pages', @url_back
+
+
+.row
+  .col-md-12
+    = render 'form_folder'

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

@@ -1,59 +1,59 @@
-.page-header
-  .row
-    .col-md-7
-      %h1
-        Pages
-        %small
-          <i class="ace-icon fa fa-angle-double-right"></i>
-          manage pages
-    .col-md-5
-      =link_to 'New page', new_page_path(:parent_id=>@parent_id), :class=>'btn btn-sm btn-primary'
-      =link_to 'New folder', newfolder_pages_path(:parent_id=>@parent_id, :is_folder=>1), :class=>'btn btn-sm btn-default'
-
-
-.filter
-  = inline_filter_form_for(@filter)
-
-
-- if @parent
-  =link_to 'HOME', pages_path(:parent_id=>0)
-  #{"/"}
-  =link_to @parent.title, pages_path(:parent_id=>@parent.id)
-
-%table.table.table-striped.table-bordered
-  %tr
-    %th= link_to_sortable_column :title, 'Title'
-    %th= link_to_sortable_column :name, 'Name'
-    %th URL
-    %th Template
-    %th Commands
-
-  - @items.each do |item|
-    %tr
-      %td
-        - if item.is_folder
-          =link_to pages_path(:parent_id=>item.id) do
-            <i class="fa fa-folder-o"></i>
-            =item.title
-        - else
-          =link_to item.title, edit_page_path(item)
-      %td
-        =item.name
-      %td
-        =item.url
-      %td
-        - if item.template
-          =link_to edit_template_path(item.template) do
-            =item.template.title
-          %br
-          =item.template.basepath
-        - elsif !item.is_folder
-          N/A
-        - else
-          &nbsp;
-
-      %td
-        =link_to 'Edit', (item.is_folder? ? editfolder_page_path(item) : edit_page_path(item))
-        =link_to 'Delete', page_path(item), :method => :delete, data: { confirm: 'Are you sure?' }
-
+.page-header
+  .row
+    .col-md-7
+      %h1
+        Pages
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          manage pages
+    .col-md-5
+      =link_to 'New page', new_page_path(:parent_id=>@parent_id), :class=>'btn btn-sm btn-primary'
+      =link_to 'New folder', newfolder_pages_path(:parent_id=>@parent_id, :is_folder=>1), :class=>'btn btn-sm btn-default'
+
+
+.filter
+  = inline_filter_form_for(@filter)
+
+
+- if @parent
+  =link_to 'HOME', pages_path(:parent_id=>0)
+  #{"/"}
+  =link_to @parent.title, pages_path(:parent_id=>@parent.id)
+
+%table.table.table-striped.table-bordered
+  %tr
+    %th= link_to_sortable_column :title, 'Title'
+    %th= link_to_sortable_column :name, 'Name'
+    %th URL
+    %th Template
+    %th Commands
+
+  - @items.each do |item|
+    %tr
+      %td
+        - if item.is_folder
+          =link_to pages_path(:parent_id=>item.id) do
+            <i class="fa fa-folder-o"></i>
+            =item.title
+        - else
+          =link_to item.title, edit_page_path(item)
+      %td
+        =item.name
+      %td
+        =item.url
+      %td
+        - if item.template
+          =link_to edit_template_path(item.template) do
+            =item.template.title
+          %br
+          =item.template.basepath
+        - elsif !item.is_folder
+          N/A
+        - else
+          &nbsp;
+
+      %td
+        =link_to 'Edit', (item.is_folder? ? editfolder_page_path(item) : edit_page_path(item))
+        =link_to 'Delete', page_path(item), :method => :delete, data: { confirm: 'Are you sure?' }
+
 =paginate @items

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

@@ -1,5 +1,5 @@
-%h1 New Page
-
-= render 'form'
-
-
+%h1 New Page
+
+= render 'form'
+
+

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

@@ -1,15 +1,15 @@
-.page-header
-  .row
-    .col-md-6
-      %h1
-        Create page folder
-        %small
-          <i class="ace-icon fa fa-angle-double-right"></i>
-          enter title
-    .col-md-4
-      =link_to 'Back to pages', @url_back
-
-
-.row
-  .col-md-12
-    = render 'form_folder'
+.page-header
+  .row
+    .col-md-6
+      %h1
+        Create page folder
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          enter title
+    .col-md-4
+      =link_to 'Back to pages', @url_back
+
+
+.row
+  .col-md-12
+    = render 'form_folder'

data/app/views/optimacms/admin/shared/_breadcrumbs.html.haml

@@ -1,7 +1,7 @@
-.breadcrumbs
-  %ul.breadcrumb
-    %li
-      <i class="ace-icon fa fa-home home-icon"></i>
-      =link_to 'Home', '#'
-    %li.active
-      =link_to 'Dashboard', '#'
+.breadcrumbs
+  %ul.breadcrumb
+    %li
+      <i class="ace-icon fa fa-home home-icon"></i>
+      =link_to 'Home', '#'
+    %li.active
+      =link_to 'Dashboard', '#'

data/app/views/optimacms/admin/shared/_flash.html.haml

@@ -1,23 +1,23 @@
-- unless flash.empty?
-  - flash.each do |name, msg|
-    - flash_type_translation = { 'notice' => 'warning', 'alert' => 'danger', 'success' => 'success'}
-    - alert_class_name = flash_type_translation[name] || 'info'
-
-    %div{:class=>['alert',"alert-#{alert_class_name}"]}
-      %button.close( data-dismiss="alert" type="button")
-        %i.fa.fa-times
-      .message
-        = msg
-      -#= content_tag :div, msg, id: "flash_#{name}" if msg.is_a?(String)
-
-
--#
-  .alert.alert-block.alert-success
-    %button.close( data-dismiss="alert" type="button")
-      %i.fa.fa-times
-
-    Welcome to
-    %strong.green
-      OptimaCMS
-      %small (v0.1.1)
-    , the lightweight, feature-rich and easy to use admin
+- unless flash.empty?
+  - flash.each do |name, msg|
+    - flash_type_translation = { 'notice' => 'warning', 'alert' => 'danger', 'success' => 'success'}
+    - alert_class_name = flash_type_translation[name] || 'info'
+
+    %div{:class=>['alert',"alert-#{alert_class_name}"]}
+      %button.close( data-dismiss="alert" type="button")
+        %i.fa.fa-times
+      .message
+        = msg
+      -#= content_tag :div, msg, id: "flash_#{name}" if msg.is_a?(String)
+
+
+-#
+  .alert.alert-block.alert-success
+    %button.close( data-dismiss="alert" type="button")
+      %i.fa.fa-times
+
+    Welcome to
+    %strong.green
+      OptimaCMS
+      %small (v0.1.1)
+    , the lightweight, feature-rich and easy to use admin

data/app/views/optimacms/admin/shared/_footer.html.haml

@@ -1,6 +1,6 @@
-.footer
-  .row
-
-  OptimaCMS
-  <br>
+.footer
+  .row
+
+  OptimaCMS
+  <br>
   =render 'optimacms/admin/shared/version'

data/app/views/optimacms/admin/shared/_form_errors.html.haml

@@ -1,12 +1,12 @@
-- if object.errors.any?
-  .alert.alert-danger#error_explanation
-    -#%h3= "#{pluralize(object.errors.count, "ошибки")} при заполнении формы:"
-    %h3 Ошибки при заполнении формы:
-    %ul
-      - object.errors.messages.each do |amsg|
-        - amsg[1].each do |msg|
-          %li
-            #{t 'activerecord.attributes.user.'+amsg[0].to_s}: #{msg}
-
-      -#- object.errors.full_messages.each do |msg|
+- if object.errors.any?
+  .alert.alert-danger#error_explanation
+    -#%h3= "#{pluralize(object.errors.count, "ошибки")} при заполнении формы:"
+    %h3 Ошибки при заполнении формы:
+    %ul
+      - object.errors.messages.each do |amsg|
+        - amsg[1].each do |msg|
+          %li
+            #{t 'activerecord.attributes.user.'+amsg[0].to_s}: #{msg}
+
+      -#- object.errors.full_messages.each do |msg|
         %li= msg