roroacms 0.0.8.6.6 → 0.0.8.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 135d1f6525d6a99da1621dad5ac9bb0c650c1945
-  data.tar.gz: df7dd6685b09f7c07fa8da332af7de668b3e7465
+  metadata.gz: c66311108a8b6c47d85059f4fb0b791f560c3b9a
+  data.tar.gz: 74558fe052ba8cbcdaec01ddc724d1ab9f0ac00a
 SHA512:
-  metadata.gz: 4d1862b8f21c4065c4fef40558b43ce56f6954e9e3a3e07481ba68a76bd404428af901d7d6f3d40a1ef3e35d02511365d2ec87bc54d31767eaa38efc2fe174a8
-  data.tar.gz: 57a02678d9c0003f0962496313ac1c8ac14e13fd9f0d0dafd25b81e6d356aab91e0dccf2ed41157201caa8a09a0f1e6ee3be2315cf2c7c78053c1b2713e895a8
+  metadata.gz: be1b8a1aadde1e8f609b849c550ccfe47b9c1576f397d924367f38c6e033f4017e20237a40a8dddd21b2b712d75f1ac7d372fc378de4b5b6a80d8285fa3768fc
+  data.tar.gz: b0dd87116cc3f684c36c9f312d1ef40dcf8583d6a542b3210f0914bf993fbe869bdc2def1da4621e7a359cb31e6a298de57ccfbabd386222aced72777d25dea3

data/app/assets/javascripts/roroacms/admin/admin.js

@@ -92,4 +92,7 @@ $(document).ready(function() {
     dTable.fnFilter($(this).val());
   });
   $('.tooltipState').tooltip({delay: {show:500, hide:100}});
+
+  $('.pop').popover();
+
 });

data/app/assets/stylesheets/roroacms/admin/main.css.scss

@@ -2168,8 +2168,16 @@ fieldset[disabled] .btn-warning.active {
   color: #8ecf67;
 }
 #login-container .error {
-  font-size: 12px;
   color: #F74E4D;
+  display: block;
+  font-size: 12px;
+  margin: 0 0 15px;
+  text-align: center;
+  padding:7px;
+}
+
+a.pop {
+  color:#5d5f63;
 }
 section#login-container div#error_explanation h2 {
   font-size: 12px;

data/app/assets/stylesheets/roroacms/vendor/ghostdown.css

@@ -275,6 +275,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
 	background: #ffa;
 	background: rgba(255,255,0,0.4)
 }
+
+.rendered-markdown hr {
+	border-color:#6c7379 !important;
+}
 .CodeMirror span {
 *vertical-align:text-bottom
 }

data/app/controllers/roroacms/admin/administrators_controller.rb

@@ -22,7 +22,7 @@ module Roroacms
     def new
       # add breadcrumb and set title
       add_breadcrumb I18n.t("generic.add_new_user")
-      set_title(I18n.t("generic.profile"))
+      set_title(I18n.t("generic.add_new_user"))
 
       @admin = Admin.new
       @action = 'create'

data/app/controllers/roroacms/admin/dashboard_controller.rb

@@ -5,6 +5,7 @@ module Roroacms
 	  # interface to the admin dashboard
 	  def index
 	    @comments = latest_comments
+	    @counts = {:page => get_count_post('page'), :post => get_count_post('post'), :comments => @comments.size }
 	  end
 
 	end

data/app/controllers/roroacms/application_controller.rb

@@ -141,6 +141,12 @@ module Roroacms
 
     end
 
+    # Adds an asterix to the field if it is required.
+    
+    def mark_required(object, attribute)  
+      "*" if object.class.validators_on(attribute).map(&:class).include? ActiveModel::Validations::PresenceValidator  
+    end 
+
 
     # protected
 

data/app/views/devise/sessions/new.html.erb

@@ -8,6 +8,8 @@
       <p class="notice"><%= flash[:notice] %></p>
     <% elsif !flash[:error].blank? %>
       <p class="error"><%= flash[:error] %></p>
+    <% elsif !flash[:alert].blank? %>
+      <p class="error"><%= flash[:alert] %></p>
     <% end %>
 
       <%= form_for(resource, as: resource_name, url: session_path(resource_name), :html => { class: 'form-horizontal' }) do |f| %>

data/app/views/roroacms/admin/dashboard/index.html.erb

@@ -3,8 +3,12 @@
       <div class="col-md-4 col-sm-6">
           <div class="dashboard-tile detail tile-turquoise">
               <div class="content">
-                  <h1 class="text-left timer"><%= get_count_post('page') %></h1>
-                  <p><%= t("generic.pages") %></p>
+                  <h1 class="text-left timer"><%= @counts[:page] %></h1>
+                  <% if @counts[:page] > 1 %>
+                    <p><%= t("generic.pages") %></p>
+                  <% else %>
+                    <p><%= t("generic.page") %></p>
+                  <% end %>
               </div>
               <div class="icon"><i class="fa fa-files-o"></i>
               </div>
@@ -13,8 +17,12 @@
       <div class="col-md-4 col-sm-6">
           <div class="dashboard-tile detail tile-turquoise">
               <div class="content">
-                  <h1 class="text-left timer"><%= get_count_post('post') %></h1>
-                  <p><%= t("generic.articles") %></p>
+                  <h1 class="text-left timer"><%= @counts[:post] %></h1>
+                  <% if @counts[:post] > 1 %>
+                    <p><%= t("generic.articles") %></p>
+                  <% else %>
+                    <p><%= t("generic.article") %></p>
+                  <% end %>
               </div>
               <div class="icon"><i class="fa fa-file-text-o"></i>
               </div>
@@ -23,8 +31,12 @@
       <div class="col-md-4 col-sm-6">
           <div class="dashboard-tile detail tile-turquoise">
               <div class="content">
-                  <h1 class="text-left timer"><%= @comments.size %></h1>
-                  <p><%= t("generic.unseen_comments") %></p>
+                  <h1 class="text-left timer"><%= @counts[:comments] %></h1>
+                  <% if @counts[:comments] == 1 %>
+                    <p><%= t("generic.unseen_comment") %></p>
+                  <% else %>
+                    <p><%= t("generic.unseen_comments") %></p>
+                  <% end %>
               </div>
               <div class="icon"><i class="fa fa fa-comments"></i>
               </div>

data/app/views/roroacms/admin/partials/_content_form.html.erb

@@ -93,6 +93,9 @@
               <%= f.label :post_visible, :class => "col-sm-3 control-label"  %>
               <div class="col-sm-6">
                 <%= f.check_box :post_visible, {}, 'N', 'Y'  %>
+                <a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t('views.admin.generic.invisible_url', type: @post_type) %>" data-container="body" data-placement="top">
+                  <i class="fa fa-question-circle" ></i>
+                </a>
               </div>
               <div class="clearfix"></div>
             </div>
@@ -222,7 +225,9 @@
             <%= f.label :post_seo_is_disabled, :class => "col-sm-3 control-label"  %>
             <div class="col-sm-6">
               <%= f.check_box :post_seo_is_disabled, {}, 'Y', 'N'  %>
-              <small><%= t("views.admin.pages.new.tab_content.seo.seo_disabled_content") %></small>
+              <a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_disabled_content") %>" data-container="body" data-placement="top">
+                  <i class="fa fa-question-circle" ></i>
+              </a>
             </div>
             <div class="clearfix"></div>
           </div>
@@ -231,7 +236,9 @@
             <%= f.label :post_seo_no_index, :class => "col-sm-3 control-label"  %>
             <div class="col-sm-6">
               <%= f.check_box :post_seo_no_index, {}, 'Y', 'N'  %>
-              <small><%= t("views.admin.pages.new.tab_content.seo.seo_no_index_content") %></small>
+              <a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_no_index_content") %>" data-container="body" data-placement="top">
+                  <i class="fa fa-question-circle" ></i>
+              </a>
             </div>
             <div class="clearfix"></div>
           </div>
@@ -240,7 +247,9 @@
             <%= f.label :post_seo_no_follow, :class => "col-sm-3 control-label"  %>
             <div class="col-sm-6">
               <%= f.check_box :post_seo_no_follow, {}, 'Y', 'N'  %>
-              <small><%= t("views.admin.pages.new.tab_content.seo.seo_no_follow_content") %></small>
+              <a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_no_follow_content") %>" data-container="body" data-placement="top">
+                  <i class="fa fa-question-circle" ></i>
+              </a>
             </div>
             <div class="clearfix"></div>
           </div>

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

@@ -2,7 +2,7 @@
 
   <div class="col-md-12">
 
-    <%= form_tag(admin_settings_path, :html => { class: 'form-horizontal' }) do %>
+    <%= form_tag(admin_settings_path, class: 'form-horizontal') do %>
 
     <%= hidden_field_tag 'redirect', 'general' %>
 

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
   generic: 
     comments: "Comments"
     unseen_comments: "Unseen Comments"
+    unseen_comment: "Unseen Comment"
     home: "Home"
     admin: "Admin"
     dashboard: "Dashboard"
@@ -251,6 +252,7 @@ en:
       truncate: "..."
     admin:
       generic:
+        invisible_url: "By checking the tick box it will remove access to the page via the url but still allow you to retrieve the %{type} data through theming methods"
         save: "Save"
         save_and_continue: "Save & Continue"
         save_and_complete: "Save & Complete"
@@ -368,9 +370,9 @@ en:
             seo:
               seo_title_content: "* The contents of this tag are generally shown as the title in search results (and of course in the user's browser)"
               seo_description_content: "* This tag provides a short description of the page. In some situations this description is used as a part of the snippet shown in the search results"
-              seo_disabled_content: "* if you want to leave meta blank"
-              seo_no_index_content: "* prevents the page from being indexed by search engines"
-              seo_no_follow_content: "* prevents the Googlebot from following links from this page"
+              seo_disabled_content: "If you want to leave meta blank"
+              seo_no_index_content: "Prevents the page from being indexed by search engines"
+              seo_no_follow_content: "Prevents the Googlebot from following links from this page"
             categories:
               no_categories: "No categories"
               no_tags: "No tags"

data/lib/roroacms/engine.rb

@@ -62,7 +62,7 @@ module Roroacms
         Rails.application.config.assets.precompile += %w( roroacms/roroacms.js )  if File.exists?("#{Dir.pwd}/app/assets/javascripts/roroacms/roroacms.js")
         Rails.application.config.assets.precompile += %w( roroacms/roroacms.css ) if File.exists?("#{Dir.pwd}/app/assets/stylesheets/roroacms/roroacms.css")
         Rails.application.config.assets.precompile += ["theme.css", "theme.js", "theme.scss", "theme.coffee"]
-        Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg)
+        Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg, *.ico)
                 
     end
 

data/lib/roroacms/version.rb

@@ -1,3 +1,3 @@
 module Roroacms
-  VERSION = "0.0.8.6.6"
+  VERSION = "0.0.8.6.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roroacms
 version: !ruby/object:Gem::Version
-  version: 0.0.8.6.6
+  version: 0.0.8.6.7
 platform: ruby
 authors:
 - Simon Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails