camaleon_cms 2.4.0 → 2.4.1

data/app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb

@@ -39,7 +39,7 @@
                         </div>
                     <% end %>
                 </div>
-                <script> jQuery(function(){ build_custom_field_group(<%= raw(params[:field_options].present? ? (r = []; params[:field_options].each{|k, v| val = {}; v.each{|kk, vv| val["#{kk}"] = (vv['values'].values rescue vv['values']); }; r << val }; r.to_json) : record.get_fields_grouped(fields.pluck(:slug).uniq).to_json) %>, '<%= group.id %>', <%= raw group_field_data.to_json %>, <%= group.is_repeat %>); }); </script>
+                <script> jQuery(function(){ build_custom_field_group(<%= raw(params[:field_options].present? ? (r = []; params[:field_options].each{|k, v| val = {}; v.each{|kk, vv| val["#{kk}"] = (vv['values'].values rescue vv['values']); }; r << val }; r.to_json) : record.get_fields_grouped(fields.pluck(:slug).uniq).to_json) %>, '<%= group.id %>', <%= raw group_field_data.to_json %>, <%= group.is_repeat %>, '<%= field_name %>'); }); </script>
             </div>
         </div>
         <% if group.is_repeat %>

data/app/views/camaleon_cms/admin/settings/custom_fields/form.html.erb

@@ -111,7 +111,7 @@
                     </div>
                     <div class="panel-body padding-0">
                         <% fields =  @field_group.new_record? ? [] : @field_group.fields %>
-                        <ul id="sortable-fields" class="clear">
+                        <ul id="sortable-fields" class="clear list-unstyled">
                             <% fields.each do |field| @item_value = field; @item_options_value = field.options; @key = field.options[:field_key] %>
                                 <li class="item">
                                     <%= render "get_items" %>

data/app/views/camaleon_cms/admin/user_roles/form.html.erb

@@ -1,7 +1,7 @@
 <div class="page-title">
   <h2>
     <span class="fa fa-users"></span>
-    <%= t('camaleon_cms.admin.page_title.edit') + " " + @user_role.name if !@user_role.new_record? %>
+    <%= t('camaleon_cms.admin.page_title.edit') + " " + @user_role.the_title if !@user_role.new_record? %>
     <%= t('camaleon_cms.admin.users.create_user') if  @user_role.new_record? %>
   </h2>
 </div>
@@ -91,11 +91,10 @@
             <div class="panel-heading ui-draggable-handle">
               <h3 class="panel-title"><%= t('camaleon_cms.admin.page_title.details')%> </h3>
             </div>
-
                 <div class="panel-body">
                   <div class="form-group">
                     <%= f.label t('camaleon_cms.admin.table.name') %>
-                    <%= f.text_field :name, :class => "form-control required", disabled: @user_role.editable? ? false : 'disabled'  %>
+                    <%= f.text_field :name, :class => "form-control required translatable" %>
                   </div>
                   <div class="form-group">
                     <%= f.label t('camaleon_cms.admin.table.slug') %>
@@ -103,16 +102,13 @@
                   </div>
                   <div class="form-group">
                     <%= f.label t('camaleon_cms.admin.table.description') %>
-                    <%= f.text_area :description, :class => "form-control " , disabled: @user_role.editable? ? false : 'disabled' %>
+                    <%= f.text_area :description, :class => "form-control translatable" %>
                   </div>
-
                 </div>
 
                 <div class="panel-footer">
-                  <a class="btn btn-default" role="back" href="<%= url_for action: :index %>"><%= t('camaleon_cms.admin.button.back') %></a>
-                  <% if @user_role.editable? %>
-                  <button class="btn btn-primary pull-right" type="submit"><%= t('camaleon_cms.admin.button.submit') %></button>
-                  <% end %>
+                    <a class="btn btn-default" role="back" href="<%= url_for action: :index %>"><%= t('camaleon_cms.admin.button.back') %></a>
+                    <button class="btn btn-primary pull-right" type="submit"><%= t('camaleon_cms.admin.button.submit') %></button>
                 </div>
 
           </div>

data/app/views/camaleon_cms/admin/user_roles/index.html.erb

@@ -23,11 +23,11 @@
             </tr>
             </thead>
             <tbody>
-            <% @user_roles.each do |f| %>
+            <% @user_roles.decorate.each do |f| %>
                 <tr>
                   <td><%= f.id %></td>
-                  <td><%= f.name %></td>
-                  <td><%= f.description %></td>
+                  <td><%= f.the_title %></td>
+                  <td><%= f.the_content %></td>
                   <td>
                     <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: f.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
                     <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },

data/app/views/camaleon_cms/admin/users/form.html.erb

@@ -54,7 +54,7 @@
                         <div class="">
                             <%= f.label "#{t('camaleon_cms.admin.table.role')}", class: "control-label" %>
                             <div class="">
-                                <%= f.select :role,current_site.user_roles.reorder(:name).all.map{|role| [role.name, role.slug]}, {}, {:class => "form-control required"}%>
+                                <%= f.select :role,current_site.user_roles.reorder(:name).decorate.map{|role| [role.the_title, role.slug]}, {}, {:class => "form-control required"}%>
                             </div>
                         </div>
                         <hr>

data/app/views/camaleon_cms/admin/users/index.html.erb

@@ -32,8 +32,8 @@
                   <td><%= f.id %></td>
                   <td><%= f.username %></td>
                   <td><%= f.email %></td>
-                  <td><%= f.role %></td>
-                  <td><%= f.last_login_at.strftime("%Y-%m-%d %H:%M:%S") if f.last_login_at.present? %></td>
+                  <td><%= f.the_role %></td>
+                  <td><%= l(f.last_login_at, format: :long) if f.last_login_at.present? %></td>
                   <td>
                     <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: f.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
                     <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },

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

@@ -193,6 +193,8 @@ es:
           root: "Raiz"
           replace_image: 'Reemplazar Imagen'
           save_new_image: 'Guardar Nueva Imagen'
+          auto_crop: 'Recorte Automático'
+          edit_image: 'Editar Imagen'
 
 it:
   camaleon_cms:

data/db/migrate/20161215202255_drop_user_relationship_table.rb

@@ -0,0 +1,5 @@
+class DropUserRelationshipTable < ActiveRecord::Migration
+  def change
+    drop_table "#{PluginRoutes.static_system_info["db_prefix"]}user_relationships"
+  end
+end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160609121449) do
+ActiveRecord::Schema.define(version: 20161215202255) do
 
   create_table "comments", force: :cascade do |t|
     t.string   "author"
@@ -147,16 +147,6 @@ ActiveRecord::Schema.define(version: 20160609121449) do
   add_index "term_taxonomy", ["term_order"], name: "index_term_taxonomy_on_term_order"
   add_index "term_taxonomy", ["user_id"], name: "index_term_taxonomy_on_user_id"
 
-  create_table "user_relationships", force: :cascade do |t|
-    t.integer "term_order"
-    t.integer "active",           default: 1
-    t.integer "term_taxonomy_id"
-    t.integer "user_id"
-  end
-
-  add_index "user_relationships", ["term_taxonomy_id"], name: "index_user_relationships_on_term_taxonomy_id"
-  add_index "user_relationships", ["user_id"], name: "index_user_relationships_on_user_id"
-
   create_table "users", force: :cascade do |t|
     t.string   "username"
     t.string   "role",                   default: "client"

data/spec/helpers/short_code_helper_spec.rb

@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+def shortcode_tests
+  before(:each) do
+    helper.shortcodes_init
+    helper.shortcode_add("hello_world", lambda{|attrs, args|
+      "Hello World"
+    })
+    helper.shortcode_add("hello", lambda{|attrs, args|
+      "Hello #{attrs['name']}"
+    })
+    helper.shortcode_add("user_info", lambda{|attrs, args|
+      "#{attrs['name']} #{attrs['lastname']}"
+    })
+    helper.shortcode_add("modal", lambda{|attrs, args|
+      "modal body = #{args[:shortcode_content]}"
+    })
+    helper.shortcode_add("title", lambda{|attrs, args|
+      "<h1>#{args[:shortcode_content]}</h1>"
+    })
+    helper.shortcode_add("sub_title", lambda{|attrs, args|
+      "<h2 style='#{attrs['style']}'>#{args[:shortcode_content]}</h2>"
+    })
+    helper.shortcode_add("sub_title2", lambda{|attrs, args|
+      "<h2 style='#{attrs['style']}' class='#{attrs['class']}'>#{args[:shortcode_content]}</h2>"
+    })
+  end
+end
+
+describe "CamaleonCms::ShortCodeHelper" do
+  # get_current_test_site()
+  describe "Shortcode Simple" do
+    shortcode_tests
+    it "No attributes" do
+      expect(helper.do_shortcode('This is my first [hello_world]')).to include('Hello World')
+    end
+    it "With attribute" do
+      expect(helper.do_shortcode('Say [hello name="Owen"]')).to be == 'Say Hello Owen'
+    end
+    it "With attributes" do
+      expect(helper.do_shortcode('Hi [user_info name="Owen" lastname="Peredo"], Good morning')).to be == 'Hi Owen Peredo, Good morning'
+    end
+  end
+
+  describe "Shortcode with Block" do
+    shortcode_tests
+    it "No attributes" do
+      expect(helper.do_shortcode('Sample [title]This is title[/title].')).to include('Sample <h1>This is title</h1>.')
+    end
+    it "With attribute" do
+      expect(helper.do_shortcode('Sample [sub_title style="color: red;"]This is sub title[/sub_title].')).to include('Sample <h2 style=\'color: red;\'>This is sub title</h2>.')
+    end
+    it "With attributes" do
+      expect(helper.do_shortcode('Sample [sub_title2 style="color: red;" class="center"]This is sub title[/sub_title2].')).to include('Sample <h2 style=\'color: red;\' class=\'center\'>This is sub title</h2>.')
+    end
+  end
+
+  describe "Shortcode Multiple" do
+    shortcode_tests
+    it "Many Shortcodes" do
+      expect(helper.do_shortcode('[title][hello name="Owen"][/title] and [hello_world].')).to include('<h1>Hello Owen</h1> and Hello World.')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -677,6 +677,7 @@ files:
 - app/decorators/camaleon_cms/term_taxonomy_decorator.rb
 - app/decorators/camaleon_cms/theme_decorator.rb
 - app/decorators/camaleon_cms/user_decorator.rb
+- app/decorators/camaleon_cms/user_role_decorator.rb
 - app/decorators/camaleon_cms/widget_decorator.rb
 - app/helpers/camaleon_cms/admin/application_helper.rb
 - app/helpers/camaleon_cms/admin/breadcrumb_helper.rb
@@ -724,7 +725,6 @@ files:
 - app/models/camaleon_cms/term_taxonomy.rb
 - app/models/camaleon_cms/theme.rb
 - app/models/camaleon_cms/user.rb
-- app/models/camaleon_cms/user_relationship.rb
 - app/models/camaleon_cms/user_role.rb
 - app/models/camaleon_cms/widget.rb
 - app/models/camaleon_cms/widget/assigned.rb
@@ -961,6 +961,7 @@ files:
 - db/migrate/20160606135421_improve_menus_structure.rb
 - db/migrate/20160609121449_add_group_to_custom_field_values.rb
 - db/migrate/20161206211917_install_migrated_seo_plugin.rb
+- db/migrate/20161215202255_drop_user_relationship_table.rb
 - lib/camaleon_cms.rb
 - lib/camaleon_cms/engine.rb
 - lib/camaleon_cms/version.rb
@@ -1063,6 +1064,7 @@ files:
 - spec/features/users_spec.rb
 - spec/features/widgets_spec.rb
 - spec/helpers/email_helper_spec.rb
+- spec/helpers/short_code_helper_spec.rb
 - spec/mailers/send_mail_spec.rb
 - spec/models/user_spec.rb
 - spec/rails_helper.rb
@@ -1153,6 +1155,7 @@ test_files:
 - spec/features/users_spec.rb
 - spec/features/widgets_spec.rb
 - spec/helpers/email_helper_spec.rb
+- spec/helpers/short_code_helper_spec.rb
 - spec/mailers/send_mail_spec.rb
 - spec/models/user_spec.rb
 - spec/rails_helper.rb

data/app/models/camaleon_cms/user_relationship.rb

@@ -1,7 +0,0 @@
-class CamaleonCms::UserRelationship < ActiveRecord::Base
-  self.table_name = "#{PluginRoutes.static_system_info["db_prefix"]}user_relationships"
-  # attr_accessible :user_id, :term_taxonomy_id, :term_order, :active
-
-  belongs_to :term_taxonomies, :class_name => "CamaleonCms::TermTaxonomy", foreign_key: :term_taxonomy_id, inverse_of: :user_relationships
-  belongs_to :user, :class_name => "CamaleonCms::User", foreign_key: :user_id
-end