optimacms 0.1.55 → 0.1.56

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

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

@@ -1,49 +1,49 @@
-
-%ul.nav.nav-list
-  %li
-    =link_to 'Dashboard', Optimacms::Engine.routes.url_helpers.dashboard_path
-
-  - Optimacms::AdminMenu::AdminMenu.get_menu.each_with_index do |m, ind|
-    %li
-      =link_to "#submenu#{ind}", :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu#{ind}" do
-        %span #{m[:title]}
-        %b.arrow.fa.fa-angle-down.for-expanded
-        %b.arrow.fa.fa-angle-left.for-collapsed
-
-      %ul.submenu.collapse{id: "submenu#{ind}"}
-        - if m[:submenu]
-          - m[:submenu].each do |sm|
-            - u = sm[:route] ? send("#{sm[:route]}_path") : sm[:url]
-            - next if u.nil? || u===false
-
-            %li
-              =link_to sm[:title], u
-
-
-
-  -#
-    %li.active
-
-      =link_to '#submenu1', :"data-toggle"=>"collapse", :"aria-expanded"=>"true", :"aria-controls"=>"submenu1" do
-        %span Content
-        %b.arrow.fa.fa-angle-down.for-expanded
-        %b.arrow.fa.fa-angle-left.for-collapsed
-
-      %ul#submenu1.submenu.collapse.in
-        %li=link_to 'Pages', pages_path
-        %li=link_to 'Templates', templates_path
-        -#%li=link_to 'Layouts', layouts_path
-        -#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
-        %li=link_to 'Media', mediafiles_path
-
-    -#%li
-    =link_to '#submenu_system', :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu_system" do
-      %span System
-      %b.arrow.fa.fa-angle-down.for-expanded
-      %b.arrow.fa.fa-angle-left.for-collapsed
-
-    %ul#submenu_system.submenu_system.collapse
-      %li=link_to 'App', app_sys_path
-      %li=link_to 'Maintenance', "#"
-      %li=link_to 'Backups', "#"
-      %li=link_to 'Info', "#"
+
+%ul.nav.nav-list
+  %li
+    =link_to 'Dashboard', Optimacms::Engine.routes.url_helpers.dashboard_path
+
+  - Optimacms::AdminMenu::AdminMenu.get_menu.each_with_index do |m, ind|
+    %li
+      =link_to "#submenu#{ind}", :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu#{ind}" do
+        %span #{m[:title]}
+        %b.arrow.fa.fa-angle-down.for-expanded
+        %b.arrow.fa.fa-angle-left.for-collapsed
+
+      %ul.submenu.collapse{id: "submenu#{ind}"}
+        - if m[:submenu]
+          - m[:submenu].each do |sm|
+            - u = sm[:route] ? send("#{sm[:route]}_path") : sm[:url]
+            - next if u.nil? || u===false
+
+            %li
+              =link_to sm[:title], u
+
+
+
+  -#
+    %li.active
+
+      =link_to '#submenu1', :"data-toggle"=>"collapse", :"aria-expanded"=>"true", :"aria-controls"=>"submenu1" do
+        %span Content
+        %b.arrow.fa.fa-angle-down.for-expanded
+        %b.arrow.fa.fa-angle-left.for-collapsed
+
+      %ul#submenu1.submenu.collapse.in
+        %li=link_to 'Pages', pages_path
+        %li=link_to 'Templates', templates_path
+        -#%li=link_to 'Layouts', layouts_path
+        -#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
+        %li=link_to 'Media', mediafiles_path
+
+    -#%li
+    =link_to '#submenu_system', :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu_system" do
+      %span System
+      %b.arrow.fa.fa-angle-down.for-expanded
+      %b.arrow.fa.fa-angle-left.for-collapsed
+
+    %ul#submenu_system.submenu_system.collapse
+      %li=link_to 'App', app_sys_path
+      %li=link_to 'Maintenance', "#"
+      %li=link_to 'Backups', "#"
+      %li=link_to 'Info', "#"

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

@@ -1,33 +1,33 @@
-#topbar.navbar.navbar-default
-  .navbar-container
-    %button.navbar-toggle.pull-left( data-target="#sidebar" type="button")
-      %span.sr-only Toggle sidebar
-      %span.icon-bar
-      %span.icon-bar
-      %span.icon-bar
-    .navbar-header.pull-left
-      <a class="navbar-brand" href="#"><small><i class="fa fa-cube"></i> Admin</small></a>
-    .navbar-buttons.pull-right(role="navigation")
-      %ul.nav
-        -#%li
-          =link_to 'Login', new_user_session_path
-        %li
-          %a.dropdown-toggle(href="#" data-toggle="dropdown" aria-expanded="true")
-            %span.user-info Admin
-            %i.fa.fa-caret-down
-          %ul.dropdown-menu-right.dropdown-menu
-            %li
-              %a{:href => '#'}
-                = fa_icon "user"
-                #{current_cms_admin_user.email}
-            %li
-              <a href="#"><i class="fa fa-cog"></i> Settings</a>
-            %li
-              <a href="profile.html"><i class="fa fa-user"></i> Profile</a>
-            %li.divider
-            %li
-              =link_to destroy_cms_admin_user_session_path, :method => :delete do
-                = fa_icon "fa-power-off"
-                Logout
-
-
+#topbar.navbar.navbar-default
+  .navbar-container
+    %button.navbar-toggle.pull-left( data-target="#sidebar" type="button")
+      %span.sr-only Toggle sidebar
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+    .navbar-header.pull-left
+      <a class="navbar-brand" href="#"><small><i class="fa fa-cube"></i> Admin</small></a>
+    .navbar-buttons.pull-right(role="navigation")
+      %ul.nav
+        -#%li
+          =link_to 'Login', new_user_session_path
+        %li
+          %a.dropdown-toggle(href="#" data-toggle="dropdown" aria-expanded="true")
+            %span.user-info Admin
+            %i.fa.fa-caret-down
+          %ul.dropdown-menu-right.dropdown-menu
+            %li
+              %a{:href => '#'}
+                = fa_icon "user"
+                #{current_cms_admin_user.email}
+            %li
+              <a href="#"><i class="fa fa-cog"></i> Settings</a>
+            %li
+              <a href="profile.html"><i class="fa fa-user"></i> Profile</a>
+            %li.divider
+            %li
+              =link_to destroy_cms_admin_user_session_path, :method => :delete do
+                = fa_icon "fa-power-off"
+                Logout
+
+

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

@@ -1,61 +1,61 @@
-- editor = @item.has_code? ? 'ace' : 'tinymce'
-
-.row#mainform
-  .col-md-12
-    = horizontal_simple_form_for @item, {:html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
-      = render 'optimacms/admin/shared/form_errors', :object=>@item
-
-      = f.input :parent_id, as: :hidden
-
-      = f.input :title, label: "Title"
-
-      -# if @item && @item.parent_id>0
-        = f.input :parent_title, disabled: true, label: 'Folder'
-
-      -#= f.input :basename, disabled: true, label: 'Name'
-      -#= f.input :basedirpath, label: "Folder", :disabled=> true
-      = f.input :path, disabled: true, label: 'File'
-      -#=link_to 'Rename', '#'
-
-
-      -#= f.input :is_translated, label: "Translate?"
-
-      - if @item.has_code?
-        .form-group.template_content
-          %label(for="inputContent" class="col-sm-2 col-md-1 control-label")
-            Content
-
-          .col-sm-8.col-md-8.control
-            = f.input_field :content, as: :text, label: "Content", html: {:rows => 16, :cols => 120, :class=>'' }
-
-            #content(style="width:100%; height: 600px; border: 2px #333333 solid;")
-
-      - else
-        = f.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120, :class=>'editor'}
-
-      = f.button :submit_cancel, 'Save', :cancel=>@url_back
-
-
-- if editor=='tinymce'
-  = render 'optimacms/admin/common/js_tinymce'
-
-- elsif editor=='ace'
-  = render 'optimacms/admin/common/js_ace'
-
-  :javascript
-    var editor = ace.edit("content");
-    editor.setTheme("ace/theme/chrome");
-    editor.getSession().setMode("ace/mode/haml");
-    editor.getSession().setNewLineMode("windows");
-    editor.getSession().setTabSize(2);
-
-    $(document).ready(function() {
-      var textarea = $('#template_content');
-      textarea.hide();
-
-      editor.getSession().setValue(textarea.val());
-
-      $('#mainform form').submit(function(){
-        $('#template_content').val(editor.getSession().getValue());
-      });
-    });
+- editor = @item.has_code? ? 'ace' : 'tinymce'
+
+.row#mainform
+  .col-md-12
+    = horizontal_simple_form_for @item, {:html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
+      = render 'optimacms/admin/shared/form_errors', :object=>@item
+
+      = f.input :parent_id, as: :hidden
+
+      = f.input :title, label: "Title"
+
+      -# if @item && @item.parent_id>0
+        = f.input :parent_title, disabled: true, label: 'Folder'
+
+      -#= f.input :basename, disabled: true, label: 'Name'
+      -#= f.input :basedirpath, label: "Folder", :disabled=> true
+      = f.input :path, disabled: true, label: 'File'
+      -#=link_to 'Rename', '#'
+
+
+      -#= f.input :is_translated, label: "Translate?"
+
+      - if @item.has_code?
+        .form-group.template_content
+          %label(for="inputContent" class="col-sm-2 col-md-1 control-label")
+            Content
+
+          .col-sm-8.col-md-8.control
+            = f.input_field :content, as: :text, label: "Content", html: {:rows => 16, :cols => 120, :class=>'' }
+
+            #content(style="width:100%; height: 600px; border: 2px #333333 solid;")
+
+      - else
+        = f.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120, :class=>'editor'}
+
+      = f.button :submit_cancel, 'Save', :cancel=>@url_back
+
+
+- if editor=='tinymce'
+  = render 'optimacms/admin/common/js_tinymce'
+
+- elsif editor=='ace'
+  = render 'optimacms/admin/common/js_ace'
+
+  :javascript
+    var editor = ace.edit("content");
+    editor.setTheme("ace/theme/chrome");
+    editor.getSession().setMode("ace/mode/haml");
+    editor.getSession().setNewLineMode("windows");
+    editor.getSession().setTabSize(2);
+
+    $(document).ready(function() {
+      var textarea = $('#template_content');
+      textarea.hide();
+
+      editor.getSession().setValue(textarea.val());
+
+      $('#mainform form').submit(function(){
+        $('#template_content').val(editor.getSession().getValue());
+      });
+    });

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

@@ -1,44 +1,44 @@
-= render 'optimacms/admin/common/modal_div', name: "Template", title: "Template"
-
-
-:javascript
-
-  $( document ).ready(function() {
-    $('#linkAddTemplate').click(function (event) {
-      $('#modalTemplateForm').modal('show');
-
-      $.get("#{new_template_path}", {modal: "1"},
-          function(data) {
-            $('#modalTemplateForm .modalContent').html(data);
-            //callbackform_after_load();
-
-            $('#modalTemplateForm .modalContent .page-header').hide();
-
-            attachTemplateFormEvents();
-
-          }
-      );
-
-      event.preventDefault();
-    });
-
-  });
-
-  function attachTemplateFormEvents(){
-    var f = $("#new_template");
-
-    f.on("ajax:success", function(e, data, status, xhr){
-      //f.append xhr.responseText
-      console.log('added');
-
-      //$('#modalTemplateForm .modalContent').html("");
-
-      autocomplete_set_item('page_template', page_template_id, page_template_title);
-
-      $('#modalTemplateForm').modal('hide');
-
-    }).on("ajax:error", function(e, xhr, status, error){
-      f.append("<p>ERROR</p>");
-    });
-
+= render 'optimacms/admin/common/modal_div', name: "Template", title: "Template"
+
+
+:javascript
+
+  $( document ).ready(function() {
+    $('#linkAddTemplate').click(function (event) {
+      $('#modalTemplateForm').modal('show');
+
+      $.get("#{new_template_path}", {modal: "1"},
+          function(data) {
+            $('#modalTemplateForm .modalContent').html(data);
+            //callbackform_after_load();
+
+            $('#modalTemplateForm .modalContent .page-header').hide();
+
+            attachTemplateFormEvents();
+
+          }
+      );
+
+      event.preventDefault();
+    });
+
+  });
+
+  function attachTemplateFormEvents(){
+    var f = $("#new_template");
+
+    f.on("ajax:success", function(e, data, status, xhr){
+      //f.append xhr.responseText
+      console.log('added');
+
+      //$('#modalTemplateForm .modalContent').html("");
+
+      autocomplete_set_item('page_template', page_template_id, page_template_title);
+
+      $('#modalTemplateForm').modal('hide');
+
+    }).on("ajax:error", function(e, xhr, status, error){
+      f.append("<p>ERROR</p>");
+    });
+
   }