camaleon_cms 0.2.1 → 1.0

data/app/views/admin/settings/sites/form.html.erb

@@ -1,30 +1,18 @@
-<div class="page-title">
-  <h2><span class="fa fa-cog"></span> <%= @site.new_record? ? t('admin.page_title.new_site') : "#{t('admin.page_title.edit_site')}: #{@site.the_title} "%> </h2>
-</div>
-
 <!-- PAGE CONTENT WRAPPER -->
 <div class="page-content-wrap">
-
   <div class="row">
-    <%= form_for @site, url:{action: @site.new_record? ? :create : :update}, html: {class: ''} do |f| %>
-        <div class="col-md-6 col-md-offset-3">
+    <%= form_for @site, url:{action: @site.new_record? ? :create : :update}, html: {class: 'validate'} do |f| %>
+        <div class="col-md-8 col-md-offset-2">
           <div class="panel panel-default">
-
-
             <div class="panel-heading">
-              <h3 class="panel-title"><%= t('admin.settings.details_site') %></h3>
-              <ul class="panel-controls">
-                <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a></li>
-              </ul>
+                <h4><span class="fa fa-cog"></span> <%= @site.new_record? ? t('admin.page_title.new_site') : "#{t('admin.page_title.edit_site')}: #{@site.the_title} "%> </h4>
             </div>
-
-
             <div class="panel-body">
               <%= render partial: 'layouts/admin/form_error', locals: {data: @site} %>
             <div class="form-group">
                 <%= f.label t('admin.table.slug') %><br>
                 <small><%= t('admin.sites.message.enter_key_domain_empty') %></small><br>
-                <%= f.text_field :slug, :class => "form-control", "data-parent" => "site_name"  %>
+                <%= f.text_field :slug, :class => "form-control required", "data-parent" => "site_name"  %>
             </div>
               <div class="form-group">
                 <%= f.label t('admin.table.name') %><br>
@@ -42,9 +30,6 @@
             </div>
           </div>
         </div>
-
       <% end %>
-
   </div>
-
 </div>

data/app/views/admin/settings/sites/index.html.erb

@@ -1,18 +1,12 @@
-<div class="page-title">
-  <h2><span class="fa fa-cog"></span> <%= t('admin.settings.list_sites') %></h2>
-</div>
-
 <!-- PAGE CONTENT WRAPPER -->
 <div class="page-content-wrap">
-
   <div class="row">
     <div class="col-md-12">
-
       <!-- START BASIC TABLE SAMPLE -->
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title"> <%= t('admin.page_title.list')%> </h3>
-          <%= link_to raw("<i class='fa fa-plus'></i> #{t('admin.sites.add_site')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+            <h4 class="pull-left"><span class="fa fa-cog"></span> <%= t('admin.settings.list_sites') %></h4>
+            <%= link_to raw("<i class='fa fa-plus'></i> #{t('admin.sites.add_site')}"), {action: :new}, class: "btn btn-primary pull-right" %>
         </div>
         <div class="panel-body">
 
@@ -25,6 +19,7 @@
                 <th><%= t('admin.table.description') %></th>
                 <th><%= t('admin.table.default') %></th>
                 <th><%= t('admin.table.actions') %></th>
+                <th></th>
             </tr>
             </thead>
             <tbody>
@@ -40,13 +35,17 @@
                     <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },
                                 method: :delete, data: { confirm: t('admin.message.delete_item') }, class: "btn btn-danger btn-xs", title: "#{t('admin.button.delete')}" unless current_site.id == f.id %>
                     </td>
+                    <td>
+                        <a target="_blank" class="btn btn-info btn-xs" href="<%= f.the_url %>" target="_blank" title="<%= t("common.visit") %>"><i class="fa fa-eye"></i></a>
+                        <a target="_blank" class="btn btn-primary btn-xs" href="<%= f.the_admin_url %>" target="_blank" title="<%= t("admin.sidebar.dashboard") %>"><i class="fa fa-dashboard"></i></a>
+                    </td>
                 </tr>
             <% end %>
 
             </tbody>
           </table>
           <%= content_tag("div", raw(t('admin.message.data_found_list')), class: "alert alert-warning") if @sites.empty? %>
-          <%= will_paginate @sites, renderer: BootstrapPagination::Rails  %>
+            <%= raw do_pagination(@sites) %>
         </div>
       </div>
       <!-- END BASIC TABLE SAMPLE -->

data/app/views/admin/taxonomy/index.html.erb

@@ -66,7 +66,7 @@
             </tbody>
           </table>
           <%= content_tag("div", raw("Not data"), class: "alert alert-warning") if @terms.empty? %>
-          <%= will_paginate @terms, renderer: BootstrapPagination::Rails %>
+            <%= raw do_pagination(@terms) %>
         </div>
       </div>
       <!-- END BASIC TABLE SAMPLE -->

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

@@ -25,7 +25,7 @@
                        <table class="table table-bordered table-hover">
                         <thead>
                         <tr>
-                          <th style="width: 160px"><h5 ><%= t('admin.users.type_contents')%></h5></th>
+                          <th style="width: 160px"><h5 ><%= t('admin.users.post_types')%></h5></th>
                           <% _get_roles_values[:post_type].each do |value| %>
                               <th class="
                                 <%= value[:color] %> text-center" style="vertical-align: middle"><%= raw value[:label] %>
@@ -127,7 +127,7 @@
 </div>
 
 <script>
-  run.push(function(){
+    jQuery(function($){
       $('[data-toggle="tooltip"]').tooltip()
       $("#contents-checkbox input:checked").each(function(){$(this).attr("data-checked", 1)})
       $("#checked-actions a[data-type]").click(function(){
@@ -165,4 +165,3 @@
       }
   }
 </script>
-

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

@@ -1,17 +1,11 @@
-<div class="page-title">
-  <h2><span class="fa fa-file-o"></span> <%= t('admin.users.user_roles')%></h2>
-</div>
-
 <!-- PAGE CONTENT WRAPPER -->
 <div class="page-content-wrap">
-
   <div class="row">
     <div class="col-md-12">
-
       <!-- START BASIC TABLE SAMPLE -->
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title"><%= t('admin.page_title.list')%></h3>
+            <h2 class="pull-left"><span class="fa fa-file-o"></span> <%= t('admin.users.user_roles')%></h2>
           <%= link_to raw("<i class='fa fa-plus'></i> #{t('admin.users.add_user_role')}"), {action: :new}, class: "btn btn-primary pull-right" %>
         </div>
         <div class="panel-body">
@@ -42,7 +36,7 @@
             </tbody>
           </table>
           <%= content_tag("div", raw(t('admin.message.data_found_list')), class: "alert alert-warning") if @user_roles.empty? %>
-          <%= will_paginate @user_roles, renderer: BootstrapPagination::Rails  if @user_roles.present? %>
+            <%= raw do_pagination(@user_roles) %>
 
         </div>
 

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

@@ -141,7 +141,14 @@
                     </div>
 
                 </div>
+                <div class="panel panel-default form-horizontal">
+                  <div class="panel-body">
+                    <h3><span class="fa fa-cube"></span> <%= t('admin.table.more_actions') %></h3>
+                    <p><%= t('admin.message.more_actions_info') %></p>
+                  </div>
 
+                  <%= r = { html: ""}; hooks_run('user_update_more_actions', r); raw(r[:html]); %>
+                </div>
             </div>
         </div>
 
@@ -232,25 +239,23 @@
 <% add_asset_library('form_ajax', 'cropper') %>
 
 <script>
-    run.push(function(){
-
+    jQuery(function($){
         $('.form-ajax-profile').ajaxForm({success: function(res){
             if(res.errors){
-                $.fn.alert({type: 'error', title: lang.msg_form_error, content: res.errors, icon: 'times', close: lang.close});
+                $.fn.alert({type: 'error', title: I18n("msg.form_error"), content: res.errors, icon: 'times', close: I18n("button.close")});
             }else{
-                $.fn.alert({ title: lang.message_updated_success, close: lang.close});
+                $.fn.alert({ title: I18n("msg.form_error"), close: I18n("button.close")});
             }
         }})
         $('.form-ajax-password').ajaxForm({success: function(res){
             if(res.errors){
-                $.fn.alert({type: 'error', title: lang.msg_form_error, content: res.errors, icon: 'times', close: lang.close});
+                $.fn.alert({type: 'error', title: I18n("msg.form_error"), content: res.errors, icon: 'times', close: I18n("button.close")});
             }else{
-                $.fn.alert({ title: lang.message_updated_success, close: lang.close});
+                $.fn.alert({ title: I18n("msg.updated_success"), close: I18n("button.close")});
                 $("#modal_change_password").modal('hide')
             }
         }})
 
-
         function onSuccess(){
             $("#cp_photo").parent("a").find("span").html("Choose another photo");
 
@@ -277,7 +282,7 @@
 
                     $("#cp_crop").ajaxForm({success: function(res){
                         $("#user_image").html('<img class="img-thumbnail" src="'+res+'?r='+Math.random()+'"/>');
-                        $.fn.alert({ title: lang.msg_avatar_updated, close: lang.close});
+                        $.fn.alert({ title: I18n("msg.avatar_updated"), close: I18n("button.close")});
                     }}).submit();
                     $("#cp_target").html("Use form below to upload file. Only image files.");
                     $("#cp_photo").val("").parent("a").find("span").html("Select file");
@@ -302,4 +307,4 @@
         });
 
     });
-</script>
+</script>

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

@@ -1,18 +1,13 @@
-<div class="page-title">
-  <h2><span class="fa fa-file-o"></span> <%= t('admin.users.list_users') %></h2>
-</div>
-
 <!-- PAGE CONTENT WRAPPER -->
 <div class="page-content-wrap">
-
   <div class="row">
     <div class="col-md-12">
 
       <!-- START BASIC TABLE SAMPLE -->
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title"><%= t('admin.page_title.list')%></h3>
-          <%= link_to raw("<i class='fa fa-plus'></i> #{t('admin.users.add_user')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+            <h4 class="pull-left"><span class="fa fa-file-o"></span> <%= t('admin.users.list_users') %></h4>
+            <%= link_to raw("<i class='fa fa-plus'></i> #{t('admin.users.add_user')}"), {action: :new}, class: "btn btn-primary pull-right" %>
         </div>
         <div class="panel-body">
 
@@ -46,7 +41,7 @@
             </tbody>
           </table>
           <%= content_tag("div", raw(t('admin.message.data_found_list')), class: "alert alert-warning") if @users.empty? %>
-          <%= will_paginate @users, renderer: BootstrapPagination::Rails  if @users.present? %>
+            <%= raw do_pagination(@users) %>
 
         </div>
 

data/app/views/admin/users/profile_edit.html.erb

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="col-md-3 col-sm-4">
 
-      <%= form_for @user, url: admin_profile_edit_path, html:{class: 'validate-profile form-horizontal form-ajax-profile'} do |f| %>
+      <%= form_for @user, url: admin_profile_edit_path, html:{class: 'form-horizontal form-ajax-profile'} do |f| %>
 
         <div class="panel panel-default">
           <div class="panel-body">
@@ -73,7 +73,7 @@
     </div>
     <div class="col-md-6 col-sm-8">
 
-      <%= form_for @user, url: admin_profile_edit_path, html:{class: 'validate-profile form-horizontal form-ajax-profile'} do |f| %>
+      <%= form_for @user, url: admin_profile_edit_path, html:{class: 'form-horizontal form-ajax-profile'} do |f| %>
         <div class="panel panel-default">
           <div class="panel-body">
             <h3><span class="fa fa-pencil"></span> <%= t('admin.users.profile') %></h3>
@@ -91,7 +91,7 @@
                       <%= t("admin.table.#{values[:label].gsub(' ','').tableize}")%>
                   </label>
                   <div class="col-md-9 col-xs-7">
-                    <input type="text" name="<%=  "meta[#{field}]" %>" value="<%= data_meta[field] %>" class="form-control"/>
+                    <input type="text" name="<%=  "meta[#{field}]" %>" value="<%= data_meta[field] %>" class="form-control <%= 'required lettersonly' if field.to_s == 'first_name' || field.to_s == 'last_name' %>"/>
                   </div>
                 </div>
             <% end %>
@@ -232,20 +232,27 @@
 <% add_asset_library('form_ajax', 'cropper') %>
 
 <script>
-    run.push(function(){
-
-        $('.form-ajax-profile').ajaxForm({success: function(res){
-            if(res.errors){
-                $.fn.alert({type: 'error', title: lang.msg_form_error, content: res.errors, icon: 'times', close: lang.close});
-            }else{
-                $.fn.alert({ title: lang.message_updated_success, close: lang.close});
+    jQuery(function($){
+        $('.form-ajax-profile').bind('submit', function(e) {
+            e.preventDefault();
+            if($(this).valid()){
+                showLoading();
+                $(this).ajaxSubmit({success: function(res){
+                    if(res.errors){
+                        $.fn.alert({type: 'error', title: I18n("msg.form_error"), content: res.errors, icon: 'times', close: I18n("button.close")});
+                    }else{
+                        $.fn.alert({ title: I18n("msg.updated_success"), close: I18n("button.close")});
+                    }
+                }})
             }
-        }})
+        }).validate();
+
+
         $('.form-ajax-password').ajaxForm({success: function(res){
             if(res.errors){
-                $.fn.alert({type: 'error', title: lang.msg_form_error, content: res.errors, icon: 'times', close: lang.close});
+                $.fn.alert({type: 'error', title: I18n("msg.form_error"), content: res.errors, icon: 'times', close: I18n("button.close")});
             }else{
-                $.fn.alert({ title: lang.message_updated_success, close: lang.close});
+                $.fn.alert({ title: I18n("msg.updated_success"), close: I18n("button.close")});
                 $("#modal_change_password").modal('hide')
             }
         }})
@@ -277,7 +284,7 @@
 
                     $("#cp_crop").ajaxForm({success: function(res){
                         $("#user_image").html('<img class="img-thumbnail" src="'+res+'?r='+Math.random()+'"/>');
-                        $.fn.alert({ title: lang.msg_avatar_updated, close: lang.close});
+                        $.fn.alert({ title: I18n("msg.avatar_updated"), close: I18n("button.close")});
                     }}).submit();
                     $("#cp_target").html("Use form below to upload file. Only image files.");
                     $("#cp_photo").val("").parent("a").find("span").html("Select file");

data/app/views/default_theme/custom_fields/audio.html.erb

@@ -0,0 +1,3 @@
+<% object.get_fields(field_key).each do |value| %>
+    <audio src="<%= value %>" <%= attibutes["attrs"] || "controls" %> ></audio>
+<% end %>

data/app/views/default_theme/custom_fields/checkbox.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <input type="checkbox" value="<%= field.options[:default_value] || 1 %>" name="<%= field_key %>" <%= 'checked' if value.to_s == "1" %> <%= attibutes["attrs"] || "controls" %> />
+<% end %>

data/app/views/default_theme/custom_fields/checkboxes.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <input type="checkbox" value="<%= field.options[:default_value] || 1 %>" name="<%= field_key %>" <%= 'checked' if value.to_s == "1" %> <%= attibutes["attrs"] || "controls" %> />
+<% end %>

data/app/views/default_theme/custom_fields/colorpicker.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %> ><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/date.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/editor.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <div <%= attibutes["attrs"] %> ><%= do_shortcode(value) %></div>
+<% end %>

data/app/views/default_theme/custom_fields/email.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/field_attrs.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/file.html.erb

@@ -0,0 +1,3 @@
+<% object.get_fields(field_key).each do |value| %>
+    <a href="<%= value %>" target="_blank" <%= {"target" => "_blank"}.merge(attibutes["attrs"]) %>><%= value.split('/').last %></a>
+<% end %>

data/app/views/default_theme/custom_fields/image.html.erb

@@ -0,0 +1,3 @@
+<% object.get_fields(field_key).each do |value| %>
+    <img src="<%= value %>" <%= attibutes["attrs"] %>>
+<% end %>

data/app/views/default_theme/custom_fields/numeric.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/phone.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/posts.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| p = current_site.the_posts.find(value).decorate rescue nil; next unless p.present? %>
+    <a <%= attibutes["attrs"] %> href="<%= p.the_url %>"><%= p.the_title %></a>
+<% end %>

data/app/views/default_theme/custom_fields/radio.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/select.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/select_eval.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/text_area.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/text_box.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/url.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| %>
+    <span <%= attibutes["attrs"] %>><%= value %></span>
+<% end %>

data/app/views/default_theme/custom_fields/users.html.erb

@@ -0,0 +1,3 @@
+<% object.the_fields(field_key).each do |value| p = current_site.users.find(value).decorate rescue nil; next unless p.present? %>
+    <a <%= attibutes["attrs"] %> href="<%= p.the_url %>"><%= p.the_name %></a>
+<% end %>

data/app/views/default_theme/custom_fields/video.html.erb

@@ -0,0 +1,3 @@
+<% object.get_fields(field_key).each do |value| %>
+    <video src="<%= value %>" <%= {"controls" => "true"}.merge(attibutes["attrs"]) %>></video>
+<% end %>

data/app/views/default_theme/layouts/index.html.erb

@@ -9,7 +9,7 @@
     <!-- END META SECTION -->
 
     <%= stylesheet_link_tag theme_asset_path("css/main") %>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <%= javascript_include_tag theme_asset_path("js/main.js") %>
     <%= raw the_head %>
 </head>
@@ -31,4 +31,4 @@
 </div>
 <!-- ./container -->
 </body>
-</html>
+</html>

data/app/views/default_theme/{post.html.erb → single.html.erb}

@@ -31,7 +31,7 @@
                 </article>
                 <%= render partial: 'partials/comments', locals: {post: @post} if @post.can_commented? %>
             </div>
-            <div class="col-md-3">
+            <div class="col-md-3 single-sidebar">
                 <%= render partial: 'partials/sidebar', locals: {post: @post} %>
             </div>
         <% end %>