roroacms 0.0.6.2 → 0.0.6.4

data/app/assets/stylesheets/roroacms/admin/{main.css.erb → main.css.scss}

@@ -66,7 +66,7 @@ h3.underline {
   min-height: 80px;
   padding: 0 0 0 10px;
   position: relative;
-  background: #5ce0aa url(<%=asset_path "roroacms/admin/roroafull.png"%>) no-repeat center center;
+  background: #5ce0aa url(roroafull.png) no-repeat center center;
 }
 #header {
   z-index: 200;
@@ -85,7 +85,7 @@ h3.underline {
   min-height: 80px;
   padding: 0 0 0 10px;
   position: relative;
-  background: #5ce0aa url(<%=asset_path "roroacms/admin/roroa-logo.png"%>) no-repeat 23px 22px;
+  background: #5ce0aa url(roroafull.png) no-repeat center center;
 }
 #header .logo {
   color: #fff;
@@ -2199,7 +2199,7 @@ section#login-container div#error_explanation ul li {
   display: inline-block;
 }
 #login-wrapper .logo:before {
-  background-image: url(<%=asset_path "roroacms/admin/logo.png"%>);
+  background-image: url(logo.png);
   background-position: left center;
   background-repeat: no-repeat;
   padding: 0 20px;
@@ -2723,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;

data/app/controllers/roroacms/application_controller.rb

@@ -111,19 +111,27 @@ module Roroacms
 
     end
 
+    # check that the setup is complete if not redirect to the setup area
+
     def check_setup
        redirect_to setup_index_path and return if Setting.get('setup_complete') != 'Y' && params[:controller] != 'roroacms/setup'
     end
 
+    # add the home breadcrumb for the front end
+
     def add_breadcrumb_fe
       add_breadcrumb I18n.t("generic.home"), '/', :title => I18n.t("generic.home") if !params[:controller].include?('admin/')
     end
 
+    # add a breadcrumb to the breadcrumb hash
+
     def add_breadcrumb(name, url = 'javascript:;', atts = {})
       hash = { name: name, url: url, atts: atts }
       @breadcrumbs << hash
     end
 
+    # restricts any CRUD functions if you are logged in as the username of demo and you have demonstration mode turned on
+    
     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 

data/app/controllers/roroacms/pages_controller.rb

@@ -29,6 +29,7 @@ module Roroacms
       route_index_page params
     end
 
+    # Shows the page via the ID, simlply pass in the ID of the page that you would like to view via params
 
     def show
       redirect_to show_url(params)
@@ -42,6 +43,9 @@ module Roroacms
       route_dynamic_page params
     end
 
+
+    # Check to see if there is a theme installed and if so has it got all the necessary files
+
     def check_theme_folder_new
       @meta_translation = I18n.t("views.admin.layouts.admin.meta_title_theme_issues")
       @missing = check_necessaries

data/app/controllers/roroacms/setup_controller.rb

@@ -8,6 +8,8 @@ module Roroacms
     helper Roroacms::AdminRoroaHelper
     include Roroacms::AdminRoroaHelper
 
+    # Show setup page
+
     def index
   		  Setting.reload_settings
       	@settings = Setting.get_all
@@ -15,6 +17,8 @@ module Roroacms
       	@title = I18n.t("generic.installation.one")
   	end
 
+    # Create the settings for the Admin panel to work!
+
   	def create 
   	  # To do update this table we loop through the fields and update the key with the value.
       # In order to do this we need to remove any unnecessary keys from the params hash
@@ -41,6 +45,8 @@ module Roroacms
 
   	end
 
+    # create a new admin user
+
     def create_user
       @admin = Admin.new(administrator_params)
       @admin.access_level = 'admin'
@@ -58,23 +64,22 @@ module Roroacms
 
     end
 
+    # create a new admin object
+
     def administrator
       @title = I18n.t("generic.installation.two")
       @admin = Admin.new
     end
 
-  	def remove_unwanted_keys
-      params.delete :utf8
-      params.delete :authenticity_token
-      params.delete :commit
-      params.delete :redirect
-    end
+    # Check to see if the setup has been completed, if it has then show 404 page
 
     def check_setup 
       @meta_translation = I18n.t("views.admin.layouts.admin.meta_title_installation")
       render_404 if Setting.get('setup_complete') == 'Y' && params[:action] != 'tour_complete'
     end
 
+    # complete the tour of the administration panel
+
     def tour_complete 
       Setting.save_data({tour_taken: 'Y'})
       render :inline => 'complete'
@@ -88,6 +93,13 @@ module Roroacms
       params.require(:admin).permit(:email, :username, :password, :password_confirmation)
     end
 
+  	def remove_unwanted_keys
+      params.delete :utf8
+      params.delete :authenticity_token
+      params.delete :commit
+      params.delete :redirect
+    end
+
   end
 
 end

data/app/helpers/roroacms/admin_roroa_helper.rb

@@ -363,6 +363,8 @@ module Roroacms
         end
     end
 
+    # appends any extra menu items that are set in the applications configurations
+
     def append_application_menu      
       html = ''
       Roroacms.append_menu.each do |f|
@@ -371,6 +373,8 @@ module Roroacms
       html.html_safe
     end
 
+    # checks to see if the stylesheets/javascript override files exist in the application
+
     def application_admin_file_exists?(file, ext)
       folder = ext == 'js' ? 'javascripts' : 'stylesheets'
       script = "#{Rails.root}/app/assets/#{folder}/roroacms/#{file}.#{ext}"

data/app/helpers/roroacms/admin_view_helper.rb

@@ -1,14 +1,22 @@
 module Roroacms  
 	module AdminViewHelper
 
+		# There functions are used to recreate the views in the main application.
+
+		# renders the table header file
+
 		def obtain_admin_table_header(variables)
 			render partial: 'roroacms/admin/partials/table_header', locals: variables
 		end
 
+		# renders the submit bar header file
+
 		def obtain_admin_submit_bar
 			render :partial => 'roroacms/admin/partials/submit_bar'
 		end
 
+		# renders the table editor file
+
 		def obtain_admin_editor(variables)
 			render :partial => 'roroacms/admin/partials/editor', locals: variables
 		end

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

@@ -28,7 +28,6 @@
         <header id="header">
             <!--logo start-->
             <div class="brand">
-                <a href="javascript:;" class="logo"><span>Roroa</span>cms</a>
             </div>
             <!--logo end-->
             <div class="toggle-navigation toggle-left">

data/lib/roroacms/engine.rb

@@ -25,6 +25,7 @@ module Roroacms
     isolate_namespace Roroacms
 
     DB = YAML.load_file(Dir.pwd + "/config/database.yml")
+
     require 'active_record'
     
     ActiveRecord::Base.establish_connection(
@@ -59,14 +60,13 @@ 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 += ["#{Dir.pwd}/app/views/themes/#{Setting.get('theme_folder')}/assets/images/*"]
-
+        Rails.application.config.assets.precompile += ["#{Dir.pwd}/app/views/themes/#{Setting.get('theme_folder')}/assets/*"]
+        
     end
 
     config.assets.precompile += %w( *.js *.css )
     config.serve_static_assets = true
 
-
     config.i18n.default_locale = :en
     config.assets.initialize_on_precompile = true
     config.assets.enabled = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roroacms
 version: !ruby/object:Gem::Version
-  version: 0.0.6.2
+  version: 0.0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +356,7 @@ files:
 - app/assets/javascripts/roroacms/vendor/select.js
 - app/assets/javascripts/roroacms/vendor/sortable.js
 - app/assets/stylesheets/roroacms/admin/application.css
-- app/assets/stylesheets/roroacms/admin/main.css.erb
+- app/assets/stylesheets/roroacms/admin/main.css.scss
 - app/assets/stylesheets/roroacms/vendor/animate.css
 - app/assets/stylesheets/roroacms/vendor/bootstrap/css/bootstrap.min.css
 - app/assets/stylesheets/roroacms/vendor/chosen/chosen.css.erb