optimacms 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be75386d17ef3c6403aa53c239c11440698fe3c
-  data.tar.gz: bfcad7a9a7a72326e0d3e3d55dffd8a475966241
+  metadata.gz: 40ffe286ec9f760db4b9ea7ebb55e672c283c2a5
+  data.tar.gz: 11fb4168ed4c9edc704c8caa1a3d44eefe700f51
 SHA512:
-  metadata.gz: dd8a6076c22c6f6e775ec8490365a52e4d31c31baa67a5d6eb2406b07a6d8a91cfbb3cce893087ccbace295b150a4f1559175e71fd8c3b25d6b6557b51db1093
-  data.tar.gz: 1df12ff86fa12e0f000f523bcd2a4040ae565846b91b7142eefda6af5ac05da8abe7b6db27ad9802001adcb16b82e84183a89acd23721f43c093dbf02ff423a6
+  metadata.gz: 69af8da4f41fee3d65d8117fc70ee943783382c4e5c0a5e66786d9f97250378086b641ade84f10c3dbf0020774230744cd788891bff1f4e281d0631222260ef5
+  data.tar.gz: c17ed4122b21acf0120a9072245b6080842b763a760ff00a7f82f7dfa0fecb4131641e82553632d1d7db1266fb859eab56d4a3f06958726035f5537a4fda4a7a

data/app/controllers/optimacms/admin/templates_controller.rb

@@ -159,7 +159,37 @@ module Optimacms
           #format.json {  render json: @item, status: :created, location: user_clients_url(:action => 'index')        }
           format.js {}
         else
-          format.html {  render :new }
+          format.html {  render :newlayout }
+          #format.json { render json: @item.errors, status: :unprocessable_entity }
+          format.js {}
+        end
+      end
+    end
+
+
+    ### block
+
+
+    def newblock
+      @item = model.new({:tpl_format=>Optimacms::Template::EXTENSION_DEFAULT, :type_id=>TemplateType::TYPE_BLOCKVIEW})
+      item_init_parent
+      @item.set_basedirpath_from_parent
+
+      @url_back = url_list
+    end
+
+
+    def createblock
+      @item = model.new(item_params)
+      @res = @item.save
+
+      respond_to do |format|
+        if @res
+          format.html {  redirect_to edit_template_path(@item), success: 'Successfully created' }
+          #format.json {  render json: @item, status: :created, location: user_clients_url(:action => 'index')        }
+          format.js {}
+        else
+          format.html {  render :newblock }
           #format.json { render json: @item.errors, status: :unprocessable_entity }
           format.js {}
         end

data/app/helpers/optimacms/application_helper.rb

@@ -63,7 +63,7 @@
       #content_tag(:meta, nil, content: desc, name: 'description')
     end
 
-    def block(name)
+    def block(name, opts={})
       x = Dir.pwd
       #y = File.expand_path File.dirname(__FILE__)
       d = File.dirname(@optimacms_tpl)
@@ -96,6 +96,11 @@
       # try 2
       names.each do |p|
         extensions.each do |ext|
+          # with lang
+          f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+'.'+@pagedata.lang.to_s+ext)
+          (return render file: f)      if File.exists? f
+
+          # without lang
           f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+ext)
           (return render file: f)      if File.exists? f
         end

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

@@ -14,11 +14,13 @@
         %button(type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
           New... <span class="caret"></span>
         %ul.dropdown-menu
+          %li=link_to 'New block', newblock_templates_path(:parent_id=>@parent_id)
           %li=link_to 'Attach template', newattach_templates_path(:parent_id=>@parent_id)
           %li=link_to 'New layout', newlayout_templates_path(:parent_id=>@parent_id)
 
 
 
+
 .filter
   = inline_filter_form_for(@filter)
 

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

@@ -0,0 +1,33 @@
+.page-header
+  .row
+    .col-md-6
+      %h1
+        New block
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          select path and create file
+    .col-md-4
+      =link_to 'Back to templates', templates_path
+
+
+.row
+  .col-md-12
+    = horizontal_simple_form_for @item, {url: createlayout_templates_path, :html => { :class => "form-horizontal", :role => "form" }}.merge((@modal==1 ? {remote: true}: {}))  do |f|
+
+      = render 'optimacms/admin/shared/form_errors', :object=>@item
+
+      = hidden_field_tag :modal, @modal
+
+      = f.input :basename, label: "Name", :hint=>'ex: index, show'
+      = f.input :title, label: "Title"
+
+      = f.input :basedirpath, readonly: true, label: 'Folder', hint: "ex: news/"
+
+      = f.input :type_id, as: :hidden
+      = f.input :tpl_format, label: "Format", :collection=>Optimacms::Template::EXTENSIONS.keys
+
+      = f.input :is_translated, label: "Translate?"
+
+      = f.button :submit_cancel, 'Save', :cancel=>@url_back
+
+

data/config/routes.rb

@@ -46,6 +46,9 @@ Optimacms::Engine.routes.draw do
 
         get :newlayout
         post :createlayout
+
+        get :newblock
+        post :createblock
       end
 
       member do

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.9"
+  VERSION = "0.2.11"
 end

data/spec/dummy/log/development.log

@@ -39532,3 +39532,126 @@ Processing by Optimacms::Admin::TemplatesController#index as HTML
   Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (73.0ms)
   Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (369.0ms)
 Completed 200 OK in 672ms (Views: 667.2ms | ActiveRecord: 1.0ms)
+
+
+Started GET "/admin/templates" for 127.0.0.1 at 2016-06-05 21:04:34 +0300
+Processing by Optimacms::Admin::TemplatesController#index as HTML
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/fields_simple_form/_text.html.haml (7.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_field_simple_form.html.haml (56.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/fields_simple_form/_hidden.html.haml (5.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_field_simple_form.html.haml (60.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_fields.html.haml (200.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_buttons_apply_clear.html.haml (0.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_buttons_apply_clear_inline.html.haml (50.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_form_inline.html.haml (343.0ms)
+  Rendered D:/Ruby22x64/lib/ruby/gems/2.2.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_form.html.haml (398.0ms)
+  Optimacms::Template Load (1.0ms)  SELECT `cms_templates`.* FROM `cms_templates` WHERE 1=0  ORDER BY (case when cms_templates.ancestry is null then 0 else 1 end), cms_templates.ancestry
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`ancestry` = '128' AND (1=1 )  ORDER BY title asc LIMIT 10 OFFSET 0
+   (0.0ms)  SELECT COUNT(*) FROM `cms_templates` WHERE `cms_templates`.`ancestry` = '128' AND (1=1 )
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/index.html.haml within optimacms/admin/layouts/main (563.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (126.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (130.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (748.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1995.1ms)
+Completed 200 OK in 3172ms (Views: 3053.3ms | ActiveRecord: 4.0ms)
+
+
+Started GET "/assets/optimacms/admin.self-84e36b0189cfc4ac18c624ad198afcefbbd618cce7a3809360431d6d8b6fd71c.css?body=1" for 127.0.0.1 at 2016-06-05 21:04:40 +0300
+
+
+Started GET "/assets/optimacms/admin_tpl.self-3552518fc3641d7e2cce03ff12090a8288cfdabbeb2263909a89f56757898dfd.css?body=1" for 127.0.0.1 at 2016-06-05 21:04:40 +0300
+
+
+Started GET "/assets/optimacms/application.self-fb28094035fc8f155b896e47c199355db7c84fc9d6214ed9800f1022ac2ece52.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:40 +0300
+
+
+Started GET "/assets/jquery2.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/assets/jquery_ujs.self-d456baa54c1fa6be2ec3711f0a72ddf7a5b2f34a6b4f515f33767d6207b7d4b3.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/assets/bootstrap.self-d0e973a52d36a01036265aeefaf2d1ae3499d2cb231a9be3bd846432daf231de.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/assets/bootstrap3-typeahead.min.self-78fcb50a4b38a41b52a51f8662133e39712218bbacbb337469c3ed64bb88ae9d.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/assets/bootstrap3-autocomplete-input.min.self-ce3ca04e5eed6a1c7c2a10589a176cee121808f99dd9b917dd3bf62ce710f211.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/assets/optimacms/admin.self-7c370d9536d7d0d6a0f7cd7f9826692acd93e4fb05ba46f7b630b879740343d3.js?body=1" for 127.0.0.1 at 2016-06-05 21:04:41 +0300
+
+
+Started GET "/admin/templates/newblock?parent_id=128" for 127.0.0.1 at 2016-06-05 21:06:22 +0300
+Processing by Optimacms::Admin::TemplatesController#newblock as HTML
+  Parameters: {"parent_id"=>"128"}
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1
+  CACHE (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1  [["id", 128]]
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_form_errors.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/newblock.html.haml within optimacms/admin/layouts/main (226.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (2.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (112.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (150.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (331.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1577.1ms)
+Completed 200 OK in 2292ms (Views: 2282.3ms | ActiveRecord: 2.0ms)
+
+
+Started POST "/admin/templates/createlayout" for 127.0.0.1 at 2016-06-05 21:16:13 +0300
+Processing by Optimacms::Admin::TemplatesController#createlayout as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"wNADpioG/BGEIeF7wIPfYkiHI4fE4ScD5wBpZiydt3jvKVaKZthMs1+fZYNAuYph4xeV4+CM35dwOgklLxXsAA==", "modal"=>"0", "template"=>{"basename"=>"home_news_data", "title"=>"news data", "basedirpath"=>"layouts/", "type_id"=>"4", "tpl_format"=>"haml", "is_translated"=>"0"}, "commit"=>"Save"}
+  Optimacms::CmsAdminUser Load (0.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+   (1.0ms)  BEGIN
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`is_folder` = 1 AND `cms_templates`.`basepath` = 'layouts'  ORDER BY `cms_templates`.`id` ASC LIMIT 1
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1
+  CACHE (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1  [["id", 128]]
+  CACHE (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1  [["id", 128]]
+  Optimacms::Template Exists (1.0ms)  SELECT  1 AS one FROM `cms_templates` WHERE (`cms_templates`.`basepath` = BINARY 'layouts/home_news_data' AND `cms_templates`.`is_folder` = 0) LIMIT 1
+  SQL (0.0ms)  INSERT INTO `cms_templates` (`basename`, `title`, `basedirpath`, `type_id`, `tpl_format`, `ancestry`, `basepath`, `created_at`, `updated_at`) VALUES ('home_news_data', 'news data', 'layouts/', 4, 'haml', '128', 'layouts/home_news_data', '2016-06-05 18:16:14', '2016-06-05 18:16:14')
+   (18.0ms)  COMMIT
+Redirected to http://localhost:3001/admin/templates/161/edit
+Completed 302 Found in 46ms (ActiveRecord: 35.0ms)
+
+
+Started GET "/admin/templates/161/edit" for 127.0.0.1 at 2016-06-05 21:16:14 +0300
+Processing by Optimacms::Admin::TemplatesController#edit as HTML
+  Parameters: {"id"=>"161"}
+  Optimacms::CmsAdminUser Load (0.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 161 LIMIT 1
+  Optimacms::Language Load (0.0ms)  SELECT `cms_languages`.* FROM `cms_languages` WHERE (1=1)  ORDER BY pos asc
+  Optimacms::TemplateTranslation Load (0.0ms)  SELECT `cms_templates_translation`.* FROM `cms_templates_translation` WHERE `cms_templates_translation`.`item_id` = 161
+   (0.0ms)  BEGIN
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1
+  CACHE (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 128 LIMIT 1  [["id", 128]]
+  Optimacms::Template Exists (1.0ms)  SELECT  1 AS one FROM `cms_templates` WHERE (`cms_templates`.`basepath` = BINARY 'layouts/home_news_data' AND `cms_templates`.`id` != 161 AND `cms_templates`.`is_folder` = 0) LIMIT 1
+  SQL (0.0ms)  INSERT INTO `cms_templates_translation` (`lang`, `item_id`) VALUES ('', 161)
+   (7.0ms)  COMMIT
+  Optimacms::Template Load (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 161 LIMIT 1
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_form_errors.html.haml (0.0ms)
+  Optimacms::TemplateTranslation Load (0.0ms)  SELECT `cms_templates_translation`.* FROM `cms_templates_translation` WHERE `cms_templates_translation`.`item_id` = 161
+  CACHE (0.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 161 LIMIT 1  [["id", 161]]
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/common/_js_ace.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/_form_content_translation.html.haml (109.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/_form.html.haml (321.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/edit.html.haml within optimacms/admin/layouts/main (405.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (18.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (58.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (512.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1087.1ms)
+Completed 200 OK in 1885ms (Views: 1770.6ms | ActiveRecord: 19.0ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optimacms
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Max Ivak
@@ -399,6 +399,7 @@ files:
 - app/views/optimacms/admin/templates/index.html.haml
 - app/views/optimacms/admin/templates/new.html.haml
 - app/views/optimacms/admin/templates/newattach.html.haml
+- app/views/optimacms/admin/templates/newblock.html.haml
 - app/views/optimacms/admin/templates/newfolder.html.haml
 - app/views/optimacms/admin/templates/newlayout.html.haml
 - app/views/optimacms/articles/_form.html.erb