roroacms 0.0.6.7 → 0.0.6.8

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

@@ -91,5 +91,5 @@ $(document).ready(function() {
   $("#tableFilter").keyup(function() {
     dTable.fnFilter($(this).val());
   });
-  $('.tooltipState:not(.active)').tooltip({delay: {show:1000, hide:100}});
+  $('.tooltipState').tooltip({delay: {show:500, hide:100}});
 });

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

@@ -44,4 +44,5 @@ $(document).ready(function(){
 
   }
 
-});
+});
+

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

@@ -3525,6 +3525,16 @@ input, textarea, select, input[type=submit] {
   -webkit-appearance: none;
 }
 
+.modal-content {
+    border: 1px solid #ffffff;
+    box-shadow: none;
+}
+
+small.mic-info {
+  display: block;
+  padding:10px 0px;
+}
+
 
 @media only screen and (max-width: 767px) and (min-width: 480px) {
   #main-content .h1 {

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

@@ -124,12 +124,12 @@ module Roroacms
     end
 
 
-    # Delete the admin, one thing to remember is you are not allowed to destory the super user.
-    # You are only allowed to destroy yourself unless you are the super user.
+    # Delete the admin, one thing to remember is you are not allowed to destory the overlord.
+    # You are only allowed to destroy yourself unless you are the overlord.
 
     def destroy
       @admin = Admin.find(params[:id])
-      @admin.destroy
+      @admin.destroy if @admin.overlord == 'N'
 
       respond_to do |format|
         format.html { redirect_to admin_administrators_path, notice: I18n.t("controllers.admin.administrators.destroy.flash.success") }

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

@@ -65,7 +65,7 @@ module Roroacms
     # saves the menu on the fly via ajax. This usually gets called if there is any change to the menu object
 
     def save_menu
-      if MenuOption.save_menu_on_fly params
+      if MenuOption.save_menu_on_fly(params)
         render :inline => 'done'
       end
     end

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

@@ -42,6 +42,7 @@ module Roroacms
 
     end
 
+    # creates a user group via an ajax call and returns the HTML for that user group
 
     def create_user_group
       @key = params[:key]

data/app/controllers/roroacms/application_controller.rb

@@ -52,7 +52,7 @@ module Roroacms
 
     def current_user
       if !session["warden.user.admin.key"].blank?
-        @current_admin ||= Admin.find(session["warden.user.admin.key"][0][0])
+        @current_admin ||= Admin.find_by_id(session["warden.user.admin.key"][0][0])
       else
         nil
       end
@@ -137,7 +137,7 @@ module Roroacms
         redirect_to :back, flash: { error: I18n.t('generic.demo_notification') } and return 
       end
 
-      render :inline => 'demo' and return if params[:action] == 'save_menu'
+      render :inline => 'demo' and return if params[:action] == 'save_menu' && !current_user.blank? && current_user.username.downcase == 'demo' && Setting.get('demonstration_mode') == 'Y'
 
     end
 

data/app/helpers/roroacms/admin_roroa_helper.rb

@@ -201,36 +201,7 @@ module Roroacms
     # +dir+:: the directory that you want to list the controllers for
 
     def list_controllers(dir = 'admin')
-      hash = {}
-      controllers = list_controllers_raw(dir)
-
-      controllers.each do |f|
-
-        key = f.sub("#{Roroacms::Engine.root}/app/controllers/roroacms/admin/", '')
-        value = key.sub('_controller.rb', '')
-
-        next if value == 'dashboard'
-
-        v =
-          case value
-          when 'settings/general'
-            'Settings'
-          when 'terms'
-            'Categories & Tags'
-          when 'posts'
-            'Articles'
-          when 'administrators'
-            'Users'
-          else
-            value
-          end
-
-        hash[ucwords(v)] = key.sub('_controller.rb', '')
-
-      end
-
-      hash.sort
-
+      Setting.list_controllers(dir)
     end
 
     # get user group data and return the value for the given key

data/app/helpers/roroacms/general_helper.rb

@@ -73,18 +73,6 @@ module Roroacms
       change ? hash : nil
     end
 
-    # list controllers in given directory
-    # Params:
-    # +dir+:: directory that you want to list all of the controllers from
-
-    def list_controllers_raw(dir = "")
-      dir = dir + "/**/" if !dir.blank?
-      controller_list = Array.new
-      Dir["#{Roroacms::Engine.root}/app/controllers**/roroacms/#{dir}*.rb"].each do |file|
-        controller_list.push(file.split('/').last.sub!("_controller.rb",""))
-      end
-    end
-
     # capitalizes all words in a string
     # Params:
     # +str+:: the string
@@ -114,15 +102,8 @@ module Roroacms
 
     def strip_url(url)
 
-      return url if url.blank?
-
-      url.sub!(/www./, '')        if url.include? "www."
+      Setting.strip_url(url)
       
-      url.sub!(/https\:\/\//, '') if url.include? "https://"
-
-      url.sub!(/http\:\/\//, '')  if url.include? "http://"
-
-      return url
     end
 
     # reutrns a nested menu

data/app/helpers/roroacms/routing_helper.rb

@@ -146,7 +146,7 @@ module Roroacms
       if !current_user.blank? && !params[:admin_preview].blank? && params[:admin_preview] == 'true'
         @content = Post.where("post_type = 'page' AND post_visible = 'Y' AND (post_status = 'Published' OR post_status = 'Draft')").find_by_structured_url("/#{url}")
       else
-        @content = Post.where(status, :post_type => 'page', :post_status => 'Published', :post_visible => 'Y').find_by_structured_url("/#{url}")
+        @content = Post.where(status + " AND post_type = 'page' AND post_visible = 'Y'").find_by_structured_url("/#{url}")
       end
 
       # add a breadcrumb for each of its parents by running through each segment
@@ -242,7 +242,7 @@ module Roroacms
       if !current_user.blank? && !params[:admin_preview].blank? && params[:admin_preview] == 'true'
         @content = Post.where("post_type = 'post' AND post_visible = 'Y' AND (post_status = 'Published' OR post_status = 'Draft')").find_by_post_slug(segments[1])
       else
-        @content = Post.where(status, :post_type => 'post', :disabled => 'N', :post_visible => 'Y').find_by_post_slug(segments[1])
+        @content = Post.where(status + " AND post_type = 'post' AND post_visible = 'Y'").find_by_post_slug(segments[1])
       end
 
       render_404 and return if @content.nil?

data/app/helpers/roroacms/seo_helper.rb

@@ -10,6 +10,8 @@ module Roroacms
 
     def get_meta_headers
 
+      headtags = ''
+
       # decide wether it is a page or it is a template displying other content i.e. the category page
 
       if !@content.nil?
@@ -25,11 +27,13 @@ module Roroacms
             headtags = get_manual_metadata 'home'
           else
             # use the page content to generate the meta data
-            headtags = "#{get_page_title}\n"
-            headtags += "#{get_meta_description}\n"
-            headtags += "#{get_google_analytics}\n"
-            headtags += "#{get_robots_tag}"
-            headtags += "#{canonical_urls}"
+            if @content.post_seo_is_disabled != 'Y'
+              headtags = "#{get_page_title}\n"
+              headtags += "#{get_meta_description}\n"
+              headtags += "#{get_google_analytics}\n"
+              headtags += "#{get_robots_tag}"
+              headtags += "#{canonical_urls}"
+            end
           end
 
           render :inline => headtags

data/app/helpers/roroacms/view_helper.rb

@@ -8,8 +8,7 @@ module Roroacms
     def site_url(str = nil)
       url = Setting.get('site_url')
       str = str[1..-1] if !str.blank? && str[0,1] == '/'
-      url = url + '/' if !url.blank? && url[-1, 1] != '/'
-      "#{Setting.get('url_prefix')}#{strip_url(url)}#{str}"
+      "#{Setting.get('url_prefix')}#{strip_url(url)}/#{str}"
     end
 
     # GENERIC Functions #

data/app/models/roroacms/admin.rb

@@ -73,7 +73,6 @@ module Roroacms
 
     def deal_with_abnormalaties
       self.overlord = 'N'
-      self.avatar = site_url('assets/roroacms/default-profile.jpg')
     end
 
     # checks if the cover image is blank and sets the cover image to blank if this is the case

data/app/models/roroacms/setting.rb

@@ -1,6 +1,9 @@
 module Roroacms   
   class Setting < ActiveRecord::Base
 
+    include GeneralHelper
+    include AdminRoroaHelper
+
     after_save :after_reload_settings
 
     # get a certain settings value
@@ -9,8 +12,8 @@ module Roroacms
 
     def self.get(setting_name)
       @reference ||= filter_settings
+      ret = @reference[setting_name]
       ret = @reference[setting_name].gsub("\\", '') if setting_name == 'user_groups'
-      ret =  @reference[setting_name]
       ret
     end
 
@@ -67,8 +70,10 @@ module Roroacms
     # +params+:: the parameters
 
     def self.save_data(params)
+
       params.each do |key, value|
-        value = ActiveSupport::JSON.encode(value) if key == 'user_groups'
+        value = ActiveSupport::JSON.encode(user_group_check(value)) if key == 'user_groups'
+        value = Setting.strip_url(value) if key == 'site_url'
         value = value.gsub(/[^0-9]/i, '') if key == 'pagination_per_fe'
         set = Setting.where("setting_name = ?", key).update_all('setting' => value)
       end
@@ -77,6 +82,16 @@ module Roroacms
 
     end
 
+    def self.user_group_check(hash)
+      h = []
+      Setting.list_controllers.each do |k,v|
+        h << v
+      end
+      hash['admin'] = h
+      hash.keys.sort
+      return hash
+    end
+
 
     # reload the settings instance variable - this is used on the settings update function
 
@@ -88,6 +103,66 @@ module Roroacms
        @reference = Setting.filter_settings
     end
 
+    def self.list_controllers(dir = 'admin')
+      hash = {}
+      controllers = Setting.list_controllers_raw(dir)
+
+      controllers.each do |f|
+
+        key = f.sub("#{Roroacms::Engine.root}/app/controllers/roroacms/admin/", '')
+        value = key.sub('_controller.rb', '')
+
+        next if value == 'dashboard'
+
+        v =
+          case value
+          when 'settings/general'
+            'Settings'
+          when 'terms'
+            'Categories & Tags'
+          when 'posts'
+            'Articles'
+          when 'administrators'
+            'Users'
+          else
+            value
+          end
+        v = v.split(' ').select {|w| w.capitalize! || w }.join(' ')
+        hash[v] = key.sub('_controller.rb', '')
+
+      end
+
+      hash.sort
+    end
+
+
+    # list controllers in given directory
+    # Params:
+    # +dir+:: directory that you want to list all of the controllers from
+
+    def self.list_controllers_raw(dir = "")
+      dir = dir + "/**/" if !dir.blank?
+      controller_list = Array.new
+      Dir["#{Roroacms::Engine.root}/app/controllers**/roroacms/#{dir}*.rb"].each do |file|
+        controller_list.push(file.split('/').last.sub!("_controller.rb",""))
+      end
+    end
+
+
+    def self.strip_url(url)
+      return url if url.blank?
+
+      url.sub!(/www./, '')        if url.include? "www."
+      
+      url.sub!(/https\:\/\//, '') if url.include? "https://"
+
+      url.sub!(/http\:\/\//, '')  if url.include? "http://"
+
+      url = url[0...-1] if url[-1, 1] == '/'
+
+      return url
+    end
+
 
     # build and return a hash of the SMTP settings via the settings in the admin panel.
     # this stops you having to change the settings in the config file and having to reload the application.

data/app/views/roroacms/admin/administrators/_form.html.erb

@@ -3,14 +3,14 @@
   <div class="panel-body">
     <div  class="tab-wrapper tab-left ">
       <ul class="nav nav-tabs">
-        <li class="active">
+        <li class="active tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("generic.profile") %>">
           <a href="#general" data-toggle="tab">
             <i class="fa fa-user"></i>
           </a>
         </li>
       </ul>
       <div class="tab-content">
-        <%= render :partial => 'roroacms/admin/partials/submit_bar' %>
+        <%= render :partial => 'roroacms/admin/partials/submit_bar', :locals => { admin_record: @admin }  %>
         <div class="tab-pane active" id="general">
 
           <% if !@admin.id.blank? %>
@@ -18,7 +18,11 @@
             <div class="well well-background" style="background-image: url('<%= @admin.cover_picture %>');">
               <center>
                 <div class="imr-wrapper">
-                  <img src="<%= @admin.avatar %>" name="aboutme" width="140" height="140" class="img-circle">
+                  <% if @admin.avatar.blank? %>
+                    <%= image_tag("roroacms/default-profile.jpg", size: "140", class: "img-circle") %>
+                  <% else %>
+                    <img src="<%= @admin.avatar %>" name="aboutme" width="140" height="140" class="img-circle">
+                  <% end %>
                   <span></span>
                 </div>
                 <h3><%= @admin.username %></h3>
@@ -86,8 +90,7 @@
             <div class="clearfix"></div>
           </div>
 
-
-          <% if is_overlord? || @admin.id == nil %>
+          <% if (is_overlord? || @admin.id == nil)  && @admin.id != current_user.id %>
 
             <div class="form-group">
               <%= f.label :access_level, :class => "col-sm-3 control-label"  %>

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

@@ -23,7 +23,11 @@
             <% @admins.each do |admin| %>
             <tr class="<%= cycle('list_line_odd', 'list_line_even') %>">
               <td>
-                <img src="<%= admin.avatar %>" class="img-circle hidden-xs" width="35" height="35">&nbsp;
+                <% if admin.avatar.blank? %>
+                  <%= image_tag 'roroacms/default-profile.jpg', height: '35', width: '35', class: "img-circle hidden-xs" %>
+                <% else %>
+                  <img src="<%= admin.avatar %>" class="img-circle hidden-xs" width="35" height="35">&nbsp;
+                <% end %>
               </td>
               <td>
                 <%= admin.username %>
@@ -35,8 +39,10 @@
                     <%= link_to edit_admin_administrator_path(admin), :class => 'btn btn-default btn-xs' do %>
                       <i class="fa fa-pencil"></i>
                     <% end %> 
-                    <%= link_to admin_administrator_path(admin), method: :delete, data: { confirm: t("views.admin.generic.confirm") }, :class => 'btn btn-danger btn-xs' do %>
-                      <i class="fa fa-trash-o"></i>
+                    <% if admin.overlord != 'Y' %>
+                      <%= link_to admin_administrator_path(admin), method: :delete, data: { confirm: t("views.admin.generic.confirm") }, :class => 'btn btn-danger btn-xs' do %>
+                        <i class="fa fa-trash-o"></i>
+                      <% end %>
                     <% end %>
                   </div>
                 <% end %>

data/app/views/roroacms/admin/comments/_form.html.erb

@@ -1,9 +1,13 @@
 <%= form_for [:admin, @comment] do |f| %>
-<div class="panel panel-default">
+<div class="panel panel-default" id="collapsed_tabs">
   <div class="panel-body">
     <div class="tab-wrapper tab-left ">
       <ul class="nav nav-tabs">
-        <li class="active"><a href="#general" data-toggle="tab"><i class="fa fa-comment"></i> <%= t("views.admin.generic.comment") %></a></li>
+        <li class="active tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.comment") %>">
+          <a href="#general" data-toggle="tab">
+            <i class="fa fa-comment"></i> 
+          </a>
+        </li>
       </ul>
       <div class="tab-content">
         <%= render :partial => 'roroacms/admin/partials/submit_bar' %>

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

@@ -8,6 +8,7 @@
         </div>
       </div>
       <div class="panel-body">
+        <%= render partial: 'roroacms/admin/partials/table_header' %>
         <%= form_tag bulk_update_admin_comments_path do %>
           <table id="dtable" class="table table-hover" cellspacing="0" width="100%">
             <thead>
@@ -50,10 +51,7 @@
                   <div class="btn-group pull-right">
                     <%= link_to edit_admin_comment_path(comment), :class => 'btn btn-xs btn-default' do %>
                       <i class="fa fa-pencil"></i>
-                    <% end %>
-                     <%= link_to mark_as_spam_admin_comment_path(comment), :class => 'btn btn-xs btn-default' do %>
-                      <i class="fa fa-fire"></i>
-                    <% end %>              
+                    <% end %>         
                     <%= link_to admin_comment_path(comment), method: :delete, data: { confirm: t("views.admin.generic.confirm") }, :class => 'btn btn-xs btn-danger' do %>
                       <i class="fa fa-trash-o"></i>
                     <% end %>
@@ -72,6 +70,7 @@
                                         'mark_as_spam' => t("views.admin.generic.bulk_update_options.mark_as_spam"), 
                                         'destroy' => t("views.admin.generic.bulk_update_options.destroy")
                                         ] %>
+            <div id="paginationWrapper"></div>
           </div>
         <% end %>
       </div>

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

@@ -53,9 +53,6 @@
         </tbody>
     </table>
       </div>
-      <div class="modal-footer">
-        <p class="pull-left"><%= t("views.admin.partials.markdown_modal.content") %> <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank"><%= t("views.admin.generic.here") %></a>.</p>
-      </div>
     </div>
   </div>
 </div>

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

@@ -15,6 +15,13 @@
                   <i class="fa fa-search"></i>&nbsp;<%= t("views.admin.generic.view") %>
               <% end %>  
           <% end %>
+          <% if defined?(admin_record) && !admin_record.id.blank? %>
+              <% if admin_record.overlord != "Y" %>
+                <%= link_to admin_administrator_path(admin_record), method: :delete, data: { confirm: t("views.admin.generic.confirm") }, :class => 'btn btn-sm btn-danger pull-left' do %>
+                    <i class="fa fa-trash-o"></i>&nbsp;<%= t("views.admin.generic.delete") %>
+                <% end %>
+              <% end %> 
+          <% end %>
           <button type="submit" class="btn btn-primary btn-sm pull-right"><i class="fa fa-check"></i>&nbsp;<%= t("views.admin.generic.save") %></button>
       <% else %>
           &nbsp;

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

@@ -18,6 +18,6 @@
 
 <% if !@sub.blank? %>
 
-  <%= nested_table(@sub, 'admin/partials/term_table_row') %>
+  <%= nested_table(@sub, 'roroacms/admin/partials/term_table_row') %>
 
 <% end %>

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

@@ -263,10 +263,10 @@
                 <div class="col-sm-6">
                   <div class="">
                     <label class="radio-inline">
-                      <%= radio_button_tag(:article_comment_type, "R", @settings['article_comment_type'] == 'R' ? true : false) %> <%= t("views.admin.settings.tab_content.system_comments") %>
+                      <%= radio_button_tag(:article_comment_type, "R", @settings['article_comment_type'] == 'R' && @settings['article_comments'] == 'Y' ? true : false) %> <%= t("views.admin.settings.tab_content.system_comments") %>
                     </label>
                     <label class="radio-inline">
-                      <%= radio_button_tag(:article_comment_type, "F", @settings['article_comment_type'] == 'F' ? true : false) %> <%= t("views.admin.settings.tab_content.facebook_comments") %>
+                      <%= radio_button_tag(:article_comment_type, "F", @settings['article_comment_type'] == 'F' && @settings['article_comments'] == 'Y' ? true : false) %> <%= t("views.admin.settings.tab_content.facebook_comments") %>
                     </label>
                   </div>
                 </div>

data/config/locales/en.yml

@@ -471,7 +471,7 @@ en:
           aws_access_key_id: "AWS S3 - Access Key ID"
           aws_secret_access_key: "AWS S3 - Secret Access Key ID"
           aws_bucket_name: "AWS S3 - Bucket name"
-          aws_folder: "AWS S3 - folder name"
+          aws_folder: "AWS S3 - prefixed folder structure"
           url_prefix: "URL prefix"
       terms:
         table:

data/lib/roroacms/engine.rb

@@ -46,6 +46,8 @@ module Roroacms
       ApplicationController.helper(ActionView::Helpers::ThemeHelper) if File.exists?("#{Rails.root}/app/helpers/theme_helper.rb")
     end
     
+    require "#{Roroacms::Engine.root}/app/helpers/roroacms/general_helper.rb"
+    require "#{Roroacms::Engine.root}/app/helpers/roroacms/admin_roroa_helper.rb"
     require "#{Roroacms::Engine.root}/app/models/roroacms/setting.rb"
 
     initializer :assets do |config|
@@ -61,6 +63,7 @@ module Roroacms
         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 += ["#{Dir.pwd}/app/views/themes/#{Setting.get('theme_folder')}/assets/*"]
+        Rails.application.config.assets.precompile += %w( roroacms/default-profile.jpg )
         
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roroacms
 version: !ruby/object:Gem::Version
-  version: 0.0.6.7
+  version: 0.0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails