activeadmin-selleo-cms 0.0.11 → 0.0.12

data/app/models/activeadmin_selleo_cms/page.rb

@@ -72,11 +72,9 @@ module ActiveadminSelleoCms
     class Translation
       attr_protected :id
 
-      belongs_to :activeadmin_selleo_cms_page, class_name: '::ActiveadminSelleoCms::Page'
-
-      validates_presence_of :title, unless: ->(translation) { translation.activeadmin_selleo_cms_page.is_link_url }
-      validates_uniqueness_of :slug, scope: :locale, unless: ->(translation) { translation.activeadmin_selleo_cms_page.is_link_url }
-      validates_format_of :slug, with: /^[a-z0-9\-_]+$/i, unless: ->(translation) { translation.activeadmin_selleo_cms_page.is_link_url }
+      validates_presence_of :title
+      validates_uniqueness_of :slug, scope: :locale
+      validates_format_of :slug, with: /^[a-z0-9\-_]+$/i
     end
   end
 end

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

@@ -13,20 +13,6 @@
     = form.input :is_link_url, as: :boolean, input_html: { checked: @page.link_url.present? }
     = form.input :link_url, hint: "Enter remote URL including the http part at the beginning"
 
-  = form.inputs "Page icon", for: [:icon, form.object.icon || ActiveadminSelleoCms::Icon.new] do |icon_form|
-    = icon_form.input :data, label: "Icon", hint: (form.object.icon ? icon_form.template.image_tag(form.object.icon_url) : "No icon uploaded yet" )
-
-  = form.inputs "Header image", for: [:header_image, form.object.header_image || ActiveadminSelleoCms::HeaderImage.new] do |header_image_form|
-    = header_image_form.input :data, label: "Header image", hint: (form.object.header_image ? header_image_form.template.image_tag(form.object.header_image_url) : "No header image uploaded yet" )
-
-  = form.inputs "Attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
-    = attachment_form.input :data, label: "Attachment", input_html: { multiple: true, name: "page[attachments_attributes][][data]" }
-    - form.object.attachments.each do |attachment|
-      %li{"data-attachment-id" => attachment.id}
-        %label File
-        = attachment.data_file_name
-        = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
-
   = form.semantic_fields_for :sections do |section_form|
     - if @page.section_names.include? section_form.object.name
       - @section_forms << section_form
@@ -47,6 +33,21 @@
       %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.inputs "Page icon", for: [:icon, form.object.icon || ActiveadminSelleoCms::Icon.new] do |icon_form|
+    = icon_form.input :data, label: "Icon", hint: (form.object.icon ? icon_form.template.image_tag(form.object.icon_url) : "No icon uploaded yet" )
+
+  = form.inputs "Header image", for: [:header_image, form.object.header_image || ActiveadminSelleoCms::HeaderImage.new] do |header_image_form|
+    = header_image_form.input :data, label: "Header image", hint: (form.object.header_image ? header_image_form.template.image_tag(form.object.header_image_url) : "No header image uploaded yet" )
+
+  = form.inputs "Attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
+    = attachment_form.input :data, label: "Attachment", input_html: { multiple: true, name: "page[attachments_attributes][][data]" }
+    - form.object.attachments.each do |attachment|
+      %li{"data-attachment-id" => attachment.id}
+        %label File
+        = attachment.data_file_name
+        = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
+
+
   = form.actions do
     = form.action :submit
     %li.cancel
@@ -56,11 +57,11 @@
 :javascript
   function is_link_url(){
     if($('input#page_is_link_url').is(':checked')){
-      $('div.language-tabs').hide();
+      $('.link-url-hide, textarea').closest('li').hide();
       $('li#page_link_url_input').show();
     }else{
       $('li#page_link_url_input').hide();
-      $('div.language-tabs').show();
+      $('.link-url-hide, textarea').closest('li').show();
     }
   }
 

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

@@ -4,9 +4,9 @@
   %ol
     = form.input :title
     = form.input :slug
-    = form.input :browser_title
-    = form.input :meta_keywords
-    = form.input :meta_description, input_html: { rows: 3 }
+    = form.input :browser_title, input_html: { class: 'link-url-hide' }
+    = form.input :meta_keywords, input_html: { class: 'link-url-hide' }
+    = form.input :meta_description, input_html: { rows: 3, class: 'link-url-hide' }
     = form.input :locale, :as => :hidden, :label => false
     - @section_forms.each do |section_form|
       = section_form.semantic_fields_for :translations do |section_form_translated|

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

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails