adva 0.1.4 → 0.2.1

data/app/assets/javascripts/adva_cms.js

@@ -0,0 +1,7 @@
+//= require rails-ujs
+
+//= require adva_cms/concat_main_menus
+//= require adva_cms/ckeditor
+//= require adva_cms/jquery.table_tree
+
+

data/app/assets/javascripts/ckeditor/config.js.erb

@@ -0,0 +1,94 @@
+//= require nacelle/ckeditor
+
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+  config.versionCheck = false
+
+  // Define changes to default configuration here. For example:
+  // config.language = 'fr';
+  // config.uiColor = '#AADC6E';
+
+  /* Filebrowser routes */
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+  config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
+  config.filebrowserFlashBrowseUrl = "/ckeditor/attachment_files";
+
+  // The location of a script that handles file uploads in the Flash dialog.
+  config.filebrowserFlashUploadUrl = "/ckeditor/attachment_files";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Link tab of Image dialog.
+  config.filebrowserImageBrowseLinkUrl = "/ckeditor/pictures";
+
+  // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Image dialog.
+  config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
+
+  // The location of a script that handles file uploads in the Image dialog.
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures?";
+
+  // The location of a script that handles file uploads.
+  config.filebrowserUploadUrl = "/ckeditor/attachment_files";
+
+  // For inline style definition.
+  config.stylesSet = 'my_styles';
+
+  config.allowedContent = true;
+  config.filebrowserUploadMethod = 'form';
+
+  config.extraAllowedContent = 'span cell form input select option[*]';
+  config.contentsCss = '<%= asset_path("ckeditor.css") %>';
+  config.extraPlugins = 'cells';
+  config.removePlugins = 'resize';
+  config.colorButton_colors = '4e89c0,bf370d,4b5774,4DAB36,4f4f4f';
+
+  // Toolbar groups configuration.
+  config.toolbar = [
+    { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Maximize', 'Source'] },
+    { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+    // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
+    // { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
+    { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
+    //{ name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar' ] },
+    { name: 'insert', items: [ 'Image', 'Media', 'Table', 'HorizontalRule', 'SpecialChar', 'Iframe', 'Youtube', 'InsertCell' ] },
+    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
+    '/',
+    { name: 'styles', items: [ 'Styles' ] },
+    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'TextColor', '-', 'RemoveFormat' ] }
+  ];
+};
+
+CKEDITOR.stylesSet.add( 'my_styles', [
+    // Block-level styles.
+    { name: ':Paragraph', element: 'p' },
+
+    { name: 'Heading 2',  element: 'h2' },
+    { name: 'Heading 3',  element: 'h3', attributes: { 'class': 'h3-header' } },
+    { name: 'Heading 4',  element: 'h4' },
+    { name: 'Heading 5',  element: 'h5' },
+
+    // Inline styles.
+    { name: 'Clear', element: 'div', attributes: { 'class': 'clear' } },
+    { name: 'Stat list', element: 'ul', attributes: { 'class': 'stats-list' } },
+    { name: 'Subtitle', element: 'p', attributes: { 'class': 'subtitle_two' } },
+    { name: 'Caption img left', element: 'p', attributes: { 'class': 'p-image--left' } },
+    { name: 'Caption img right', element: 'p', attributes: { 'class': 'p-image--right' } },
+    { name: 'Testimonial Image', element: 'blockquote', attributes: { 'class': '-img-col' } },
+    { name: 'Testimonial 2-col', element: 'blockquote', attributes: { 'class': '-two-col' } },
+    { name: 'Testimonial 3-col', element: 'blockquote', attributes: { 'class': '-three-col' } },
+    { name: 'Blockquote left', element: 'blockquote', attributes: { 'class': 'blockquote-left' } },
+    { name: 'Blockquote right', element: 'blockquote', attributes: { 'class': 'blockquote-right' } },
+    { name: 'Line chart up', element: 'span', attributes: { 'class': 'line-chart-up' } },
+    { name: 'Line chart down', element: 'span', attributes: { 'class': 'line-chart-down' } },
+    { name: 'Reverse button', element: 'a', attributes: { 'class': 'reverse-button' } },
+    { name: 'No shadow', element: 'img', attributes: { 'class': 'no-shadow' } },
+    { name: 'Hidden image', element: 'img', attributes: { 'class': '-hidden-img' } }
+]);
+
+CKEDITOR.dtd.$removeEmpty.span = 0;
+

data/app/assets/stylesheets/adva_cms/admin/common.scss

@@ -73,4 +73,18 @@ div.pagination a {
 }
 div.pagination a:hover, div.pagination a:focus {
   text-decoration: underline;
-}
+}
+
+/* Checkbox toggle visibility */
+.show-if-previous-checked {
+  display: none;
+}
+:checked ~ .show-if-previous-checked {
+  display: initial;
+}
+.show-if-previous-unchecked {
+  display: initial;
+}
+:checked ~ .show-if-previous-unchecked {
+  display: none;
+}

data/app/assets/stylesheets/adva_cms/admin/projection.scss

@@ -45,12 +45,9 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 #sidebar textarea {
   font-size: 14px;
 }
-#sidebar .tabs > ul li a {
+#sidebar .tabs > ul li label {
   font-size: 15px;
 }
-#sidebar .tabs > ul li.active a {
-  background: #f6f6f6;
-}
 
 /* top.css */
 #top > ul > li > a {
@@ -115,4 +112,4 @@ select {
 }
 #content form h2 {
   font-size: 14pt;
-}
+}

data/app/assets/stylesheets/adva_cms/admin/sidebar.scss

@@ -31,9 +31,13 @@
 #sidebar .tabs > ul li {
   float: left;
 }
-#sidebar .tabs > ul li a {
+#sidebar .tabs > ul li label {
+  text-decoration: underline;
+  cursor: pointer;
   display: block;
+  color: #76a3a3;
   font-size: 12px;
+  margin-top: 0;
   padding: 3px 15px;
   outline: none;
   -webkit-border-top-left-radius: 4px;
@@ -41,22 +45,39 @@
   -moz-border-top-left-radius: 4px;
   -moz-border-top-right-radius: 4px;
 }
-#sidebar .tabs > ul li.active a {
-  background: #f6f6f6 image_url("adva_cms/admin/tab_sidebar_active.png") repeat-x;
+#sidebar .tabs > input {
+  opacity: 0.001;
+  position: absolute;
+  z-index: 1;
+  top: -15px;
 }
-#sidebar .tabs > ul li a:hover {
-  background-color: #fff;
-  text-decoration: none;
+#adva_current_tab_0 { left: calc(15px * 0); }
+#adva_current_tab_1 { left: calc(15px * 1); }
+#adva_current_tab_2 { left: calc(15px * 2); }
+#adva_current_tab_3 { left: calc(15px * 3); }
+#adva_current_tab_4 { left: calc(15px * 4); }
+#adva_current_tab_0:checked ~ ul li label[for=adva_current_tab_0],
+#adva_current_tab_1:checked ~ ul li label[for=adva_current_tab_1],
+#adva_current_tab_2:checked ~ ul li label[for=adva_current_tab_2],
+#adva_current_tab_3:checked ~ ul li label[for=adva_current_tab_3],
+#adva_current_tab_4:checked ~ ul li label[for=adva_current_tab_4] {
+  background-color: #544535;
+  color: white;
 }
-#sidebar .tabs > ul li.active a:hover {
-  cursor: default;
+#sidebar .tabs > ul li label:hover {
+  background-color: #544535;
+  text-decoration: none;
 }
 #sidebar .tabs .tab {
   display: none;
   clear: both;
   padding: 5px 20px 20px 20px;
 }
-#sidebar .tabs .tab.active {
+#adva_current_tab_0:checked ~ .tab[for=adva_current_tab_0],
+#adva_current_tab_1:checked ~ .tab[for=adva_current_tab_1],
+#adva_current_tab_2:checked ~ .tab[for=adva_current_tab_2],
+#adva_current_tab_3:checked ~ .tab[for=adva_current_tab_3],
+#adva_current_tab_4:checked ~ .tab[for=adva_current_tab_4] {
   display: block;
 }
 .filters .submit {

data/app/assets/stylesheets/adva_cms/admin.scss

@@ -10,6 +10,6 @@
 //= require "adva_cms/admin/themes.css"
 //= require "adva_cms/admin/helptip.css"
 //= require "adva_cms/admin/users.css"
+//= require "adva_cms/admin/activities.css"
 //= require "adva_cms/jquery/jquery.tooltip.css"
 //= require "adva_cms/admin/projection.css"
-//= require "has_filter/filter.css"

data/app/controllers/admin/base_controller.rb

@@ -1,3 +1,5 @@
+require "adva/authenticate_user"
+
 class Admin::BaseController < ApplicationController
   layout "admin"
 
@@ -7,8 +9,9 @@ class Admin::BaseController < ApplicationController
   include ResourceHelper
   helper TableBuilder
 
-  helper :base, :resource, :content, :meta_tags
-  helper HasFilter::Helper
+  helper :base, :resource, :content
+
+  include Adva::AuthenticateUser
 
   helper_method :menu, :content_locale, :has_permission?
 
@@ -25,31 +28,15 @@ class Admin::BaseController < ApplicationController
     end
 
     def require_authentication
-      if @site
-        return redirect_to_login(t(:'adva.flash.login_to_access_admin_area_of_site')) if current_user.anonymous?
-        unless current_user.admin?
-          return redirect_to_login(t(:'adva.flash.no_permission_for_admin_area_of_site'))
-        end
-      else
-        return redirect_to_login(t(:'adva.flash.login_to_access_admin_area_of_account')) if current_user.anonymous?
-        unless current_user.admin?
-          return redirect_to_login(t(:'adva.flash.no_permission_for_admin_area_of_account'))
-        end
+      if current_user.anonymous?
+        return redirect_to_login("Please login to access the admin area of this site.")
+      elsif !current_user.admin?
+        return redirect_to_login("You do not have permission to access the admin area of this site. Please, contact your system administrator or login with another user account.")
       end
     end
 
     def redirect_to_login(notice = nil)
-      flash[:notice] = notice
-      redirect_to login_url(:return_to => request.url)
-    end
-
-    def rescue_action(exception)
-      if exception.is_a? ActionController::RoleRequired
-        @error = exception
-        render :template => 'shared/messages/insufficient_permissions'
-      else
-        super
-      end
+      redirect_to login_url(return_to: request.url), notice: notice
     end
 
     def return_from(action, options = {})
@@ -73,7 +60,6 @@ class Admin::BaseController < ApplicationController
     def set_locale
       params[:locale] =~ /^[\w]{2}$/ or raise 'invalid locale' if params[:locale]
       I18n.locale = params[:locale] || I18n.default_locale
-      I18n.locale.untaint
     end
 
     def set_timezone

data/app/controllers/admin/page/articles_controller.rb

@@ -30,53 +30,34 @@ class Admin::Page::ArticlesController < Admin::BaseController
     @article = @section.articles.build(params[:article])
     if @article.save
       trigger_events(@article)
-      flash[:notice] = t(:'adva.articles.flash.create.success')
-      redirect_to [:edit, :admin, @section, @article]
+      redirect_to [:edit, :admin, @section, @article], notice: "The article has been created."
     else
       set_categories
-      flash.now[:error] = t(:'adva.articles.flash.create.failure') + current_resource_errors
+      flash.now.alert = "The article could not be created." + current_resource_errors
       render :action => 'new'
     end
   end
 
   def update
-    params[:article][:version].present? ? rollback : update_attributes
-  end
-
-  def update_attributes
     @article.attributes = params[:article]
 
     if @article.save
       trigger_events(@article)
-      flash[:notice] = t(:'adva.articles.flash.update.success')
-      redirect_to [:edit, :admin, @section, @article]
+      redirect_to [:edit, :admin, @section, @article], notice: "The article has been updated."
     else
       set_categories
-      flash.now[:error] = t(:'adva.articles.flash.update.failure') + current_resource_errors
+      flash.now.alert = "The article could not be updated." + current_resource_errors
       render :action => 'edit'
     end
   end
 
-  def rollback
-    version = params[:article][:version].to_i
-
-    if @article.version != version and @article.revert_to(version)
-      trigger_event(@article, :rolledback)
-      flash[:notice] = t(:'adva.articles.flash.rollback.success', :version => version)
-    else
-      flash[:error] = t(:'adva.articles.flash.rollback.failure', :version => version)
-    end
-    redirect_to [:edit, :admin, @section, @article]
-  end
-
   def destroy
     if @article.destroy
       trigger_events(@article)
-      flash[:notice] = t(:'adva.articles.flash.destroy.success')
-      redirect_to [:admin, @section, :contents]
+      redirect_to [:admin, @section, :contents], notice: "The article has been deleted."
     else
       set_categories
-      flash.now[:error] = t(:'adva.articles.flash.destroy.failure') + current_resource_errors
+      flash.now.alert = "The article could not be deleted." + current_resource_errors
       render :action => 'edit'
     end
   end
@@ -130,12 +111,12 @@ class Admin::Page::ArticlesController < Admin::BaseController
       
       unless updated_at = params[:article].delete(:updated_at)
         # TODO raise something more explicit here
-        raise t(:'adva.articles.exception.missing_timestamp')
+        raise "Can not update article: timestamp missing. Please make sure that your form has a hidden field: updated_at."
       end
       
       # We parse the timestamp of article too so we can get rid of those microseconds postgresql adds
       if @article.updated_at && (Time.zone.parse(updated_at) != Time.zone.parse(@article.updated_at.to_s))
-        flash[:error] = t(:'adva.articles.flash.optimistic_lock.failure')
+        flash.now.alert = "In the meantime this article has been updated by someone else. Please resolve any conflicts."
         render :action => :edit
       end
     end

data/app/controllers/admin/page/categories_controller.rb

@@ -11,20 +11,18 @@ class Admin::Page::CategoriesController < Admin::BaseController
   def create
     @category = @section.categories.build params[:category]
     if @category.save
-      flash[:notice] = t(:'adva.categories.flash.create.success')
-      redirect_to [:admin, @section, :categories]
+      redirect_to [:admin, @section, :categories], notice: "The category has been created."
     else
-      flash.now[:error] = t(:'adva.categories.flash.create.failure') + current_resource_errors
+      flash.now.alert = "The category could not be created." + current_resource_errors
       render :action => "new"
     end
   end
 
   def update
     if @category.update params[:category]
-      flash[:notice] = t(:'adva.categories.flash.update.success')
-      redirect_to [:admin, @section, :categories]
+      redirect_to [:admin, @section, :categories], notice: "The category has been updated."
     else
-      flash.now[:error] = t(:'adva.categories.flash.update.failure') + current_resource_errors
+      flash.now.alert = "The category could not be updated." + current_resource_errors
       render :action => 'edit'
     end
   end
@@ -40,10 +38,9 @@ class Admin::Page::CategoriesController < Admin::BaseController
 
   def destroy
     if @category.destroy
-      flash[:notice] = t(:'adva.categories.flash.destroy.success')
-      redirect_to [:admin, @section, :categories]
+      redirect_to [:admin, @section, :categories], notice: "The category has been deleted."
     else
-      flash.now[:error] = t(:'adva.categories.flash.destroy.failure') + current_resource_errors
+      flash.now.alert = "The category could not be deleted." + current_resource_errors
       render :action => 'edit'
     end
   end

data/app/controllers/admin/page/links_controller.rb

@@ -16,10 +16,9 @@ class Admin::Page::LinksController < Admin::BaseController
     @link = @section.links.build params[:link]
     if @link.save
       trigger_events(@link)
-      flash[:notice] = t(:'adva.links.flash.create.success')
-      redirect_to [:edit, :admin, @section, @link]
+      redirect_to [:edit, :admin, @section, @link], notice: "The link has been created."
     else
-      flash.now[:error] = t(:'adva.links.flash.create.failure') + current_resource_errors
+      flash.now.alert = "The link could not be created." + current_resource_errors
       render :action => 'new'
     end
   end
@@ -29,10 +28,9 @@ class Admin::Page::LinksController < Admin::BaseController
 
     if @link.save
       trigger_events(@link)
-      flash[:notice] = t(:'adva.links.flash.update.success')
-      redirect_to [:edit, :admin, @section, @link]
+      redirect_to [:edit, :admin, @section, @link], notice: "The link has been updated."
     else
-      flash.now[:error] = t(:'adva.links.flash.update.failure') + current_resource_errors
+      flash.now.alert = "The link could not be updated." + current_resource_errors
       render :action => 'edit', :cl => content_locale
     end
   end
@@ -40,10 +38,9 @@ class Admin::Page::LinksController < Admin::BaseController
   def destroy
     if @link.destroy
       trigger_events(@link)
-      flash[:notice] = t(:'adva.links.flash.destroy.success')
-      redirect_to [:admin, @section, :contents]
+      redirect_to [:admin, @section, :contents], notice: "The link has been deleted."
     else
-      flash.now[:error] = t(:'adva.links.flash.destroy.failure') + current_resource_errors
+      flash.now.alert = "The link could not be deleted." + current_resource_errors
       render :action => 'edit'
     end
   end

data/app/controllers/admin/sections_controller.rb

@@ -15,12 +15,12 @@ class Admin::SectionsController < Admin::BaseController
   def create
     @section = @site.sections.build params[:section]
     if @section.save
-      flash[:notice] = t(:'adva.sections.flash.create.success')
-      redirect_to (params[:commit] == t(:'adva.sections.links.save_and_create_new') ? 
+      flash.notice = "The section has been created."
+      redirect_to (params[:commit] == "Save and create another section" ?
         [:new, :admin, :section] :
         [:admin, @section, :articles])
     else
-      flash.now[:error] = t(:'adva.sections.flash.update.failure')
+      flash.now.alert = "The section could not be created."
       render :action => "new"
     end
   end
@@ -30,20 +30,18 @@ class Admin::SectionsController < Admin::BaseController
 
   def update
     if @section.update params[:section]
-      flash[:notice] = t(:'adva.sections.flash.update.success')
-      redirect_to [:edit, :admin, @section]
+      redirect_to [:edit, :admin, @section], notice: "The section has been updated."
     else
-      flash.now[:error] = t(:'adva.sections.flash.update.failure')
+      flash.now.alert = "The section could not be updated."
       render :action => 'edit'
     end
   end
 
   def destroy
     if @section.destroy
-      flash[:notice] = t(:'adva.sections.flash.destroy.success')
-      redirect_to [:new, :admin, :section]
+      redirect_to [:new, :admin, :section], notice: "The section has been deleted."
     else
-      flash.now[:error] = t(:'adva.sections.flash.destroy.failure')
+      flash.now.alert = "The section could not be deleted."
       render :action => 'edit'
     end
   end

data/app/controllers/admin/sites_controller.rb

@@ -22,11 +22,10 @@ class Admin::SitesController < Admin::BaseController
     site.sections << section
 
     if site.save
-      flash[:notice] = t(:'adva.sites.flash.create.success')
-      redirect_to admin_site_url(site)
+      redirect_to admin_site_url(site), notice: "The site has been created."
     else
-      flash.now[:error] = t(:'adva.sites.flash.create.failure')
-      render :action => :new
+      flash.now.alert = "The site could not be created"
+      render action: :new
     end
   end
 
@@ -35,21 +34,19 @@ class Admin::SitesController < Admin::BaseController
 
   def update
     if @site.update params[:site]
-      flash[:notice] = t(:'adva.sites.flash.update.success')
-      redirect_to edit_admin_site_url
+      redirect_to edit_admin_site_url, notice: "The site has been updated."
     else
-      flash.now[:error] = t(:'adva.sites.flash.update.failure')
-      render :action => 'edit'
+      flash.now.alert = "The site could not be updated"
+      render action: :edit
     end
   end
 
   def destroy
     if @site.destroy
-      flash[:notice] = t(:'adva.sites.flash.destroy.success')
-      redirect_to return_from(:site_deleted)
+      redirect_to return_from(:site_deleted), notice: "The site has been deleted."
     else
-      flash.now[:error] = t(:'adva.sites.flash.destroy.failure')
-      render :action => 'show'
+      flash.now.alert = "The site could not be deleted"
+      render action: :show
     end
   end
 

data/app/controllers/admin/users_controller.rb

@@ -20,10 +20,9 @@ class Admin::UsersController < Admin::BaseController
     if @user.save
       @user.verify! # TODO hu??
       trigger_events(@user)
-      flash[:notice] = t(:'adva.users.flash.create.success')
-      redirect_to admin_user_url(@user)
+      redirect_to [:admin, @user], notice: "The user has been created."
     else
-      flash.now[:error] = t(:'adva.users.flash.create.failure')
+      flash.now.alert = "The user could not be created."
       render :action => :new
     end
   end
@@ -34,10 +33,9 @@ class Admin::UsersController < Admin::BaseController
   def update
     if @user.update(params[:user])
       trigger_events(@user)
-      flash[:notice] = t(:'adva.users.flash.update.success')
-      redirect_to admin_user_url(@user)
+      redirect_to [:admin, @user], notice: "The user has been updated."
     else
-      flash.now[:error] = t(:'adva.users.flash.update.failure')
+      flash.now.alert = "The user could not be updated."
       render :action => :edit
     end
   end
@@ -45,10 +43,9 @@ class Admin::UsersController < Admin::BaseController
   def destroy
     if @user.destroy
       trigger_events(@user)
-      flash[:notice] = t(:'adva.users.flash.destroy.success')
-      redirect_to admin_users_url
+      redirect_to [:admin, :users], notice: "The user has been deleted."
     else
-      flash.now[:error] = t(:'adva.users.flash.destroy.failure')
+      flash.now.alert = "The user could not be deleted."
       render :action => :edit
     end
   end