activeadmin-selleo-cms 0.0.2 → 0.0.3

data/app/admin/activeadmin_selleo_cms/page.rb

@@ -16,12 +16,9 @@ ActiveAdmin.register ActiveadminSelleoCms::Page, as: "Page", sort_order: "lft_as
   filter :parent
 
   index do
-    column do |page|
-      unless page.root?
-        "#{image_tag('http://placehold.it/20x15') * page.depth}".html_safe
-      end
+    column :title do |page|
+      "#{'—' * page.depth}  #{page.title}".html_safe
     end
-    column :title
     column :show_in_menu do |page|
       check_box_tag "activeadmin_selleo_cms_page[show_in_menu][#{page.id}]", 1, page.show_in_menu, data: { route: admin_page_path(page.id), id: page.id, resource: 'page', attribute: 'show_in_menu' }
     end
@@ -44,23 +41,17 @@ ActiveAdmin.register ActiveadminSelleoCms::Page, as: "Page", sort_order: "lft_as
   controller do
     respond_to :html, :js
 
-    def index
-      index! {
-        #@pages = @pages.where(parent_id: nil)
-      }
-    end
-
     def create
       create! do |success, failure|
-        success.html { redirect_to admin_pages_path }
+        success.html { render action: :edit  }
         failure.html { render action: :new  }
       end
     end
 
     def update
       update! do |success, failure|
-          success.html { redirect_to admin_pages_path }
-          failure.html { render action: :edit  }
+        success.html { render action: :edit  }
+        failure.html { render action: :edit  }
       end
     end
   end

data/app/helpers/activeadmin_selleo_cms/application_helper.rb

@@ -16,12 +16,16 @@ module ActiveadminSelleoCms
       end
     end
 
-    def link_to_page(page)
+    def url_to_page(page)
       if page.is_link_url
-        link_to page.title, page.link_url
+        page.link_url
       else
-        link_to page.title, page_path(I18n.locale, page)
+        page_path(I18n.locale, page)
       end
     end
+
+    def link_to_page(page)
+      link_to page.title, url_to_page(page)
+    end
   end
 end

data/app/models/activeadmin_selleo_cms/page.rb

@@ -31,6 +31,10 @@ module ActiveadminSelleoCms
       end
     end
 
+    after_initialize do
+      self.layout = Layout.all.first if new_record? and layout.blank?
+    end
+
     def initialize_missing_sections
       section_names.each do |section_name|
         sections.build(name: section_name) unless sections.detect{|section| section.name == section_name}

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

@@ -5,12 +5,21 @@
   - @page.initialize_missing_sections
   - @section_forms = []
 
+  = form.inputs "Layout" do
+    = form.input :layout, collection: ActiveadminSelleoCms::Layout.all, include_blank: false, hint: "The form will reload on change"
+
   = form.inputs "General options" do
     = form.input :parent_id, as: :select, collection: nested_set_options(ActiveadminSelleoCms::Page, @page) {|i| "#{'-' * i.level} #{i.title}" }
-    = form.input :layout, collection: ActiveadminSelleoCms::Layout.all, include_blank: false
     = form.input :is_published, as: :boolean, input_html: { checked: @page.published_at.present? }
     = form.input :is_link_url, as: :boolean, input_html: { checked: @page.link_url.present? }
-    = form.input :link_url
+    = form.input :link_url, hint: "Enter remote URL including the http part at the beginning"
+
+  = form.semantic_fields_for :sections do |section_form|
+    - if @page.section_names.include? section_form.object.name
+      - @section_forms << section_form
+      = section_form.input :name, as: :hidden, label: false
+    - else
+      = ""
 
   .language-tabs
     %ul.language-selection
@@ -20,16 +29,10 @@
           - additional_locale = ActiveadminSelleoCms::Locale.find_by_code(translation.locale)
           %li= link_to additional_locale.name, "#lang-#{additional_locale.code}"
 
-    %div{id: "lang-#{current_locale.code}"}
-      = render partial: 'fields_current_locale', locals: { locale: current_locale, form: form }
-
     = form.semantic_fields_for :translations do |translated_form|
-      - unless translated_form.object.locale == current_locale.code
-        - additional_locale = ActiveadminSelleoCms::Locale.find_by_code(translated_form.object.locale)
-        %div{id: "lang-#{additional_locale.code}", style: "#{'display:none;' if additional_locale.code == current_locale.code}"}
-          = render partial: 'fields_additional_locale', locals: { locale: additional_locale, form: translated_form }
-      - else
-        = ""
+      - additional_locale = ActiveadminSelleoCms::Locale.find_by_code(translated_form.object.locale)
+      %div{id: "lang-#{additional_locale.code}", style: "#{'display:none;' if additional_locale.code == current_locale.code}"}
+        = render partial: 'translated_fields', locals: { locale: additional_locale, form: translated_form }
 
   = form.actions do
     = form.action :submit
@@ -53,13 +56,22 @@
         is_link_url();
 
         $("input[id$='_title']").blur(function(){
-        slugId = '#' + $(this).attr('id').replace('_title', '_slug');
+          slugId = '#' + $(this).attr('id').replace('_title', '_slug');
           if ($(slugId).attr('value') == '') {
             $(slugId).attr('value', slug($(this).attr('value')) )
           }
+
+          browserTitleId = '#' + $(this).attr('id').replace('_title', '_browser_title');
+          if ($(browserTitleId).attr('value') == '') {
+            $(browserTitleId).attr('value', $(this).attr('value') )
+          }
         });
 
         $('input#page_is_link_url').change(function(){
           is_link_url();
         });
+
+        $('select#page_layout').change(function(){
+          $(this).closest('form').submit();
+        });
     });

data/app/views/admin/pages/{_fields_additional_locale.html.haml → _translated_fields.html.haml}

@@ -11,7 +11,7 @@
     - @section_forms.each do |section_form|
       = section_form.semantic_fields_for :translations do |section_form_translated|
         - if section_form_translated.object.locale.to_sym == locale.code
-          = section_form_translated.input :body, as: :ckeditor, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: "Full" }
+          = section_form_translated.input :body, as: :ckeditor, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: "Easy" }
           = section_form_translated.input :locale, :as => :hidden, :label => false
         - else
           = ""

data/config/initializers/i18n.rb

@@ -1,8 +1,8 @@
 require "i18n/backend/fallbacks"
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 
-if ActiveRecord::Base.connection.table_exists? 'translations'
-  require 'i18n/backend/active_record'
-  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Fallbacks)
-  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
-end
+#if ActiveRecord::Base.connection.table_exists? 'translations'
+#  require 'i18n/backend/active_record'
+#  I18n::Backend::ActiveRecord.send(:include, I18n::Backend::Fallbacks)
+#  I18n.backend = I18n::Backend::Chain.new(I18n::Backend::ActiveRecord.new, I18n.backend)
+#end

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -218,9 +218,8 @@ files:
 - app/admin/activeadmin_selleo_cms/locale.rb
 - app/admin/activeadmin_selleo_cms/page.rb
 - app/views/layouts/activeadmin_selleo_cms/application.html.erb
-- app/views/admin/pages/_fields_additional_locale.html.haml
 - app/views/admin/pages/_form.html.haml
-- app/views/admin/pages/_fields_current_locale.html.haml
+- app/views/admin/pages/_translated_fields.html.haml
 - app/views/admin/pages/_js.html.haml
 - app/views/admin/translations/update.js.haml
 - app/views/activeadmin_selleo_cms/pages/show.html.haml

data/app/views/admin/pages/_fields_current_locale.html.haml

@@ -1,14 +0,0 @@
-= form.inputs "#{locale.name} translation" do
-  %ol
-    = form.input :title
-    = form.input :slug
-    = form.input :browser_title
-    = form.input :meta_keywords
-    = form.input :meta_description, input_html: { rows: 3 }
-    = form.semantic_fields_for :sections do |section_form|
-      - if @page.section_names.include? section_form.object.name
-        - @section_forms << section_form
-        = section_form.input :name, as: :hidden, label: false
-        = section_form.input :body, as: :ckeditor, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: "Easy" }
-      - else
-        = ""