cama_meta_tag 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b2a7fc5323c8913901eb32c5a426ca52d51b1d
-  data.tar.gz: 2b1d477351feb7213704f36e4013abd60e085c7b
+  metadata.gz: bd2d6cb97cfcea41de2deef63f060561e7859136
+  data.tar.gz: 0eb5c582dac854ee208f5bd2c71a6e269afa8f31
 SHA512:
-  metadata.gz: 60b21338225126c9c13c2df3471269b74dd0bf4ec382446212851a8c564337b1dc5cbb64e9d6568920f1e34970d8fab582e3f1e28a0b255d7f02339c72dd55d2
-  data.tar.gz: 7af18b755a55fbfe40798ed8db22b99b3a0cad27baedd565b6c6ae15963db94126a6696e6e5393bcde4fa0573ffb69991d78a4f0f2ade68cdf0fd467acad00f4
+  metadata.gz: 2a8e167d7235851f62dae28163d43808ee5cd5a4941150959076c276b08e218111466b90ecef6ed31e45b2cef30e92258314e66301b7388a0ea0686674cc741f
+  data.tar.gz: bdca4e5287da27d2a09e40b1953e84f34131dc9786bd3cefffe8ad0101958fc9a1155e636c9142c035dff806cd849ae123b417d52f4e6a80ad8012c49a406ddb

data/app/helpers/plugins/cama_meta_tag/main_helper.rb

@@ -1,7 +1,4 @@
 module Plugins::CamaMetaTag::MainHelper
-  def self.included(klass)
-    # klass.helper_method [:my_helper_method] rescue "" # here your methods accessible from views
-  end
 
   # here all actions on going to active
   # you can run sql commands like this:
@@ -17,12 +14,13 @@ module Plugins::CamaMetaTag::MainHelper
 
   def cama_meta_tag_on_seo(args)
     if is_page?
+      page = args[:object].present? ? args[:object] : @cama_visited_post
       tmp = {
-          title: args[:object].get_option('seo_title').to_s.translate,
-          keywords: args[:object].get_option('keywords').to_s.translate,
-          descr: args[:object].get_option('seo_description').to_s.translate,
-          author: args[:object].get_option('seo_author').to_s.translate,
-          image: args[:object].get_option('seo_image').to_s.translate
+          title: page.get_option('seo_title').to_s.translate,
+          keywords: page.get_option('keywords').to_s.translate,
+          descr: page.get_option('seo_description').to_s.translate,
+          author: page.get_option('seo_author').to_s.translate,
+          image: page.get_option('seo_image').to_s.translate
       }
       args[:seo_data][:title] = tmp[:title] if tmp[:title].present?
       args[:seo_data][:keywords] = tmp[:keywords] if tmp[:keywords].present?
@@ -36,11 +34,24 @@ module Plugins::CamaMetaTag::MainHelper
     end
   end
 
-  # def cama_meta_tags_plugin_links(args)
-  #   # args[:links] << link_to(cama_t('plugins.cama_meta_tag.admin.settings_label'), admin_plugins_cama_meta_tag_settings_path)
-  # end
+  # fix for old versions of camaleon cms
+  def cama_meta_tag_post_saved(args)
+    if cama_meta_tag_post_is_for_old_version?(args[:post])
+      args[:post].set_multiple_options(params[:options].permit!.to_h)
+    end
+  end
+
+  # check if seo plugin is running for Camaleon CMS <= 2.3.6
+  def cama_meta_tag_post_is_for_old_version?(post)
+    !post.respond_to?(:manage_seo?)
+  end
 
   def cama_meta_tag_post_form_custom_html(args)
-    args[:html] << render(partial: plugin_view('admin/meta_tag_fields'), locals: {post: args[:post], post_type: args[:post_type]}) if args[:post].manage_seo?
+    unless cama_meta_tag_post_is_for_old_version?(args[:post])
+      manage_seo = args[:post].manage_seo?
+    else
+      manage_seo = args[:post].manage_keywords?(args[:post_type]) # support for old Camaleon CMS versions (use keywords setting instead of seo setting)
+    end
+    args[:html] << render(partial: plugin_view('admin/meta_tag_fields'), locals: {post: args[:post], post_type: args[:post_type]}) if manage_seo
   end
 end

data/app/views/plugins/cama_meta_tag/admin/_meta_tag_fields.html.erb

@@ -1,34 +1,38 @@
 <% t_scope = 'plugins.cama_meta_tag.admin.meta_tag_fields' %>
-<script>jQuery(function(){ $('#form-post #post_keywords').closest('.form-group').remove() })</script>
 <div class="panel panel-default panel-toggled">
     <div class="panel-heading">
-        <div><b><%= cama_t('.title_seo', scope: t_scope) %></b></div>
+        <div><b><%= t('.title_seo', scope: t_scope, default: t('.title_seo', locale: :en)) %></b></div>
         <ul class="panel-controls">
             <li><a class="panel-collapse" href="#"><span class="fa fa-angle-up"></span></a></li>
         </ul>
     </div>
     <div class="panel-body">
         <div class="form-group">
-            <%= label_tag 'options[seo_title]', cama_t('.seo_title', scope: t_scope) %>
+            <%= label_tag 'options[seo_title]', t('.seo_title', scope: t_scope, default: t('.seo_title', locale: :en)) %>
             <%= text_field_tag 'options[seo_title]', post.get_option('seo_title'), class: 'form-control translatable' %>
         </div>
         <div class="form-group">
-            <%= label_tag 'options[keywords]', cama_t('.seo_keywords', scope: t_scope) %>
+            <%= label_tag 'options[keywords]', t('.seo_keywords', scope: t_scope, default: t('.seo_keywords', locale: :en)) %>
             <%= text_field_tag 'options[keywords]', post.get_option('keywords'), class: 'form-control translatable' %>
         </div>
         <div class="form-group">
-            <%= label_tag 'options[seo_description]', cama_t('.seo_descr', scope: t_scope) %>
+            <%= label_tag 'options[seo_description]', t('.seo_descr', scope: t_scope, default: t('.seo_descr', locale: :en)) %>
             <%= text_area_tag 'options[seo_description]', post.get_option('seo_description'), class: 'form-control translatable' %>
         </div>
 
         <div class="form-group">
-            <%= label_tag 'options[seo_author]', cama_t('.seo_author', scope: t_scope) %>
+            <%= label_tag 'options[seo_author]', t('.seo_author', scope: t_scope, default: t('.seo_author', locale: :en)) %>
             <%= text_field_tag 'options[seo_author]', post.get_option('seo_author'), class: 'form-control' %>
         </div>
         <div class="form-group">
-            <%= label_tag 'options[seo_image]', cama_t('.seo_image', scope: t_scope) %> <br>
+            <%= label_tag 'options[seo_image]', t('.seo_image', scope: t_scope, default: t('.seo_image', locale: :en)) %> <br>
             <%= hidden_field_tag 'options[seo_image]', post.get_option('seo_image') %>
         </div>
     </div>
 </div>
-<script type="application/javascript">jQuery(function(){ $("#form-post #options_seo_image").input_upload({label: '', title: '<%= cama_t('.seo_image', scope: t_scope) %>', type: 'image'}); })</script>
+<script type="application/javascript">
+jQuery(function(){
+    $("#form-post #options_seo_image").input_upload({label: '', title: '<%= t('.seo_image', scope: t_scope, default: t('.seo_image', locale: :en)) %>', type: 'image'});
+    <% if cama_meta_tag_post_is_for_old_version?(post) %> $('#form-post #post_keywords').closest('.form-group').remove(); <% end %>
+})
+</script>

data/config/camaleon_plugin.json

@@ -13,7 +13,9 @@
       "cama_meta_tag_on_inactive"
     ],
     "seo": ["cama_meta_tag_on_seo"],
-    "post_form_custom_html": ["cama_meta_tag_post_form_custom_html"]
+    "post_form_custom_html": ["cama_meta_tag_post_form_custom_html"],
+    "created_post": ["cama_meta_tag_post_saved"],
+    "updated_post": ["cama_meta_tag_post_saved"]
     //here you can add all your hooks (read documentation)
   }
 }

data/lib/cama_meta_tag/version.rb

@@ -1,3 +1,3 @@
 module CamaMetaTag
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cama_meta_tag
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Owen Peredo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails