camaleon_cms 2.1.2.0 → 2.1.2.1

data/app/views/camaleon_cms/default_theme/post_type.html.erb

@@ -6,7 +6,7 @@
     </div><br><br>
 
     <% if @categories.present? %>
-        <div class="well">
+        <div class="categories_list">
             <%= render partial: "partials/categories_list", locals: {categories: @categories} %>
         </div>
     <% end %>
@@ -19,7 +19,6 @@
     </div>
     <%= content_tag("div", raw(ct('no_contents_found', default: 'No contents found.')), class: "alert alert-warning") if @posts.empty? %>
     <%= will_paginate @posts, renderer: BootstrapPagination::Rails if @posts.present? %>
-
 </article>
 
 

data/config/initializers/active_record_extension.rb

@@ -37,9 +37,7 @@ ActiveRecord::Associations::CollectionProxy.class_eval do
   # order: (String) order direction (ASC | DESC)
   # sample: CamaleonCms::Site.first.posts.sort_by_field("untitled-field-attributes", "desc")
   def sort_by_field(key, order = "ASC")
-    # class_name = self.build.class.name
-    # table_name = class_name.classify.table_name
-    self.includes(:custom_field_values).where("#{CamaleonCms::CustomFieldsRelationship.table_name}.custom_field_slug = ? and #{CamaleonCms::CustomFieldsRelationship.table_name}.object_class = ?", key, self.build.class.name).reorder("#{CamaleonCms::CustomFieldsRelationship.table_name}.value #{order}")
+    self.joins("LEFT OUTER JOIN #{CamaleonCms::CustomFieldsRelationship.table_name} ON #{CamaleonCms::CustomFieldsRelationship.table_name}.objectid = #{self.build.class.table_name}.id").where("#{CamaleonCms::CustomFieldsRelationship.table_name}.custom_field_slug = ? and #{CamaleonCms::CustomFieldsRelationship.table_name}.object_class = ?", key, self.build.class.name.parseCamaClass).reorder("#{CamaleonCms::CustomFieldsRelationship.table_name}.value #{order}")
   end
 
   # Filter by custom field values
@@ -48,8 +46,10 @@ ActiveRecord::Associations::CollectionProxy.class_eval do
   # sample: my_posts_that_include_my_field = CamaleonCms::Site.first.posts.filter_by_field("untitled-field-attributes")
   #   this will return all posts of the first site that include custom field "untitled-field-attributes"
   #   additionally, you can add extra filter: my_posts_that_include_my_field.where("#{CamaleonCms::CustomFieldsRelationship.table_name}.value=?", "my_value_for_field")
-  def filter_by_field(key)
-    self.includes(:custom_field_values).where("#{CamaleonCms::CustomFieldsRelationship.table_name}.custom_field_slug = ? and #{CamaleonCms::CustomFieldsRelationship.table_name}.object_class = ?", key, self.build.class.name)
+  def filter_by_field(key, args = {})
+    res = self.joins("LEFT OUTER JOIN #{CamaleonCms::CustomFieldsRelationship.table_name} ON #{CamaleonCms::CustomFieldsRelationship.table_name}.objectid = #{self.build.class.table_name}.id").where("#{CamaleonCms::CustomFieldsRelationship.table_name}.custom_field_slug = ? and #{CamaleonCms::CustomFieldsRelationship.table_name}.object_class = ?", key, self.build.class.name.parseCamaClass)
+    res = res.where("#{CamaleonCms::CustomFieldsRelationship.table_name}.value = ?", args[:value]) if args[:value]
+    res
   end
 end
 

data/config/locales/camaleon_cms/admin/es.yml

@@ -226,6 +226,7 @@ es:
         clone_content: 'Clonar contenido'
         label_required: 'Etiqueta Requerida'
         placeholder_required: 'Placeholder Requerido'
+        is_featured: 'Es Destacado?'
         message:
           created: 'El %{post_type} se ha creado.'
           updated: 'El %{post_type} se ha actualizado.'
@@ -485,6 +486,7 @@ es:
         password_confirmation: 'Confirmación de Contraseña'
         password_protection: 'Protección por contraseña'
         permit_comments_default: 'Permitir Comentarios (por defecto)'
+        permit_is_featured: 'Permitir Articulos Destacados'
         post: 'Articulo'
         post_type: 'Tipo de Articulo'
         pending: 'Pendiente'

data/config/locales/camaleon_cms/common.yml

@@ -120,6 +120,7 @@ es:
       back_top: "Volver arriba"
       total_followers_social: "Total de seguidores en redes sociales"
       latest_articles: "Ultimos Articulos"
+      related_articles: 'Artículos Relacionados'
       photo_gallery: "Galerías de fotos"
       home_galleries: "Ir a la portada de galerias"
       addition: "Ademas"

data/db/migrate/20160504155652_add_feature_to_posts.rb

@@ -0,0 +1,5 @@
+class AddFeatureToPosts < ActiveRecord::Migration
+  def change
+    add_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :is_feature, :boolean, default: false
+  end
+end

data/db/migrate/20160504155653_move_first_name_of_users.rb

@@ -0,0 +1,9 @@
+class MoveFirstNameOfUsers < ActiveRecord::Migration
+  def change
+    add_column "#{PluginRoutes.static_system_info["db_prefix"]}users", :first_name, :string
+    add_column "#{PluginRoutes.static_system_info["db_prefix"]}users", :last_name, :string
+    CamaleonCms::User.all.each do |u|
+      u.update_columns(first_name: u.get_meta('first_name'), last_name: u.get_meta('last_name'))
+    end
+  end
+end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.1.2.0'
+  VERSION = '2.1.2.1'
 end

data/lib/ext/string.rb

@@ -134,9 +134,19 @@ class String
   end
 
   # Sample:
-  #  /var/www/media/132/logo.png ==> /var/www/media/132/logo_2.png
+  #  '/var/www/media/132/logo.png'.cama_add_postfix_file_name('_2') ==> /var/www/media/132/logo_2.png
   def cama_add_postfix_file_name(postfix)
     File.join(File.dirname(self), "#{File.basename(self, File.extname(self))}#{postfix}#{File.extname(self)}")
   end
 
+  # Parse the url to get the image version
+  #   version_name: (String) version name,
+  #     if this is empty, this will return the image version for thumb of the image, sample: 'http://localhost/my_image.png'.cama_parse_image_version('') => http://localhost/thumb/my_image.png
+  #     if this is present, this will return the image version generated, sample: , sample: 'http://localhost/my_image.png'.cama_parse_image_version('200x200') => http://localhost/thumb/my_image_200x200.png
+  #   default: default image if post image does not exist
+  def cama_parse_image_version(version_name: '')
+    res = File.join(File.dirname(self), 'thumb', "#{File.basename(self).parameterize}#{File.extname(self)}")
+    res = res.cama_add_postfix_file_name("_#{version_name}") if version_name.present?
+    res
+  end
 end

data/lib/generators/camaleon_cms/theme_template/app/apps/themes/my_theme/main_helper.rb

@@ -12,13 +12,16 @@ module Themes::ThemeClass::MainHelper
 
   # callback called after theme installed
   def themeKey_on_install_theme(theme)
-    unless theme.get_field_groups.where(slug: "fields").any?
-      group = theme.add_field_group({name: "Main Settings", slug: "fields", description: ""})
-      group.add_field({"name"=>"Background color", "slug"=>"bg_color"},{field_key: "colorpicker"})
-      group.add_field({"name"=>"Links color", "slug"=>"links_color"},{field_key: "colorpicker"})
-      group.add_field({"name"=>"Background image", "slug"=>"bg"},{field_key: "image"})
-    end
-    theme.set_meta("installed_at", Time.current.to_s) # save a custom value
+    # # Sample Custom Field
+    # unless theme.get_field_groups.where(slug: "fields").any?
+    #   group = theme.add_field_group({name: "Main Settings", slug: "fields", description: ""})
+    #   group.add_field({"name"=>"Background color", "slug"=>"bg_color"},{field_key: "colorpicker"})
+    #   group.add_field({"name"=>"Links color", "slug"=>"links_color"},{field_key: "colorpicker"})
+    #   group.add_field({"name"=>"Background image", "slug"=>"bg"},{field_key: "image"})
+    # end
+
+    # # Sample Meta Value
+    # theme.set_meta("installed_at", Time.current.to_s) # save a custom value
   end
 
   # callback executed after theme uninstalled

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.2.0
+  version: 2.1.2.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -714,6 +714,7 @@ files:
 - app/views/camaleon_cms/default_theme/partials/_categories_list.html.erb
 - app/views/camaleon_cms/default_theme/partials/_comments.html.erb
 - app/views/camaleon_cms/default_theme/partials/_comments_list.html.erb
+- app/views/camaleon_cms/default_theme/partials/_comments_list2.html.erb
 - app/views/camaleon_cms/default_theme/partials/_flash_messages.html.erb
 - app/views/camaleon_cms/default_theme/partials/_forms.html.erb
 - app/views/camaleon_cms/default_theme/partials/_post_list_item.html.erb
@@ -781,6 +782,8 @@ files:
 - db/migrate/20150611161134_post_table_into_utf8.rb
 - db/migrate/20150926095310_rename_column_posts.rb
 - db/migrate/20151212095328_add_confirm_token_to_users.rb
+- db/migrate/20160504155652_add_feature_to_posts.rb
+- db/migrate/20160504155653_move_first_name_of_users.rb
 - lib/camaleon_cms.rb
 - lib/camaleon_cms/engine.rb
 - lib/camaleon_cms/version.rb
@@ -868,3 +871,4 @@ signing_key:
 specification_version: 4
 summary: Camaleon is a cms for Ruby on Rails 4 as an alternative to wordpress.
 test_files: []
+has_rdoc: