camaleon_cms 2.1.1 → 2.1.1.4

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

@@ -44,17 +44,17 @@
             </tr>
             </thead>
             <tbody>
-            <% @posts.eager_load(:categories, :post_tags).each do |f| f = f.decorate; parent = f.parent %>
+            <% (@post_type.manage_hierarchy? ? cama_hierarchy_post_list(@posts.eager_load(:categories, :post_tags).decorate.to_a) : @posts.eager_load(:categories, :post_tags).decorate).each do |f| title = f.the_hierarchy_title %>
                 <tr data-id="<%= f.id %>" class="<%= "sortable" if can? :update, f %>">
                     <td><%= f.id %></td>
                     <td>
                         <% if !f.trash? && (can? :update, f) %>
-                            <%= link_to f.the_title, {action: :edit, id: f.id}, class: "cama_ajax_request" %>
+                            <%= link_to title, {action: :edit, id: f.id}, class: "cama_ajax_request" %>
                         <% else %>
-                            <%= f.the_title %>
+                            <%= title %>
                         <% end %>
                     </td>
-                    <%= content_tag :td, parent.present? ? link_to(parent.decorate.the_title, {action: :edit, id: parent.id}, class: "cama_ajax_request") : "" if @lists_tab == "draft" %>
+                    <%= content_tag :td, link_to(f.parent.decorate.the_title, {action: :edit, id: f.post_parent}, class: "cama_ajax_request") if @lists_tab == "draft" && f.post_parent.present? %>
                     <td><%= link_to raw(f.the_status), {action: :index, s: f.status}, class: "cama_ajax_request" %>  </td>
                     <td><%= f.author.fullname %></td>
                     <% if @post_type.manage_categories? %>

data/app/views/camaleon_cms/admin/search.html.erb

@@ -39,15 +39,17 @@
                                     <th><%= t('camaleon_cms.admin.table.id') %></th>
                                     <th><%= t('camaleon_cms.admin.table.name') %></th>
                                     <th><%= t('camaleon_cms.admin.table.post_type') %></th>
+                                    <%= content_tag :th, t('camaleon_cms.admin.table.status') if params[:kind] == "content" %>
                                     <th><%= t('camaleon_cms.admin.table.actions') %></th>
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <% @items.decorate.each do |f| %>
+                                <% (params[:kind] == "content" ? cama_hierarchy_post_list(@items.decorate.to_a) : @items.decorate).each do |f| title = (params[:kind] == "content" ? f.the_hierarchy_title : f.the_title) %>
                                     <tr>
                                         <td><%= f.id %></td>
-                                        <td><%= f.the_title %></td>
-                                        <td><%= f.post_type.decorate.the_title rescue "" %></td>
+                                        <td><%= title %></td>
+                                        <td><%= f.post_type.decorate.the_title rescue "-not found PostType-" %></td>
+                                        <%= content_tag :td, raw(f.the_status) if params[:kind] == "content" %>
                                         <td>
                                             <a href="<%= f.the_url %>" class="btn btn-info btn-xs" target="_blank" title="<%= t('camaleon_cms.admin.button.preview') %>"><i class="fa fa-eye"></i></a>
                                             <a href="<%= f.the_edit_url %>" class="btn btn-info btn-xs" target="_blank" title="<%= t('camaleon_cms.admin.button.edit') %>"><i class="fa fa-pencil"></i></a>

data/app/views/camaleon_cms/admin/settings/_file_system_settings.html.erb

@@ -5,23 +5,23 @@
     </div>
 
     <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_access_key') %><br>
+        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_access_key') %> <small>(Sample: AKIAJAwdgTSHWLAD5VGA)</small><br>
         <%= text_field :options, :filesystem_s3_access_key, :class => "form-control required", value: @site.get_option("filesystem_s3_access_key") %>
     </div>
     <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_secret_key') %><br>
+        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_secret_key') %> <small>(Sample: f5T2CntRcPQBPzACBHUyvM4zEpkiZdH/77N85seBM)</small><br>
         <%= text_field :options, :filesystem_s3_secret_key, :class => "form-control required", value: @site.get_option("filesystem_s3_secret_key") %>
     </div>
     <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_bucket_name') %><br>
+        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_bucket_name') %> <small>(Sample: my_bucket)</small><br>
         <%= text_field :options, :filesystem_s3_bucket_name, :class => "form-control required", value: @site.get_option("filesystem_s3_bucket_name") %>
     </div>
     <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_region') %><br>
+        <%= label_tag t('camaleon_cms.admin.settings.filesystem_region', default: 'filesystem_region') %> <small>(Sample: us-west-2)</small><br>
         <%= text_field :options, :filesystem_region, :class => "form-control required", value: @site.get_option("filesystem_region") %>
     </div>
     <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint') %><br>
+        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint', default: 'filesystem_s3_endpoint') %> <small>(Sample: s3-us-west-2.amazonaws.com)</small><br>
         <%= text_field :options, :filesystem_s3_endpoint, :class => "form-control required", value: @site.get_option("filesystem_s3_endpoint") %>
     </div>
 </div>

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

@@ -3,7 +3,7 @@
    @item_options_value = @item_options_value || {}
    @item_id = @item_value[:id] || ''
    @index = "#{@item_id}_#{Time.now.to_i}_#{rand(999...99999)}"
-   @field_config = cf_get_items[@key.to_sym]
+   @field_config = cama_custom_field_elements[@key.to_sym]
    colors = ['primary','success','warning','colorful','info','danger']
 %>
 
@@ -64,6 +64,7 @@
                   else
                     html += "#{text_field(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
                 end
+                html += "<small>#{input[:description]}</small>" if input[:description].present?
             end
         end
     %>

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

@@ -42,7 +42,7 @@
                                 <i class="fa fa-arrows"></i> <i class="fa fa-times text-danger"></i>
                             </div>
                         <% end %>
-                        <%= render "camaleon_cms/admin/settings/custom_fields/fields/#{@field.options[:field_key]}" %>
+                        <%= render cama_custom_field_elements[@field.options[:field_key].to_sym][:render] || "camaleon_cms/admin/settings/custom_fields/fields/#{@field.options[:field_key]}" %>
                     </div>
                 </div>
 

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_date.html.erb

@@ -1,7 +1,6 @@
-<% @field.options[:type_date].to_s.to_bool ? add_asset_library('datetimepicker') : add_asset_library('datepicker') %>
-<div class="group-input-fields-content" data-callback-function="custom_field_date">
-  <div class="input-append date date-input-box <%= "is_datetimepicker" if @field.options[:type_date].to_s.to_bool %>">
-    <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="input-value   <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+<div class="group-input-fields-content" data-callback-function="custom_field_date" style="max-width: 300px;">
+  <div class="input-group date date-input-box <%= "is_datetimepicker" if @field.options[:type_date].to_s.to_bool %>">
+    <input type="text" data-locale='<%= current_locale %>' name="<%= @field_name %>[<%= @field.slug %>][values][]" class="input-value form-control <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
     <span class="add-on input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
   </div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+  <input data-dimension="<%= @field.options[:dimension] %>" type="url" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
   <span class="input-group-addon btn_upload" onclick="load_upload_image_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_image')%></span>
 </div>

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

@@ -6,7 +6,7 @@
 <!-- PAGE CONTENT WRAPPER -->
 <div class="page-content-wrap" id="cama_custom_field_form" data-group_class_name="<%= @field_group.object_class %>,<%= @field_group.objectid %>">
     <div class="row">
-        <%= form_for @field_group, as: "custom_field_group", url:{action: @field_group.new_record? ? :create : :update}, html: {class: 'validate-custom-field cama_ajax_request'} do |f| %>
+        <%= form_for @field_group, as: "custom_field_group", url:{action: @field_group.new_record? ? :create : :update}, html: {class: 'validate-custom-field validate cama_ajax_request'} do |f| %>
             <div class="col-md-4">
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -125,7 +125,7 @@
                     </div>
                     <div class="panel-body">
                         <div id="content-items-default" class="form-group input-group-sm">
-                            <% cf_get_items.each do |i,item| %>
+                            <% cama_custom_field_elements.each do |i,item| %>
                                 <% next if item[:key] == "select_eval" %>
                                 <a id="item-<%= item[:key] %>" class="btn btn-default" href="<%= get_items_cama_admin_settings_custom_fields_path(item[:key]) %>" style="margin-bottom: 4px"><%= item[:label] %></a>
                             <% end %>

data/app/views/camaleon_cms/admin/settings/post_types/_form.html.erb

@@ -102,6 +102,11 @@
                         <label class="check0"><input name="meta[has_keywords]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_keywords', true) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_keywords') %></label>
                         <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_add_keywords')}", 'right') %>
                     </div>
+                    <div class="form-group">
+                        <input name="meta[has_parent_structure]" type="hidden" value="false"/>
+                        <label class="check0"><input name="meta[has_parent_structure]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.manage_hierarchy? %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_parent_structure', default: 'Manage page hierarchy') %></label>
+                        <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_to_support_parent_structure', default: "Permit to posts indicate the parent page")}", 'right') %>
+                    </div>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="post_type_setting_front">
                     <div class="form-group">
@@ -134,8 +139,13 @@
 <script>
     jQuery(function($){
         var form = $("#post_type_form");
-//        form.find("input[type='checkbox'][name='meta[has_layout]'], input[type='checkbox'][name='meta[has_template]']").change(function(){ var n = $(this).closest(".form-group").next(); if($(this).is(":checked")) n.fadeIn(); else n.fadeOut(); }).trigger("change");
         form.find('.unput_upload').input_upload();
+        form.find("[name='meta[has_parent_structure]']").change(function(){ // permit hierarchy route only for post types enabled "Manage page hierarchy"
+            var item = form.find("#meta_contents_route_format_hierarchy_post");
+            item.parent().siblings().find("input").prop("disabled", $(this).is(":checked"));
+            if($(this).is(":checked")) item.prop("checked", true).prop("disabled", false);
+            else item.prop("disabled", true)
+        }).trigger("change");
     });
 </script>
 

data/app/views/camaleon_cms/admin/settings/post_types/index.html.erb

@@ -33,6 +33,7 @@
                         <td><%= item.the_slug %></td>
                         <td><%= item.count %></td>
                         <td>
+                            <%= link_to raw('<i class="fa fa-eye"></i>'), item.the_url, class: "btn btn-primary btn-xs", title: "#{t('camaleon_cms.common.visit')}", target: '_blank' %>
                             <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: item.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: item.id },method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete_item') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.delete')}" unless item.get_option('not_deleted', false) %>
                         </td>

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

@@ -21,64 +21,53 @@
                         <h3><span class="fa fa-user"></span> <%= @user.fullname if !@user.new_record? %></h3>
                         <p><%= @user.new_record? ? "" : @user.get_meta("slogan") %></p>
                         <div class="text-center" id="user_image">
-
                             <img src="<%= @user.new_record? || !@user.get_meta("avatar") ? asset_path("camaleon_cms/admin/img/no_image.jpg") : @user.get_meta("avatar") %>" class="img-thumbnail input_upload"/>
                         </div>
                     </div>
                     <div class="panel-body user-form-left form-group-separated">
 
-                        <div class="form-group">
-                            <div class="col-md-12 col-xs-12">
-                                <a href="#" class="btn btn-primary btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_photo"><%= t('camaleon_cms.admin.button.change_photo')%></a>
-                            </div>
+                        <div class="">
+                            <a href="#" class="btn btn-primary btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_photo"><%= t('camaleon_cms.admin.button.change_photo')%></a>
                         </div>
 
-                        <div class="form-group">
-                            <label class="col-md-4 col-xs-6 control-label">#<%= t('camaleon_cms.admin.table.id')%></label>
-                            <div class="col-md-8 col-xs-6">
-                                <%= f.text_field :id, :class => "form-control required", disabled: "disabled" %>
-                            </div>
+                        <div class="">
+                            <label class="control-label">#<%= t('camaleon_cms.admin.table.id')%></label>
+                            <%= f.text_field :id, :class => "form-control required", disabled: "disabled" %>
                         </div>
 
-                        <div class="form-group">
-                            <label class="col-md-4 col-xs-6 control-label"><%= t('camaleon_cms.admin.table.login')%></label>
-                            <div class="col-md-8 col-xs-6">
-                                <%= f.text_field :username, :class => "form-control required" %>
-                            </div>
+                        <div class="">
+                            <label class="control-label"><%= t('camaleon_cms.admin.table.login')%></label>
+                            <%= f.text_field :username, :class => "form-control required" %>
                         </div>
 
-                        <div class="form-group">
-                            <label class="col-md-4 col-xs-6 control-label"><%= t('camaleon_cms.admin.table.e_mail')%></label>
-                            <div class="col-md-8 col-xs-6">
-                                <%= f.email_field :email, :class => "form-control required email"%>
-                            </div>
+                        <div class="">
+                            <label class="control-label"><%= t('camaleon_cms.admin.table.e_mail')%></label>
+                            <%= f.email_field :email, :class => "form-control required email"%>
                         </div>
                         <% if @user.new_record? %>
-                            <div class="form-group">
-                                <label class="col-md-4 col-xs-6 control-label"><%= t('camaleon_cms.admin.table.password')%></label>
-                                <div class="col-md-8 col-xs-6">
-                                    <%= f.password_field :password, :class => "form-control required" %>
-                                </div>
+                            <div class="">
+                                <label class="control-label"><%= t('camaleon_cms.admin.table.password')%></label>
+                                <%= f.password_field :password, :class => "form-control required" %>
+                            </div>
+                            <div class="">
+                                <label class="control-label"><%= t('camaleon_cms.admin.table.repeat_new')%></label>
+                                <%= f.password_field :password_confirm, :class => "form-control required",  "equalTo"=>"#user_password" %>
                             </div>
                         <% end %>
 
-                        <div class="form-group">
-                            <%= f.label "#{t('camaleon_cms.admin.table.role')}", class: "col-md-4 col-xs-6 control-label" %>
-                            <div class="col-md-8 col-xs-6">
+                        <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"}%>
                             </div>
                         </div>
-
-                        <div class="form-group">
-                            <div class="col-md-12 col-xs-12">
-                                <button type="submit" class="btn btn-success btn-block" ><%= @user.new_record? ? t('camaleon_cms.admin.button.create') : t('camaleon_cms.admin.button.update') %></button>
-                            </div>
+                        <hr>
+                        <div class="">
+                            <button type="submit" class="btn btn-success btn-block" ><%= @user.new_record? ? t('camaleon_cms.admin.button.create') : t('camaleon_cms.admin.button.update') %></button>
                         </div>
                         <% if !@user.new_record? %>
-                            <div class="form-group">
-                                <div class="col-md-12 col-xs-12">
-                                    <a href="#" class="btn btn-danger btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_password"><%= t('camaleon_cms.admin.button.change_password') %></a>
-                                </div>
+                            <div class="">
+                                <a href="#" class="btn btn-danger btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_password"><%= t('camaleon_cms.admin.button.change_password') %></a>
                             </div>
                         <% end %>
 
@@ -196,28 +185,14 @@
                 <h4 class="modal-title" id="smallModalHead"><%= t('camaleon_cms.admin.button.change_password') %></h4>
             </div>
             <%= form_for @user, as: "user", url: @user.new_record? ? cama_admin_users_path : cama_admin_user_updated_ajax_path(@user), html:{id: "profie-form-ajax-password", class: 'validate-password form-ajax-password modal-body'} do |f| %>
-                <p><%= t('camaleon_cms.admin.message.change_password') %></p>
                 <div class="form-group">
-                    <label class="col-md-3 control-label"><%= t('camaleon_cms.admin.table.old_password') %></label>
-                    <div class="col-md-9">
-                        <input type="password" class="form-control required" name="password[password_old]"/>
-                    </div>
+                    <label class="control-label"><%= t('camaleon_cms.admin.table.new_password') %></label>
+                    <input id="pass_new" type="password" class="form-control required" name="password[password]"/>
                 </div>
-                <div class="clearfix"></div><br>
                 <div class="form-group">
-                    <label class="col-md-3 control-label"><%= t('camaleon_cms.admin.table.new_password') %></label>
-                    <div class="col-md-9">
-                        <input id="pass_new" type="password" class="form-control required" name="password[password]"/>
-                    </div>
-                </div>
-                <div class="clearfix"></div><br>
-                <div class="form-group">
-                    <label class="col-md-3 control-label"><%= t('camaleon_cms.admin.table.repeat_new') %></label>
-                    <div class="col-md-9">
-                        <input type="password" class="form-control required" name="password[password_confirmation]" equalTo="#pass_new"/>
-                    </div>
+                    <label class="control-label"><%= t('camaleon_cms.admin.table.repeat_new') %></label>
+                    <input type="password" class="form-control required" name="password[password_confirmation]" equalTo="#pass_new"/>
                 </div>
-                <div class="clearfix"></div>
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-primary"><%= t('camaleon_cms.admin.button.proccess') %></button>
                     <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('camaleon_cms.admin.button.close') %></button>

data/app/views/camaleon_cms/html_mailer/mailer.html.erb

@@ -1,4 +1,4 @@
-<h5><%= raw @subject  %></h5>
+<h2><%= raw @subject  %></h2>
 <div>
     <%= raw @html  %>
 </div>

data/app/views/camaleon_cms/html_mailer/password_reset.html.erb

@@ -0,0 +1,3 @@
+<p><%= t('camaleon_cms.admin.login.message.hello') %>, <b><%= @extra_data[:fullname] %></b></p>
+<p><%= t('camaleon_cms.admin.login.message.reset_url') %>:</p>
+<p><a href='<%= @extra_data[:url] %>'><b><%= @extra_data[:url] %></b></a></p>

data/app/views/layouts/camaleon_cms/admin.html.erb

@@ -17,7 +17,10 @@
         var I18n_data = <%= I18n.backend.send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe rescue "{}" %>
     </script>
     <%= javascript_include_tag "camaleon_cms/admin/admin-manifest" %>
-    <%= javascript_include_tag "camaleon_cms/admin/jquery_validate/#{current_locale}.js" if current_locale != "en" %> <!-- validator translations -->
+
+    <%= javascript_include_tag "camaleon_cms/admin/jquery_validate/#{current_locale}.js" if current_locale != 'en' %>
+    <%= javascript_include_tag "camaleon_cms/admin/momentjs/#{current_locale}.js" if current_locale != 'en' %>
+
     <%= raw the_head({}, false) %>
     <%= yield :head if content_for? :head %>
     <!--[if lt IE 9]>

data/app/views/layouts/camaleon_cms/admin/_ajax.html.erb

@@ -1,5 +1,7 @@
 <section class="content" id="admin_content" data-title="<%= raw cama_admin_title_draw %>" data-url="<%= request.original_url if params[:cama_ajax_request] == "redirect" %>">
-    <ol class="breadcrumb"><%= render_breadcrumbs :tag => :li, :separator => "" %></ol>
+    <% unless params[:cama_skip_breadcrumb] %>
+        <ol class="breadcrumb"><%= render_breadcrumbs :tag => :li, :separator => "" %></ol>
+    <% end %>
     <%= render "/layouts/camaleon_cms/admin/flash_messages" %>
     <%= cama_draw_custom_assets %>
     <%= yield %>

data/app/views/layouts/camaleon_cms/admin/_footer.html.erb

@@ -1,4 +1,4 @@
-<footer class="main-footer">
+<footer class="main-footer" id="main-footer">
     <div class="row">
         <div class="col-md-6"><strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong></div>
         <div class="col-md-6 hidden-xs">

data/app/views/layouts/camaleon_cms/admin/_header.html.erb

@@ -1,6 +1,6 @@
 <header class="main-header" id="main-header">
     <!-- Logo -->
-    <a href="<%= current_site.the_admin_url%>" class="logo" target="_blank">
+    <a href="<%= current_site.the_admin_url%>" class="logo">
         <img src="<%= current_site.the_logo %>" alt="<%= current_site.the_title %>">
     </a>
     <!-- Header Navbar: style can be found in header.less -->

data/config/initializers/assets.rb

@@ -11,6 +11,8 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+Rails.application.config.tinymce.install = :compile
+
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 
@@ -19,8 +21,8 @@ Rails.application.config.assets.precompile << Proc.new { |path|
   name = File.basename(path)
   content_type = MIME::Types.type_for(name).first.content_type rescue ""
   res = false
-  if (path =~ /\.(css|js|svg|ttf|woff|eot|swf|pdf)\z/ || content_type.scan(/(javascript|image\/|audio|video|font)/).any?) && !name.start_with?("_")
+  if (path =~ /\.(css|js|svg|ttf|woff|eot|swf|pdf)\z/ || content_type.scan(/(javascript|image\/|audio|video|font)/).any?) && !name.start_with?("_") && !path.include?('/views/')
     res = true
   end
   res
-}
+}

data/config/initializers/model_alias.rb

@@ -0,0 +1,11 @@
+module Cama
+end
+Cama::Site = CamaleonCms::Site
+Cama::Post = CamaleonCms::Post
+Cama::Category = CamaleonCms::Category
+Cama::PostTag = CamaleonCms::PostTag
+Cama::PostType = CamaleonCms::PostType
+Cama::TermTaxonomy = CamaleonCms::TermTaxonomy
+Cama::TermRelationship = CamaleonCms::TermRelationship
+Cama::User = CamaleonCms::User
+

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

@@ -59,6 +59,7 @@ en:
         upload_image: 'Upload Image'
         upload_icon: 'Upload Icon'
         upload_video: 'Upload Video'
+        drag_drop: 'Drag & drop files'
         view_draft: 'View Draft'
         view_page: 'View Page'
         yes: 'Yes'
@@ -170,6 +171,7 @@ en:
         media_manager: 'Media Manager'
         home: "Home"
         info: "Information"
+        external: "Upload From URL"
       menus:
         link_url: 'Link URL'
         message:

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

@@ -51,6 +51,7 @@ es:
        update_menu: 'Actualización de Menú'
        upload_audio: 'Subir Audio'
        upload_file: 'Subir Archivo'
+       drag_drop: 'Arrastra & suelta archivos'
        upload_image: 'Subir Imagen'
        upload_icon: 'Subir Icono'
        upload_video: 'Subir Video'
@@ -523,7 +524,7 @@ es:
         list_user_roles: 'Roles de Usuario'
         message:
          error: 'Usuario no encontrado.'
-         error_captcha: 'Oh! Es error con el CAPTCHA!'
+         error_captcha: 'Código de seguridad incorrecto'
          created: 'El usuario ha sido creado.'
          updated: 'El usuario ha sido actualizado.'
          deleted: 'El usuario ha sido eliminado.'

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

@@ -48,6 +48,7 @@ it:
        update_menu: 'Aggiorna menù'
        upload_audio: 'Carica Audio'
        upload_file: 'Carica File'
+       drag_drop: 'Trascinare e rilasciare i file qui'
        upload_image: 'Carica Immagine'
        upload_icon: 'Carica Icona'
        upload_video: 'Carica Video'

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

@@ -124,4 +124,45 @@ it:
           close: 'Chiudi'
           settings: 'Impostazioni'
           save: "Salvare"
-          submit: "Presentare"
+          submit: "Presentare"
+nl:
+  camaleon_cms:
+    admin:
+      js:
+        msg:
+          approved: 'Goedgekeurd'
+          draft: 'Concept succesvol opgeslagen'
+          updated_success: 'Succesvol bijgewerkt'
+          edit_menu: 'Plaatst elk item in de gewenste volgorde. Klik op het icoontje van een potlood om het item te bewerken en klik op het icoon in de vorm van x om het item te verwijderen.'
+          delete_item: 'Wil je dit item echt verwijderen?'
+          remove_items_submenu: 'Wilt je dit item en alle submenu-items echt verwijden?'
+          you_must_upload_image: 'Je moet een afbeelding te uploaden'
+          you_must_upload_video: 'Je moet een video te uploaden'
+          no_response_fields: 'Geen reactie velden '
+          you_must_upload_json_file: 'Je moet een JSON bestand uploaden'
+          no_templates_defined: 'Geen sjablonen ingesteld'
+          avatar_updated: 'Avatar bijgewerkt'
+          form_error: 'Formulier fout'
+          option_title: 'Optie titel'
+          permalink: 'Permalink'
+          recover: 'Herstelts...'
+          type_contents: 'Type Inhoud'
+          confirm_del: "Wil je dit item echt verwijderen?"
+          media_title: 'Media Uploader'
+
+        button:
+          edit: "Bewerk"
+          accept: "Accepteer"
+          cancel: "Annuleer"
+          delete: "Verwijder"
+          clone: "Kopiëren"
+          add_tag: 'Tag toevoegen'
+          close: 'Sluiten'
+          settings: 'Instellingen'
+          save: "Opslaan"
+          submit: "Verstuur"
+          name: "Naam"
+          size: "Grootte"
+          insert: "Invoegen"
+          url: "URL"
+          root: "root"