roroacms 0.0.4 → 0.0.5

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

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

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

@@ -9,7 +9,13 @@ $(document).ready(function() {
       url: $('.js-settings').attr('data-site-url') + "admin/menus/save_menu",
       data: data,
       dataType: "html",
-      success: function(data) {}
+      success: function(data) {
+        if(data == 'demo'){
+          do_demo_alert();
+        } else {
+          do_alert();
+        }
+      }
     });
   };
   do_alert = function() {
@@ -18,6 +24,13 @@ $(document).ready(function() {
       scrollTop: $("#header").offset().top
     }, "slow");
   };
+
+  do_demo_alert = function(){
+    $("#main-content .row > .col-md-12 .alert-wrapper").html("<div class=\"alert alert-danger\"><button data-dismiss=\"alert\" class=\"close\" type=\"button\">x</button><strong>Error!</strong> You are working in demo mode so no CRUD functions will be undertaken</div>");
+    $("html,body").animate({
+      scrollTop: $("#header").offset().top
+    }, "slow");
+  }
   build_under_form = function(data, selector) {
     $.ajax({
       type: "POST",
@@ -43,7 +56,6 @@ $(document).ready(function() {
   });
   $(".update-menu").bind("click", function(e) {
     do_update_function();
-    do_alert();
   });
   $("ol.sortable").on("click", "i.handler", function() {
     var container;

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

@@ -51,7 +51,7 @@ $(document).ready(function() {
   $("body").on("click", ".addAdditionalDataInput", function() {
     $.ajax({
       type: "POST",
-      url: settings.attr('data-site-url') + "admin/articles/create_additional_data",
+      url: $('.js-settings').attr('data-site-url') + "admin/articles/create_additional_data",
       data: "key=" + $("#addAdditionalDataInput").val(),
       dataType: "html",
       success: function(data) {

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

@@ -9,7 +9,7 @@ $(document).ready(function() {
   $("body").on("click", ".addGroupInput", function() {
     $.ajax({
       type: "POST",
-      url: settings.attr('data-site-url') + "admin/settings/create_user_group",
+      url: $('.js-settings').attr('data-site-url') + "admin/settings/create_user_group",
       data: "key=" + $("#addGroupInput").val(),
       dataType: "html",
       success: function(data) {

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

@@ -37,7 +37,7 @@ app = (function() {
         $(".sidebar").addClass("sidebar-toggle");
         $(".main-content-wrapper").addClass("main-content-toggle-left");
       }
-      $(".sidebar-right").toggleClass("sidebar-toggle-right animated bounceInRight");
+      $(".sidebar-right").toggleClass("sidebar-toggle-right bounceInRight");
       $(".main-content-wrapper").toggleClass("main-content-toggle-right");
       if ($(window).width() < 660) {
         $(".sidebar").removeClass("sidebar-toggle");

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

@@ -1719,6 +1719,10 @@ fieldset[disabled] .btn-warning.active {
   font-size: 1em;
   margin: 0 3px;
 }
+
+.panel .actions i.fa-chevron-down {
+  display: none;
+}
 .panel .actions i:hover {
   cursor: pointer;
 }
@@ -2719,8 +2723,8 @@ h3.timeline-title {
   margin-bottom: 10px;
 }
 .radio-inline:first-child {
-  margin-left: 0px;
-  padding-left: 0px;
+/*  margin-left: 0px;
+  padding-left: 0px;*/
 }
 select.form-control {
   margin-bottom: 10px;
@@ -2823,7 +2827,7 @@ ol.sortable .item-information {
 .well small {
   color: #5D5F63;
 }
-.floating-header {
+.floatingheader {
   -moz-box-sizing: border-box;
   background-color: rgba(0, 0, 0, 0) !important;
   background-image: linear-gradient(to bottom, #ffffff 0%, #ffffff 25%, rgba(255, 255, 255, 0.9) 100%) !important;
@@ -2836,7 +2840,7 @@ ol.sortable .item-information {
   top: 0;
   z-index: 400;
 }
-.floating-header i {
+.floatingheader i {
   margin-top: 5px;
 }
 .features .editor .CodeMirror pre {
@@ -3506,13 +3510,29 @@ ul.theme-issues li i.fa-check {
   border-radius:0px;
 }
 
+.tooltip-inner {
+background-color: #EEEEEE;
+color:#5D5F63;
+opacity: 1;
+}
+
+.tooltip.right .tooltip-arrow {
+border-right: 5px solid #EEEEEE;
+
+}
+
+input, textarea, select, input[type=submit] {
+  -webkit-appearance: none;
+}
+
+
 @media only screen and (max-width: 767px) and (min-width: 480px) {
   #main-content .h1 {
     font-size: 35px;
   }
 }
 @media (max-width: 767px) {
-  #D7DCDE ul.timeline:before {
+  ul.timeline:before {
     left: 40px;
   }
   ul.timeline > li > .timeline-badge {
@@ -3538,6 +3558,15 @@ ul.theme-issues li i.fa-check {
   .shrink {
     display: none;
   }
+
+  .floatingheader > a, .floatingheader .entry-word-count {
+    display: none;
+  }
+
+  .radio-inline, .checkbox-inline {
+    display: block;
+    padding:0px;
+  }
 }
 @media only screen and (max-width: 960px) {
   strong {
@@ -3553,6 +3582,9 @@ ul.theme-issues li i.fa-check {
     margin-left: 0px;
     width: 100%;
   }
+  .panel .actions i.fa-chevron-down {
+    display: none;
+  }
 }
 @media only screen and (max-width: 767px) {
   strong {

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

@@ -301,11 +301,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
 }
 }
 .features .editor .editorwrap {
-	max-width: 100%;
+	max-width: 1180px;
 	padding: 40px 0;
 	margin: 0 auto;
 	position: relative;
-	height: 450px
+	height: 700px
 }
 @media (max-width: 860px), (max-width: 860px) {
 .features .editor .editorwrap {
@@ -386,8 +386,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
 	box-shadow: rgba(0,0,0,0.1) 0 -2px 3px inset;
 	padding: 10px 0;
 }
-.entry-preview {
-	display: none !important;
+
+.editor {
+	position: relative; 
+	margin-top: 40px !important;
 }
 .features .editor .entry-markdown .floatingheader a, .features .editor .entry-preview .floatingheader a {
 	color: #fff
@@ -407,12 +409,16 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
 .features .editor .entry-markdown.active header, .features .editor .entry-preview.active header {
 	cursor: auto;
 	color: #aaa9a2;
+	color:#5d5f63;
 	background: #fff;
 	box-shadow: #edece4 0 1px 0 inset, #edece4 1px 0 0 inset, #edece4 -1px 0 0 inset
 }
 .features .editor .entry-markdown.active header a, .features .editor .entry-preview.active header a {
 	color: #aaa9a2
 }
+.features .editor .entry-markdown .floatingheader, .features .editor .entry-preview .floatingheader {
+	color: #aaa9a2;
+}
 }
 @media (max-width: 400px), (max-width: 400px) {
 .features .editor .entry-markdown .markdown-help, .features .editor .entry-markdown .entry-word-count, .features .editor .entry-preview .markdown-help, .features .editor .entry-preview .entry-word-count {
@@ -503,7 +509,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
 	padding: 65px 0 40px 0
 }
 @media (max-width: 860px), (max-width: 860px) {
-
+.features .editor .CodeMirror-lines {
+	padding: 25px 0 30px 0
+}
 }
 @media (max-width: 400px), (max-width: 400px) {
 .features .editor .CodeMirror-lines {

data/app/controllers/roroacms/application_controller.rb

@@ -6,6 +6,7 @@ module Roroacms
     before_filter :set_vars
     before_filter :check_setup
     before_filter :add_breadcrumb_fe
+    before_filter :authorize_demo, :except => [:index, :show, :edit, :new]
 
     protect_from_forgery
     helper Roroacms::PrepcontentHelper
@@ -97,7 +98,7 @@ module Roroacms
     # checks if the admin is logged in before anything else
 
     def authorize_admin
-      redirect_to admin_login_path, error: I18n.t("controllers.application.unauthorized") and return if current_user.nil?
+      redirect_to admin_login_path, flash: { error: I18n.t("controllers.application.unauthorized") } and return if current_user.nil?
     end
 
 
@@ -123,6 +124,15 @@ module Roroacms
       @breadcrumbs << hash
     end
 
+    def authorize_demo
+      if !request.xhr? && !request.get? && ( !current_user.blank? && current_user.username.downcase == 'demo' && Setting.get('demonstration_mode') == 'Y' )
+        redirect_to :back, flash: { error: I18n.t('generic.demo_notification') } and return 
+      end
+
+      render :inline => 'demo' and return if params[:action] == 'save_menu'
+
+    end
+
 
     # protected
 

data/app/helpers/roroacms/media_helper.rb

@@ -14,7 +14,7 @@ module Roroacms
     S3 = AWS::S3.new
 
     def upload_images(file, type, initial_folder = 'users')
-        path = "#{BUCKET}/" + initial_folder.to_s + "/" + type.to_s + "/" + file.original_filename
+        path = "#{BUCKET}/" + Setting.get("aws_folder") + "/" + initial_folder.to_s + "/" + type.to_s + "/" + file.original_filename
         begin
             obj = S3.buckets[BUCKET].objects["#{path}"].write(:file => file, :acl => :public_read)
             unauthenticated_url(obj)

data/app/helpers/roroacms/seo_helper.rb

@@ -105,13 +105,15 @@ module Roroacms
         # if seo description is not blank then use that
         if !@content.post_seo_description.blank?
           return "<meta name=\"description\" content=\"#{@content.post_seo_description}\" />\n<meta name=\"author\" content=\"#{Setting.get('seo_site_title')}\">"
-        else
-          # if worst comes to worst use the page title
+        elsif Setting.get('seo_autogenerate_descriptions') == 'Y'
+          # if worst comes to worst use the page content
           description = truncate(prep_content(@content), :length => 100, :separator => ' ').gsub(/\r?\n|\r/, "")
           return "<meta name=\"description\" content=\"#{strip_tags(description)}\" />\n<meta name=\"author\" content=\"#{Setting.get('seo_site_title')}\">"
         end
       end
 
+      return ''
+
     end
 
 

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

@@ -71,7 +71,6 @@
             </div>
             <div class="clearfix"></div>
           </div>
-
           <div class="form-group">
             <%= f.label :avatar, :class => "col-sm-3 control-label"  %>
             <div class="col-sm-6">

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

@@ -6,9 +6,17 @@
       <div class="panel-body">
         <div class="tab-wrapper tab-left ">
           <ul class="nav nav-tabs">
-            <li class="active"><a href="#new" data-toggle="tab"><i class="fa fa-plus"></i> <%= t("views.admin.menus.index.new_menu") %></a></li>
+            <li class="tooltipState active" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.menus.index.new_menu") %>">
+              <a href="#new" data-toggle="tab">
+                <i class="fa fa-plus"></i>
+              </a>
+            </li>
             <% @all_menus.each_with_index do |m, index| %>
-              <li><a href="#<%= m.key + '-' + index.to_s %>" data-toggle="tab"><i class="fa fa-list"></i> <%= m.name %></a></li>
+              <li class="tooltipState" data-toggle="tooltip" data-placement="right" title="<%= m.name %>">
+                <a href="#<%= m.key + '-' + index.to_s %>" data-toggle="tab">
+                  <i class="fa fa-list"></i> <%= m.name %>
+                </a>
+              </li>
             <% end %>
           </ul>
           <div class="tab-content">

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

@@ -1,18 +1,43 @@
 <%= form_for [:admin, @record], :url => { action: @action.to_sym } do |f| %>
 
   <div class="panel panel-default">
-    <div class="panel-body">
+    <div class="panel-body" id="collapsed_tabs">
       <div class="tab-wrapper tab-left ">
         <ul class="nav nav-tabs">
 
-          <li class="active"><a href="#general" data-toggle="tab"><i class="fa fa-cog"></i> <%= t("views.admin.generic.general") %></a></li>
-          <li><a class="contentReload" href="#content" data-toggle="tab"><i class="fa fa-desktop"></i> <%= t("views.admin.generic.content") %></a></li>
-          <li><a href="#revisions" data-toggle="tab"><i class="fa fa-history"></i> <%= t("views.admin.pages.new.tabs.history") %></a></li>
-          <li><a href="#seo" data-toggle="tab"><i class="fa fa-bar-chart-o"></i> <%= t("views.admin.generic.search_engine_optimisation") %></a></li>
+          <li class="active tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.general") %>">
+            <a href="#general" data-toggle="tab">
+              <i class="fa fa-cog"></i>
+            </a>
+          </li>
+          
+          <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.content") %>">
+            <a class="contentReload" href="#content" data-toggle="tab">
+              <i class="fa fa-desktop"></i>
+            </a>
+          </li>
+          <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.pages.new.tabs.history") %>">
+            <a href="#revisions" data-toggle="tab">
+              <i class="fa fa-history"></i> 
+            </a>
+          </li>
+          <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.search_engine_optimisation") %>">
+            <a href="#seo" data-toggle="tab">
+              <i class="fa fa-bar-chart-o"></i> 
+            </a>
+          </li>
           <% if @post_type == 'post' %>
-            <li><a href="#categories" data-toggle="tab"><i class="fa fa-sitemap"></i> <%= t("views.admin.pages.new.tabs.tags_and_categories") %></a></li>
+            <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.pages.new.tabs.tags_and_categories") %>">
+              <a href="#categories" data-toggle="tab">
+                <i class="fa fa-sitemap"></i> 
+              </a>
+            </li>
           <% end %>
-          <li><a href="#additional" data-toggle="tab"><i class="fa fa-paperclip"></i> <%= t("views.admin.pages.new.tabs.additional") %></a></li>
+          <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.pages.new.tabs.additional") %>">
+            <a href="#additional" data-toggle="tab">
+              <i class="fa fa-paperclip"></i> 
+            </a>
+          </li>
 
         </ul>
         <div class="tab-content">
@@ -136,22 +161,24 @@
 
         </div>
         <div class="tab-pane" id="content">
-<!-- 
-          <%= f.text_area :post_content, :class => 'editor', :value => @record.post_content.blank? ? '' : @record.post_content %>
-           -->
 
-          <div class="features">
+            <div class="features">
+    
               <section class="editor">
                 <div class="outer">
                   <div class="editorwrap">
                     <section class="entry-markdown">
-                      <header class="floating-header"><%= t("views.admin.pages.new.tab_content.markdown") %> <a href="javascript:;" data-toggle="modal" data-target="#mdModal"><i class="fa fa-info-circle pull-right"></i></a></header>
+                      <header class="floatingheader">
+                        &nbsp;&nbsp; <%= t("views.admin.pages.new.tab_content.markdown") %> <a href="javascript:;" data-toggle="modal" data-target="#mdModal"><i class="fa fa-info-circle pull-right"></i></a>
+                      </header>
                       <section class="entry-markdown-content">
-                        <%= f.text_area :post_content, :class => 'markdown_editor', :value => @record.post_content.blank? ? '...' : @record.post_content %>
+           <%= f.text_area :post_content, :class => 'markdown_editor', :value => @record.post_content.blank? ? '...' : @record.post_content %>
                       </section>
                     </section>
                     <section class="entry-preview active">
-                      <header class="floating-header">&nbsp; <%= t("views.admin.generic.preview") %> <span class="entry-word-count">0 <%= t("views.admin.generic.words") %></span> </header>
+                      <header class="floatingheader">
+                        &nbsp;&nbsp; <%= t("views.admin.generic.preview") %> <span class="entry-word-count">0 <%= t("views.admin.generic.words") %></span>
+                      </header>
                       <section class="entry-preview-content">
                         <div class="rendered-markdown"></div>
                       </section>
@@ -159,6 +186,7 @@
                   </div>
                 </div>
               </section>
+              
             </div>
 
         </div>

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

@@ -1,6 +1,6 @@
 <% @revisions = Roroacms::Post.where(:ancestry => @record.id.to_s, :post_type => 'autosave').order('created_at desc') %>
 
-<% if @revisions.blank? || @record.id.blank? %>
+<% if @revisions.blank? || @record.id.blank? || @revisions.size <= 1 %>
 
   <div class="text-center top-margin-20">
     <strong class="text-center"><%= t("views.admin.partials.revision_tree.no_revisions") %></strong>
@@ -10,6 +10,7 @@
 
   <ul class="timeline-single">
 
+
       <%
       @revisions.each_with_index do |f, index| %>
 

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

@@ -1,11 +1,4 @@
 <div class="form-toolbar"> 
-    <% cache('admin_submit_bar_toggle') do %>
-      <div class="toggle-navigation toggle-left pull-left">
-        <button type="button" class="btn btn-default shrink">
-          <i class="fa fa-bars"></i>
-        </button>
-      </div>
-    <% end %>
     <div class="btn-group pull-right"> 
       <% if ! defined?(unbuttoned) %>
           <% if defined?(post_record) && !post_record.id.blank? %>

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-md-6">
     <% if defined?(path) %>
-      <%= link_to path, id: defined?(id) ? id : '', class: "pull-left btn btn-small btn-block btn-primary" do %>
+      <%= link_to path, id: defined?(id) ? id : '', class: "btn btn-small btn-block btn-primary" do %>
         <span class="fa fa-plus"></span>&nbsp;<%= name %>
       <% end %>
     <% else %>

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

@@ -10,12 +10,38 @@
       <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-cog"></i> <%= t("views.admin.generic.general") %></a></li>
-            <li><a href="#email" data-toggle="tab"><i class="fa fa-envelope-o"></i> <%= t("views.admin.settings.tabs.email_config") %></a></li>
-            <li><a href="#amazon" data-toggle="tab"><i class="fa fa-cloud-upload"></i> <%= t("views.admin.settings.tabs.aws") %></a></li>
-            <li><a href="#comment" data-toggle="tab"><i class="fa fa-comments"></i> <%= t("generic.comments") %></a></li>
-            <li><a href="#seo" data-toggle="tab"><i class="fa fa-bar-chart-o"></i> <%= t("views.admin.generic.search_engine_optimisation") %></a></li>
-            <li><a href="#user-groups" data-toggle="tab"><i class="fa fa-users"></i> <%= t("views.admin.settings.tabs.user_groups") %></a></li>
+            <li class="tooltipState active" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.general") %>">
+              <a href="#general" data-toggle="tab">
+                <i class="fa fa-cog"></i> 
+              </a>
+            </li>
+            <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.settings.tabs.email_config") %>">
+              <a href="#email" data-toggle="tab">
+                <i class="fa fa-envelope-o"></i> 
+              </a>
+            </li>
+            <% if current_user.username.downcase != 'demo' && Roroacms::Setting.get('demonstration_mode') == 'Y' %>
+              <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.settings.tabs.aws") %>">
+                <a href="#amazon" data-toggle="tab">
+                  <i class="fa fa-cloud-upload"></i> 
+                </a>
+              </li>
+            <% end %>
+            <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("generic.comments") %>">
+              <a href="#comment" data-toggle="tab">
+                <i class="fa fa-comments"></i> 
+              </a>
+            </li>
+            <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.generic.search_engine_optimisation") %>">
+              <a href="#seo" data-toggle="tab">
+                <i class="fa fa-bar-chart-o"></i> 
+              </a>
+            </li>
+            <li class="tooltipState" data-toggle="tooltip" data-placement="right" data-title="<%= t("views.admin.settings.tabs.user_groups") %>">
+              <a href="#user-groups" data-toggle="tab">
+                <i class="fa fa-users"></i> 
+              </a>
+            </li>
           </ul>
           <div class="tab-content">
             <%= render :partial => 'roroacms/admin/partials/submit_bar' %>
@@ -92,6 +118,14 @@
                 </div>
                 <div class="clearfix"></div>
               </div>
+              <div class="form-group">
+                <%= label_tag(:home_page, t("views.admin.settings.tab_content.home_page"), class: "col-sm-3 control-label") %>
+                <div class="col-sm-6">
+                  <%= select_tag :home_page, options_for_select(Roroacms::Post.where(:post_type => 'page').collect {|p| [ p.post_title, p.id ] }, @settings['home_page']), prompt: t("views.admin.generic.select_homepage"), class: 'form-control' %>
+                  
+                </div>
+                <div class="clearfix"></div>
+              </div>
               <div class="form-group">
                 <%= label_tag(:breadcrumb_seperator, t("views.admin.settings.tab_content.breadcrumb_seperator"), class: "col-sm-3 control-label") %>
                 <div class="col-sm-6">
@@ -101,11 +135,14 @@
                 <div class="clearfix"></div>
               </div>
               <div class="form-group">
-                <%= label_tag(:home_page, t("views.admin.settings.tab_content.home_page"), class: "col-sm-3 control-label") %>
+                <%= label_tag(:demonstration_mode, t("views.admin.settings.tab_content.demonstration_mode"), class: "col-sm-3 control-label") %>
                 <div class="col-sm-6">
-                  <%= select_tag :home_page, options_for_select(Roroacms::Post.where(:post_type => 'page').collect {|p| [ p.post_title, p.id ] }, @settings['home_page']), prompt: t("views.admin.generic.select_homepage"), class: 'form-control' %>
-                  
+                  <div class="">
+                      <%= hidden_field_tag :demonstration_mode, 'N' %>
+                      <%= check_box_tag :demonstration_mode, 'Y', @settings['demonstration_mode'] == 'Y' ? true : false %>
+                  </div>
                 </div>
+                <div class="clearfix"></div>
               </div>
             </div>
             <div class="tab-pane" id="email">
@@ -174,32 +211,42 @@
 
 
             </div>
-            <div class="tab-pane" id="amazon">
-              <div class="form-group">
-                <%= label_tag(:aws_access_key_id, t("views.admin.settings.tab_content.aws_access_key_id "), class: "col-sm-3 control-label") %>
-                <div class="col-sm-6">
-                  <%= text_field_tag(:aws_access_key_id, @settings['aws_access_key_id'], class: 'form-control') %>
-                  <%= setting_errors_for @settings, :aws_access_key_id %>
+            <% if current_user.username.downcase != 'demo' && Roroacms::Setting.get('demonstration_mode') == 'Y' %>
+              <div class="tab-pane" id="amazon">
+                <div class="form-group">
+                  <%= label_tag(:aws_access_key_id, t("views.admin.settings.tab_content.aws_access_key_id "), class: "col-sm-3 control-label") %>
+                  <div class="col-sm-6">
+                    <%= text_field_tag(:aws_access_key_id, @settings['aws_access_key_id'], class: 'form-control') %>
+                    <%= setting_errors_for @settings, :aws_access_key_id %>
+                  </div>
+                  <div class="clearfix"></div>
                 </div>
-                <div class="clearfix"></div>
-              </div>
-              <div class="form-group">
-                <%= label_tag(:aws_secret_access_key, t("views.admin.settings.tab_content.aws_secret_access_key"), class: "col-sm-3 control-label") %>
-                <div class="col-sm-6">
-                  <%= text_field_tag(:aws_secret_access_key, @settings['aws_secret_access_key'], class: 'form-control') %>
-                  <%= setting_errors_for @settings, :aws_secret_access_key %>
+                <div class="form-group">
+                  <%= label_tag(:aws_secret_access_key, t("views.admin.settings.tab_content.aws_secret_access_key"), class: "col-sm-3 control-label") %>
+                  <div class="col-sm-6">
+                    <%= text_field_tag(:aws_secret_access_key, @settings['aws_secret_access_key'], class: 'form-control') %>
+                    <%= setting_errors_for @settings, :aws_secret_access_key %>
+                  </div>
+                  <div class="clearfix"></div>
                 </div>
-                <div class="clearfix"></div>
-              </div>
-              <div class="form-group">
-                <%= label_tag(:aws_bucket_name, t("views.admin.settings.tab_content.aws_bucket_name"), class: "col-sm-3 control-label") %>
-                <div class="col-sm-6">
-                  <%= text_field_tag(:aws_bucket_name, @settings['aws_bucket_name'], class: 'form-control') %>
-                  <%= setting_errors_for @settings, :aws_bucket_name %>
+                <div class="form-group">
+                  <%= label_tag(:aws_bucket_name, t("views.admin.settings.tab_content.aws_bucket_name"), class: "col-sm-3 control-label") %>
+                  <div class="col-sm-6">
+                    <%= text_field_tag(:aws_bucket_name, @settings['aws_bucket_name'], class: 'form-control') %>
+                    <%= setting_errors_for @settings, :aws_bucket_name %>
+                  </div>
+                  <div class="clearfix"></div>
+                </div>
+                <div class="form-group">
+                  <%= label_tag(:aws_folder, t("views.admin.settings.tab_content.aws_folder"), class: "col-sm-3 control-label") %>
+                  <div class="col-sm-6">
+                    <%= text_field_tag(:aws_folder, @settings['aws_folder'], class: 'form-control') %>
+                    <%= setting_errors_for @settings, :aws_folder %>
+                  </div>
+                  <div class="clearfix"></div>
                 </div>
-                <div class="clearfix"></div>
               </div>
-            </div>
+            <% end %>
             <div class="tab-pane" id="comment">
               <div class="form-group">
                 <%= label_tag(:article_comments, t("views.admin.settings.tab_content.article_comments"), class: "col-sm-3 control-label") %>

data/app/views/roroacms/admin/terms/edit.html.erb

@@ -23,9 +23,6 @@
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3 class="panel-title">Articles in <%= @type.capitalize %></h3>
-          <div class="actions pull-right">
-            <i class="fa fa-chevron-down"></i>
-          </div>
         </div>
         <div class="panel-body no-padding">
           <ul class="list-group">

data/app/views/roroacms/setup/index.html.erb

@@ -89,6 +89,14 @@
                 </div>
                 <div class="clearfix"></div>
               </div>
+              <div class="form-group">
+                <%= label_tag(:aws_folder, t("views.admin.settings.tab_content.aws_folder"), class: "col-sm-3 control-label") %>
+                <div class="col-sm-6">
+                  <%= text_field_tag(:aws_folder, @settings['aws_folder'], class: 'form-control') %>
+                  <%= setting_errors_for @settings, :aws_folder %>
+                </div>
+                <div class="clearfix"></div>
+              </div>
 
             <div class="form-group">
                 <div class="col-sm-3">&nbsp;</div>

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
       two: "Installation - Administrator"
     theme_issues:
       title: "Theme Issues"
+    demo_notification: "You are working in demo mode so no CRUD functions will be undertaken"
     add_new_user: "Add New User"
     profile: "Profile"
     users: "Users"
@@ -441,6 +442,7 @@ en:
           category_slug: "Category Slug"
           tag_slug: "Tag Slug"
           breadcrumb_seperator: "Breadcrumb Seperator"
+          demonstration_mode: "Demonstration Mode"
           home_page: "Home Page"
           smtp_username: "Server E-mail Address"
           smtp_password: "SMTP password"
@@ -469,6 +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"
           url_prefix: "URL prefix"
       terms:
         table:

data/db/seeds.rb

@@ -36,6 +36,7 @@ Roroacms::Setting.create(:setting_name => 'theme_folder', :type_of_setting => 'T
 Roroacms::Setting.create(:setting_name => 'aws_access_key_id', :type_of_setting => 'AWS')
 Roroacms::Setting.create(:setting_name => 'aws_secret_access_key', :type_of_setting => 'AWS')
 Roroacms::Setting.create(:setting_name => 'aws_bucket_name', :type_of_setting => 'AWS')
+Roroacms::Setting.create(:setting_name => 'aws_folder', :type_of_setting => 'AWS')
 Roroacms::Setting.create(:setting_name => 'smtp_address', :type_of_setting => 'EMAIL')
 Roroacms::Setting.create(:setting_name => 'smtp_domain', :type_of_setting => 'EMAIL')
 Roroacms::Setting.create(:setting_name => 'smtp_port', :type_of_setting => 'EMAIL')
@@ -46,6 +47,7 @@ Roroacms::Setting.create(:setting_name => 'setup_complete', :type_of_setting =>
 Roroacms::Setting.create(:setting_name => 'tour_taken', :type_of_setting => 'G', :setting => 'N')
 Roroacms::Setting.create(:setting_name => 'url_prefix', :type_of_setting => 'G', :setting => 'http://')
 Roroacms::Setting.create(:setting_name => 'breadcrumb_seperator', :type_of_setting => 'G', :setting => '/')
+Roroacms::Setting.create(:setting_name => 'demonstration_mode', :type_of_setting => 'G', :setting => 'N')
 Roroacms::Setting.create(:setting_name => 'user_groups', :type_of_setting => 'G', :setting => '{"admin":["posts","banners","terms","comments","media","menus","pages","revisions","settings","themes","trash","administrators","articles","banners","terms","comments","media","menus","pages","revisions","themes","trash","markdown"]}')
 
 Roroacms::Post.create(:post_title => 'Sample page', :post_type => 'page', :post_status => 'Published', :post_slug => 'sample', :structured_url => '/sample', :post_date => Time.now.to_s(:db), :admin_id => '1', :post_content => '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus sollicitudin a orci ut tempor. Praesent in diam sagittis ligula sodales iaculis. Suspendisse ante nisi, sagittis quis elementum ac, tempor at nisi. Vestibulum convallis luctus nisi, ac tincidunt velit facilisis at. Duis eget rhoncus mi, sit amet fringilla felis. Pellentesque egestas, nisi ullamcorper venenatis vehicula, ipsum sem congue velit, sit amet molestie orci massa quis sapien. Aliquam in nisl quis augue ultricies interdum. Aenean pretium, lacus et posuere porttitor, velit erat placerat mi, tristique bibendum tellus magna sit amet elit. Donec turpis tellus, elementum nec consequat vel, tempus et turpis. Nunc quis elit volutpat, congue justo ac, sollicitudin diam. Etiam rhoncus nibh at ipsum porttitor mollis.</p>

data/lib/roroacms/engine.rb

@@ -58,8 +58,8 @@ module Roroacms
         Rails.application.config.assets.paths << "#{Dir.pwd}/app/assets/stylesheets/roroacms" if Dir.exists?("#{Dir.pwd}/app/assets/stylesheets/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 += %w( theme.css )
-        Rails.application.config.assets.precompile += %w( theme.js )
+        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/images/*"]
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roroacms
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,32 +286,19 @@ dependencies:
 description: A full Rails engine providing content management functionality for any
   Rails 4 application that is fully extendable and is completely boundless
 email:
-- simonfletcher0@gmail.com
+- roroacms@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/roroacms/admin/avatar.gif
-- app/assets/images/roroacms/admin/avatar.png
-- app/assets/images/roroacms/admin/avatar1.gif
-- app/assets/images/roroacms/admin/avatar2.gif
-- app/assets/images/roroacms/admin/avatar3.gif
-- app/assets/images/roroacms/admin/avatar4.gif
-- app/assets/images/roroacms/admin/avatar5.gif
-- app/assets/images/roroacms/admin/avatar6.gif
 - app/assets/images/roroacms/admin/chosen-sprite.png
 - app/assets/images/roroacms/admin/chosen-sprite@2x.png
-- app/assets/images/roroacms/admin/favicon-old.ico
 - app/assets/images/roroacms/admin/favicon.ico
 - app/assets/images/roroacms/admin/grey.png
 - app/assets/images/roroacms/admin/grey@2x.png
 - app/assets/images/roroacms/admin/logo.png
 - app/assets/images/roroacms/admin/roroa-logo.png
 - app/assets/images/roroacms/admin/roroafull.png
-- app/assets/images/roroacms/admin/select2.png
-- app/assets/images/roroacms/admin/Spaceship.gif
-- app/assets/images/roroacms/admin/spritemap.png
-- app/assets/images/roroacms/admin/top.png
 - app/assets/images/roroacms/default-profile.jpg
 - app/assets/javascripts/roroacms/admin/admin.js
 - app/assets/javascripts/roroacms/admin/application.js
@@ -1042,7 +1029,7 @@ files:
 - spec/support/factories.rb
 - spec/support/selectors.rb
 - spec/support/utilities.rb
-homepage: http://roroacms.co.uk
+homepage: http://www.roroacms.co.uk
 licenses:
 - MIT
 post_install_message: