optimacms 0.1.53 → 0.1.54

data/app/models/optimacms/template_type.rb

@@ -1,20 +1,20 @@
-module Optimacms
-  class TemplateType < ActiveRecord::Base
-    self.table_name = 'cms_templatetypes'
-
-    TYPE_LAYOUT = 1
-    TYPE_PAGE = 2
-    TYPE_PARTIAL = 3
-    TYPE_BLOCKVIEW = 4
-
-    #
-    has_many :templates
-
-
-    # properties
-
-    def to_s
-      title
-    end
-  end
-end
+module Optimacms
+  class TemplateType < ActiveRecord::Base
+    self.table_name = 'cms_templatetypes'
+
+    TYPE_LAYOUT = 1
+    TYPE_PAGE = 2
+    TYPE_PARTIAL = 3
+    TYPE_BLOCKVIEW = 4
+
+    #
+    has_many :templates
+
+
+    # properties
+
+    def to_s
+      title
+    end
+  end
+end

data/app/views/optimacms/admin/common/_js_tinymce.html.haml

@@ -1,49 +1,49 @@
-<script type="text/javascript" src="/js/tinymce/tinymce.min.js"></script>
-<script type="text/javascript" src="/js/tinymce/jquery.tinymce.min.js"></script>
-
-
-:javascript
-    tinymce.init({
-      selector: "textarea.editor",
-      plugins: [
-              "advlist autolink lists link image charmap print preview anchor",
-              "searchreplace visualblocks code fullscreen",
-              "insertdatetime media table contextmenu paste"
-      ],
-      toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image myblock",
-      file_browser_callback : elFinderBrowser,
-      relative_urls: false,
-      content_css : "#{asset_path('optimacms/tinymce.css')}",
-      protect2: [
-              /\<\/?(if|endif)\>/g, // Protect <if> & </endif>
-              /\<xsl\:[^>]+\>/g, // Protect <xsl:...>
-              /<\?php.*?\?>/g // Protect php code
-          ],
-      setup: function(editor) {
-          editor.addButton('myblock', {
-              title: 'block',
-              image: '#{image_url('tinymce/icon_block2.png')}',
-              onclick: function() {
-                editor.insertContent('#{tinymce_editor_insert_block}');
-              }
-
-          });
-      }
-
-
-    });
-
-    function elFinderBrowser (field_name, url, type, win) {
-        tinymce.activeEditor.windowManager.open({
-          file: '/elfinder_manager',// use an absolute path!
-          title: 'elFinder 2.0',
-          width: 900,
-          height: 650,
-          resizable: 'yes'
-        }, {
-          setUrl: function (url) {
-            win.document.getElementById(field_name).value = url;
-          }
-        });
-        return false;
-    }
+<script type="text/javascript" src="/js/tinymce/tinymce.min.js"></script>
+<script type="text/javascript" src="/js/tinymce/jquery.tinymce.min.js"></script>
+
+
+:javascript
+    tinymce.init({
+      selector: "textarea.editor",
+      plugins: [
+              "advlist autolink lists link image charmap print preview anchor",
+              "searchreplace visualblocks code fullscreen",
+              "insertdatetime media table contextmenu paste"
+      ],
+      toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image myblock",
+      file_browser_callback : elFinderBrowser,
+      relative_urls: false,
+      content_css : "#{asset_path('optimacms/tinymce.css')}",
+      protect2: [
+              /\<\/?(if|endif)\>/g, // Protect <if> & </endif>
+              /\<xsl\:[^>]+\>/g, // Protect <xsl:...>
+              /<\?php.*?\?>/g // Protect php code
+          ],
+      setup: function(editor) {
+          editor.addButton('myblock', {
+              title: 'block',
+              image: '#{image_url('tinymce/icon_block2.png')}',
+              onclick: function() {
+                editor.insertContent('#{tinymce_editor_insert_block}');
+              }
+
+          });
+      }
+
+
+    });
+
+    function elFinderBrowser (field_name, url, type, win) {
+        tinymce.activeEditor.windowManager.open({
+          file: '/elfinder_manager',// use an absolute path!
+          title: 'elFinder 2.0',
+          width: 900,
+          height: 650,
+          resizable: 'yes'
+        }, {
+          setUrl: function (url) {
+            win.document.getElementById(field_name).value = url;
+          }
+        });
+        return false;
+    }

data/app/views/optimacms/admin/common/_modal_div.html.haml

@@ -1,16 +1,16 @@
-.modal.fade(id="modal#{name}Form" tabindex="-1" role="dialog" aria-labelledby="mod#{name}Label" aria-hidden="true")
-  .modal-dialog
-    .modal-content
-      .modal-header
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        %h4.modal-title{id: "mod#{name}Label"}
-          =title
-
-      .modal-body
-        .modalContent
-
-      .modal-footer
-        -#<button type="button" class="btn btn-primary">Save</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-
-
+.modal.fade(id="modal#{name}Form" tabindex="-1" role="dialog" aria-labelledby="mod#{name}Label" aria-hidden="true")
+  .modal-dialog
+    .modal-content
+      .modal-header
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        %h4.modal-title{id: "mod#{name}Label"}
+          =title
+
+      .modal-body
+        .modalContent
+
+      .modal-footer
+        -#<button type="button" class="btn btn-primary">Save</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
+

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

@@ -1,18 +1,18 @@
-.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
-
-
-.page-header
-  %h1
-    Dashboard
-    %small
-      <i class="ace-icon fa fa-angle-double-right"></i>
-      overview & stats
-
+.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
+
+
+.page-header
+  %h1
+    Dashboard
+    %small
+      <i class="ace-icon fa fa-angle-double-right"></i>
+      overview & stats
+

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

@@ -1,22 +1,22 @@
-.row
-  .col-md-12
-    =horizontal_simple_form_for @item do |f|
-      = f.input :title, label: "Title"
-      = 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'
-
-
-
-
-
-:coffeescript
-  $(document).ready(function() {
-    $("#link_form_cancel").click(function(e){
-      e.preventDefault();
-      window.location = "#{@url_back}";
-    });
-  });
+.row
+  .col-md-12
+    =horizontal_simple_form_for @item do |f|
+      = f.input :title, label: "Title"
+      = 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'
+
+
+
+
+
+:coffeescript
+  $(document).ready(function() {
+    $("#link_form_cancel").click(function(e){
+      e.preventDefault();
+      window.location = "#{@url_back}";
+    });
+  });

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

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

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

@@ -1,25 +1,25 @@
-.page-header
-  .row
-    .col-md-8
-      %h1
-        Layouts
-        %small
-          <i class="ace-icon fa fa-angle-double-right"></i>
-          edit layouts content
-    .col-md-2
-      =link_to 'New layout', new_layout_path, :class=>'btn btn-sm btn-primary'
-
-
-
-
-
-%table.table.table-striped.table-bordered
-  %tr
-    %th Title
-    %th Commands
-  - @items.each do |item|
-    %tr
-      %td
-        =link_to item.title, edit_layout_path(item)
-      %td
-        =link_to 'Edit', edit_layout_path(item)
+.page-header
+  .row
+    .col-md-8
+      %h1
+        Layouts
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          edit layouts content
+    .col-md-2
+      =link_to 'New layout', new_layout_path, :class=>'btn btn-sm btn-primary'
+
+
+
+
+
+%table.table.table-striped.table-bordered
+  %tr
+    %th Title
+    %th Commands
+  - @items.each do |item|
+    %tr
+      %td
+        =link_to item.title, edit_layout_path(item)
+      %td
+        =link_to 'Edit', edit_layout_path(item)

data/app/views/optimacms/admin/layouts/main.html.haml

@@ -1,6 +1,6 @@
-- modal = (@modal || 0).to_i
-- if modal==1
-  = render :template => 'optimacms/admin/layouts/modal'
-- else
-  = render :template => 'optimacms/admin/layouts/basic'
-
+- modal = (@modal || 0).to_i
+- if modal==1
+  = render :template => 'optimacms/admin/layouts/modal'
+- else
+  = render :template => 'optimacms/admin/layouts/basic'
+

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

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

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

@@ -1,78 +1,78 @@
-
-.row
-  .col-md-12
-    =horizontal_simple_form_for @item do |f|
-      = render 'optimacms/admin/shared/form_errors', :object=>@item
-
-      = f.input :parent_id, as: :hidden
-
-      = f.input :title, label: "Title"
-      = f.input :url, as: :string, label: "URL", :hint=> "parsed: #{@item.parsed_url}"
-
-      = f.input :name, as: :string, label: "Name", :hint=>'Unique name of page. only latin letters, no spaces'
-      - if @item && @item.parent_id>0
-        = f.input :parent_title, disabled: true, label: 'Folder'
-
-      = f.input :controller_action, as: :string, label: "Controller", :hint=>'controller#action. ex.: news#index'
-
-      = f.association :layout, label: "Layout", collection: @layouts, label_method: :title
-
-      .form-group.page_template
-        %label(for="inputTemplate" class="col-sm-2 col-md-1 control-label")
-          Template
-
-        .col-sm-4.col-md-4.control
-          -#= f.input_field :client, :as => :autocomplete, :source_query => autocomplete_client_name_orders_path, :minLength => 1, :items => 10, :class=>'form-control', :afterSelect=>'client_autocomplete_after_select'
-          =f.input_field :template, :as => :autocomplete, :source_query => autocomplete_templates_url, :class=>'form-control'
-
-        .col-sm-2.col-md-2
-          =link_to '#', :class=>"btn btn-sm btn-default", :id=>'linkAddTemplate' do
-            %i.fa.fa-plus
-
-          =link_to '#', :class=>"btn btn-sm btn-default" do
-            %i.fa.fa-search
-
-          =link_to '#', :class=>"btn btn-sm btn-default" do
-            %i.fa.fa-refresh
-
-      -#= f.input :view_path, label: "Template"
-      -#= f.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120}
-
-      = f.input :is_translated, label: "Translate?"
-
-      = render 'meta', f: f, item: @item
-
-      = f.button :submit_cancel, 'Save', :cancel=>@url_back
-
-
-
-= render 'optimacms/admin/templates/js_form_modal'
-
-
-#div_template_info(style="visibilty:none;")
-  - if @item.template
-    =link_to 'Edit template "'+@item.template.to_s+'"', edit_template_path(@item.template)
-
-
-= render 'optimacms/admin/common/js_tinymce'
-
-:javascript
-  var page_template_id = 0;
-  var page_template_title = '';
-
-  function autocomplete_set_item(input_id, id, title){
-      var obj_input = $('#'+input_id);
-      var obj_id = $('#'+obj_input.attr("data-field-id"));
-      if (obj_id)
-        obj_id.val(id);
-
-      obj_input.val(title);
-
-  }
-
-
-:javascript
-  $(document).ready(function() {
-    $('.form-group.page_template div.control').append($("#div_template_info"));
-    $("#div_template_info").show();
-  });
+
+.row
+  .col-md-12
+    =horizontal_simple_form_for @item do |f|
+      = render 'optimacms/admin/shared/form_errors', :object=>@item
+
+      = f.input :parent_id, as: :hidden
+
+      = f.input :title, label: "Title"
+      = f.input :url, as: :string, label: "URL", :hint=> "parsed: #{@item.parsed_url}"
+
+      = f.input :name, as: :string, label: "Name", :hint=>'Unique name of page. only latin letters, no spaces'
+      - if @item && @item.parent_id>0
+        = f.input :parent_title, disabled: true, label: 'Folder'
+
+      = f.input :controller_action, as: :string, label: "Controller", :hint=>'controller#action. ex.: news#index'
+
+      = f.association :layout, label: "Layout", collection: @layouts, label_method: :title
+
+      .form-group.page_template
+        %label(for="inputTemplate" class="col-sm-2 col-md-1 control-label")
+          Template
+
+        .col-sm-4.col-md-4.control
+          -#= f.input_field :client, :as => :autocomplete, :source_query => autocomplete_client_name_orders_path, :minLength => 1, :items => 10, :class=>'form-control', :afterSelect=>'client_autocomplete_after_select'
+          =f.input_field :template, :as => :autocomplete, :source_query => autocomplete_templates_url, :class=>'form-control'
+
+        .col-sm-2.col-md-2
+          =link_to '#', :class=>"btn btn-sm btn-default", :id=>'linkAddTemplate' do
+            %i.fa.fa-plus
+
+          =link_to '#', :class=>"btn btn-sm btn-default" do
+            %i.fa.fa-search
+
+          =link_to '#', :class=>"btn btn-sm btn-default" do
+            %i.fa.fa-refresh
+
+      -#= f.input :view_path, label: "Template"
+      -#= f.input :content, as: :text, label: "Content", input_html: {:rows => 16, :cols => 120}
+
+      = f.input :is_translated, label: "Translate?"
+
+      = render 'meta', f: f, item: @item
+
+      = f.button :submit_cancel, 'Save', :cancel=>@url_back
+
+
+
+= render 'optimacms/admin/templates/js_form_modal'
+
+
+#div_template_info(style="visibilty:none;")
+  - if @item.template
+    =link_to 'Edit template "'+@item.template.to_s+'"', edit_template_path(@item.template)
+
+
+= render 'optimacms/admin/common/js_tinymce'
+
+:javascript
+  var page_template_id = 0;
+  var page_template_title = '';
+
+  function autocomplete_set_item(input_id, id, title){
+      var obj_input = $('#'+input_id);
+      var obj_id = $('#'+obj_input.attr("data-field-id"));
+      if (obj_id)
+        obj_id.val(id);
+
+      obj_input.val(title);
+
+  }
+
+
+:javascript
+  $(document).ready(function() {
+    $('.form-group.page_template div.control').append($("#div_template_info"));
+    $("#div_template_info").show();
+  });

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

@@ -1,14 +1,14 @@
-- url = @item.persisted? ? updatefolder_page_path : createfolder_pages_path
-
-=horizontal_simple_form_for @item, url: url do |f|
-  = render 'optimacms/admin/shared/form_errors', :object=>@item
-
-  = f.input :parent_id, as: :hidden
-  = f.input :is_folder, as: :hidden
-
-  = f.input :title, label: "Title"
-
-  - if @item.parent_id>0
-    = f.input :parent_title, disabled: true, label: 'Parent folder'
-
-  = f.button :submit_cancel, 'Save', :cancel=>@url_back
+- url = @item.persisted? ? updatefolder_page_path : createfolder_pages_path
+
+=horizontal_simple_form_for @item, url: url do |f|
+  = render 'optimacms/admin/shared/form_errors', :object=>@item
+
+  = f.input :parent_id, as: :hidden
+  = f.input :is_folder, as: :hidden
+
+  = f.input :title, label: "Title"
+
+  - if @item.parent_id>0
+    = f.input :parent_title, disabled: true, label: 'Parent folder'
+
+  = f.button :submit_cancel, 'Save', :cancel=>@url_back