adva 0.1.4 → 0.2.1

data/app/views/admin/sections/index.html.erb

@@ -1,27 +1,27 @@
 <%= content_for :sidebar do %>
-	<p class="hint text_only large padded">
-		<%= t(:'adva.sections.hints.sections') %>
-	</p>
-	<p class="hint text_only large padded">
-		<%= t(:'adva.sections.hints.reorder') %>
-	</p>
+  <p class="hint text_only large padded">
+    Listed here are all the sections currently on your site. Whichever section is on top is the default homepage.
+  </p>
+  <p class="hint text_only large padded">
+    You can use the reorder option to set your home root to different section and to reorder your sections. If you want to nest your sections you can drag the section to the right and its gets set as a child of the upper section.  Finish the reordering by clicking the reorder button. Please note that this option is only available when you have 2 or more sections.
+  </p>
 <% end %>
 
 <%=
-	table_for @sections, :collection_name => :sections, :class => 'sections list tree' do |t|
-		t.column :section
-		t.column :actions, :class => :actions
+  table_for @sections, :collection_name => :sections, :class => 'sections list tree' do |t|
+    t.column :section
+    t.column :actions, :class => :actions
 
-		t.row(:class => 'section') do |r, section|
-			r.add_class "level_#{section.level}"
-			r.cell content_status(section) + " " + link_to(section.title, [:admin, section, :contents], :class => section.state)
+    t.row(:class => 'section') do |r, section|
+      r.add_class "level_#{section.level}"
+      r.cell content_status(section) + " " + link_to(section.title, [:admin, section, :contents], :class => section.state)
       r.cell link_to("Edit", [:edit, :admin, section], :class => "edit section") +
         link_to("Delete", [:admin, section], method: :delete, class: "delete section", data: { confirm: "Are you sure you want to delete this section?" })
-		end
+    end
 
-		t.empty :p, :class => 'empty' do
-	    t(:'adva.sections.no_sections_in_site', :section => @section.title) + "\n" +
-			link_to(:'adva.sections.links.create_now', [:new, :admin, :section])
-		end
-	end
+    t.empty :p, :class => 'empty' do
+      "There are no sections in the site.\n" +
+        link_to(:'adva.sections.links.create_now', [:new, :admin, :section])
+    end
+  end
 %>

data/app/views/admin/sections/new.html.erb

@@ -1,29 +1,31 @@
-<h2><%= t(:'adva.sections.titles.create') %></h2>
+<h2>Create a new section</h2>
 
 <%= form_for @section, as: :section, url: admin_sections_path do |f| %>
   <fieldset>
     <div class="col">
-    	<%= f.text_field :title, label: "Title" %>
+      <%= f.text_field :title, label: "Title" %>
     </div>
     <div class="col">
-     	<%= f.collection_select :type, Section.types, :to_s, :to_s, {}, label: "Type" %>
+      <%= f.collection_select :type, Section.types, :to_s, :to_s, {}, label: "Type" %>
     </div>
   </fieldset>
 
-	<% unless @site.sections.size < 2 %>
+  <% unless @site.sections.size < 2 %>
     <fieldset>
-			<h3><%= t(:'adva.titles.parent_settings')%></h3>
-	
-	    <%= f.select :parent_id, @site.sections.collect {|s| s == @section ? nil : [ s.title, s.id ]}.compact, { include_blank: true, label: true } %>
-			<span class="hint" for="section_parent_id"><%= t :'adva.sections.hints.parent_setting' %></span>
+      <h3>Parent settings</h3>
+
+      <%= f.select :parent_id, @site.sections.collect {|s| s == @section ? nil : [ s.title, s.id ]}.compact, { include_blank: true, label: true } %>
+      <span class="hint" for="section_parent_id">
+        Choosing a parent for your section will nest this section under the chosen parent. Leave empty if you want to create this section as a root section.
+      </span>
     </fieldset>
-	<% end %>
+  <% end %>
 
   <p class="buttons">
-    <%= submit_tag t(:'adva.common.save'), id: 'commit' %>
-    <%= submit_tag t(:'adva.sections.links.save_and_create_new'), id: 'save_and_create_new' %>
-    <%= t(:'adva.common.connector.or') %>
-    <%= link_to(t(:'adva.common.cancel'), admin_sections_path) %>
+    <%= submit_tag "Save", id: 'commit' %>
+    <%= submit_tag "Save and create another section", id: 'save_and_create_new' %>
+    or
+    <%= link_to "Cancel", admin_sections_path %>
   </p>
 <% end %>
 

data/app/views/admin/sections/settings/_page.html.haml

@@ -1,10 +1,8 @@
-%h2= t :'adva.sections.titles.page_settings'
+%h2 Page Settings
 
 %fieldset#section_section_settings
   .col
-    = f.label t(:"adva.sections.titles.behaviour")
-    %p= f.radio_button :single_article_mode, true, :label => :"adva.sections.settings.single_article_mode"
-    %p= f.radio_button :single_article_mode, false, :label => :"adva.sections.settings.multi_article_mode"
+    Behaviour
+    %p= f.radio_button :single_article_mode, true, label: "Single article per page"
+    %p= f.radio_button :single_article_mode, false, label: "Multiple articles per page"
 
-  .col
-    = f.select :content_filter, filter_options, {}, :label => true, :hint => :'adva.sections.hints.content_filter'

data/app/views/admin/shared/_header.html.erb

@@ -5,15 +5,16 @@
 
   <div class="right">
     <% if current_user.anonymous? %>
-      You're not logged in <%= link_to t(:'adva.links.login'), :controller => 'session', :action => 'new' %>
+      You're not logged in <%= link_to "Log In", [:new, :session] %>
     <% else %>
-      <%= t(:'adva.users.info.logged_in_as', :name => link_to_profile(:name => current_user.name)).html_safe %> &middot;
-      <%= link_to t(:'adva.links.logout').html_safe, logout_path, :method => :delete %>
+        
+      <%= "Logged in as: #{link_to_profile(name: current_user.name)}".html_safe %> &middot;
+      <%= link_to "Logout", logout_path, method: :delete %>
     <% end %>
 
     <% if @site %>
       &middot;
-      <%= link_to t(:'adva.titles.website') + ' »', "http://#{@site.host}", :id => 'go_to_website' %>
+      <%= link_to "Website »", "http://#{@site.host}", id: "go_to_website" %>
     <% end %>
   </div>
 </div>

data/app/views/admin/shared/_section_tree.html.erb

@@ -1,7 +1,7 @@
 <h3>
-  <%= t(:'adva.titles.sections') %>
+  Sections
   <% if @site.sections.size > 1 %>
-    <%= link_to_function t(:'adva.sections.links.reorder'), "sections_tree.toggle(this, '#{t(:'adva.resources.reordering_done')}');", :id => 'reorder_sections' %>
+    <%= link_to_function "Reorder", "sections_tree.toggle(this, 'Done reordering')", id: 'reorder_sections' %>
     <%= image_tag '/assets/adva_cms/indicator.gif', :id => 'sections_indicator', :style => 'display: none;' %>
   <% end -%>
 </h3>

data/app/views/admin/sites/_email_notifications.html.erb

@@ -1,9 +1,8 @@
-<h2><%= t(:'adva.titles.email_notifications') %></h2>
+<h2>Email Notifications</h2>
 
 <% f.field_set :email_notification do %>
-	<% column do %>
-      <p class="hint text_only"><%= t(:'adva.sites.hints.email_notification') %></p>
-			
-			<%= f.check_box :email_notification, { :label => :'adva.sites.email_notification_activated' } %>
-	<% end %>
-<% end %>
+  <% column do %>
+    <p class="hint text_only">If email notifications are activated, an email is sent to administrators every time content is created or updated. No emails are sent if notifications are deactivated.</p>
+    <%= f.check_box :email_notification, label: "Activate Email notifcations" %>
+  <% end %>
+<% end %>

data/app/views/admin/sites/_form.html.erb

@@ -1,15 +1,15 @@
-<h2><%= t(:'adva.titles.general_settings') %></h2>
+<h2>General Settings</h2>
 
 <fieldset>
   <div class="col">
-    <%= form.text_field :name, label: :'adva.sites.label.name' %>
-    <%= form.text_field :title, label: :'adva.sites.label.title' %>
-    <%= form.email_field :email, label: :'adva.sites.label.admin_email' %>
+    <%= form.text_field :name, label: true %>
+    <%= form.text_field :title, label: true %>
+    <%= form.email_field :email, label: true %>
   </div>
 
   <div class="col">
-    <%= form.text_field :host, label: :'adva.sites.label.host' %>
-    <%= form.text_field :subtitle, label: :'adva.sites.label.subtitle' %>
-    <%= form.time_zone_select :timezone, [ActiveSupport::TimeZone['UTC']], label: :'adva.sites.label.timezone' %>
+    <%= form.text_field :host, label: true %>
+    <%= form.text_field :subtitle, label: true %>
+    <%= form.time_zone_select :timezone, [ActiveSupport::TimeZone['UTC']], label: true %>
   </div>
 </fieldset>

data/app/views/admin/sites/_recent_users.html.erb

@@ -1,10 +1,12 @@
 <% if users.present? %>
-  <h3><%= t(:'adva.titles.recently_logged_in') %></h3>
+  <h3>Recently logged in</h3>
   <ul id="users">
     <% users.each do |user| %>
       <li>
         <%= gravatar_img(user) %><%= link_to who(user), :controller => 'users', :action => 'show', :id => user %><br /> 
-        <%= t(:'adva.users.info.showed_up', :time_ago => distance_of_time_in_words_to_now(user.updated_at)) %>
+        showed up: 
+        <%= distance_of_time_in_words_to_now user.updated_at %>
+        ago
       </li>
     <% end %>
   </ul>

data/app/views/admin/sites/_unapproved_comments.html.erb

@@ -1,5 +1,5 @@
 <% if contents.present? -%>
-  <h3><%= t(:'adva.comments.titles.comments_awaiting_approval') %></h3>
+  <h3>Comments awaiting your approval</h3>
   <ul>
   <% contents.each do |content, comments| -%>
     <% if content -%>

data/app/views/admin/sites/index.html.erb

@@ -14,7 +14,7 @@
     end
 
     t.empty :p, :class => 'empty' do
-      "<p>" + t(:'adva.sites.no_sites') + "</p>" +
+      "<p>You currently do not have any sites created.</p>" +
         "<p>" + link_to("Create one now &raquo;", new_admin_site_path) + "</p>"
     end
   end

data/app/views/admin/sites/new.html.erb

@@ -1,7 +1,7 @@
-<h2><%= t(:'adva.sites.title.create') %></h2> 
+<h2>New Site</h2> 
 
 <%= form_for [:admin, Site.new] do |form| %>
-  <h2><%= t(:'adva.titles.home_section') %></h2>  
+  <h2>Home Section</h2>  
 
   <% form.field_set :'home_section' do %>
     <%= fields_for :section, Section.new(params[:section]) do |s| %>

data/app/views/admin/sites/show.html.erb

@@ -1,14 +1,13 @@
-<%# FIXME should be translated properly %>
-<h2><%= t(:'adva.titles.history') %>: <%= @site.title %></h2>
+<h2>History: <%= @site.title %></h2>
 
 <%= render :partial => 'admin/activities/activities', :object => @activities %>
 
 <%= content_for :sidebar do %>
-	<div class="tabs">
-		<div class="tab active">
-		  <%= render :partial => 'recent_users', :locals => {:users => @users} %>
-		  <%= render :partial => 'unapproved_comments', :locals => {:contents => @contents} %>
-		</div>
-	</div>
+  <div class="tabs">
+    <div class="tab active">
+      <%= render :partial => 'recent_users', :locals => {:users => @users} %>
+      <%= render :partial => 'unapproved_comments', :locals => {:contents => @contents} %>
+    </div>
+  </div>
 <% end %>
 

data/app/views/admin/users/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t(:'adva.users.titles.edit') %></h2>
+<h2>Edit User</h2>
 
 <%= form_for [:admin, @user] do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>  

data/app/views/admin/users/index.html.erb

@@ -1,13 +1,13 @@
 <ul id="users">
   <% @users.each do |user| %>
-		<li>
-		  <%= gravatar_img(user) %>
-		  <h4><%= link_to user.name, [:admin, user] %></h4>
-		  <p><%= user.email %></p>
-		  <p class="actions">
-		    <%= link_to t(:'adva.links.edit'), [:edit, :admin, user], :class => 'edit' %>
-        <%= link_to t(:'adva.links.delete'), [:admin, user], :class => 'delete', :data => { :confirm => t(:'adva.users.confirm_delete') }, :method => :delete %>
-		  </p>
-		</li> 
-	<% end %>
+    <li>
+      <%= gravatar_img(user) %>
+      <h4><%= link_to user.name, [:admin, user] %></h4>
+      <p><%= user.email %></p>
+      <p class="actions">
+        <%= link_to "Edit", [:edit, :admin, user], class: 'edit' %>
+        <%= link_to "Delete", [:admin, user], method: :delete, class: 'delete', data: { confirm: "Are you sure you want to delete this user?" } %>
+      </p>
+    </li> 
+  <% end %>
 </ul>	

data/app/views/admin/users/new.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t(:'adva.users.titles.new') %></h2>
+<h2>New User</h2>
 
 <%= form_for [:admin, @user] do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>  

data/app/views/admin/users/show.html.erb

@@ -1,27 +1,27 @@
 <h2><%= @user.name %></h2>
 
-<h3><%= t(:'adva.common.details') %></h3>
+<h3>Details</h3>
 <p>
-  <%= t(:'adva.users.labels.email') %>:
+  Email:
   <%= @user.email %>
 </p>
 
 <% if @user.homepage %>
   <p>
-    <%= t(:'adva.users.labels.url') %>:
+    Homepage:
     <%= link_to @user.homepage, @user.homepage %>
   </p>
 <% end %>
 
-<h3><%= t(:'adva.common.events') %></h3>
+<h3>Events</h3>
 <p>
-  <%= t(:'adva.users.labels.created_at') %>:
+  Created at:
   <%= @user.created_at %>
 </p>
 
 <p>
-  <%= t(:'adva.users.labels.updated_at') %>:
+  Updated at:
   <%= @user.updated_at %>
 </p>
 
-<%= render :partial => 'sidebar' %>
+<%= render :partial => 'sidebar' %>

data/app/views/layouts/admin.html.haml

@@ -8,7 +8,6 @@
       = controller.controller_name
 
     = stylesheet_link_tag "adva_cms/admin"
-    = stylesheet_link_tag "adva_cms/admin/activities.css"
 
     -# FIXME extract to subprojects
     = stylesheet_link_tag "adva_comments/admin/comments.css" if defined?(Comment)
@@ -19,12 +18,11 @@
 
     = yield :before_javascript_include
 
-    = javascript_include_tag "adva_cms/application"
+    = javascript_include_tag "adva_cms"
     = javascript_include_tag "admin"
 
-    -# FIXME extract to subprojects
-    - unless Rails.env.test? # fckeditor screws up tests
-      = javascript_include_tag "adva_fckeditor/setup_fckeditor.js"
+    - unless Rails.env.test? # ckeditor screws up tests
+      = javascript_include_tag Ckeditor.cdn_url unless Rails.env.test?
 
     = javascript_tag "window._auth_token = #{form_authenticity_token.inspect}"
     = csrf_meta_tags

data/app/views/layouts/login.html.erb

@@ -8,7 +8,7 @@
     <%= stylesheet_link_tag "adva_cms/admin" %>
     <%= stylesheet_link_tag "admin" %> <!-- super project can put override styles here -->
 
-    <%= javascript_include_tag "adva_cms/application" %>
+    <%= javascript_include_tag "adva_cms" %>
     <%= yield :head %>
   </head>
   <body>   

data/app/views/password/edit.html.erb

@@ -1,17 +1,24 @@
-<h2><%= t(:'adva.passwords.titles.edit') %></h2>
+<h2>Edit Password</h2>
 
-<p><%= params[:token].blank? ? t(:'adva.passwords.info.please_enter_new_password_and_token') : t(:'adva.passwords.info.please_enter_new_password') %></p>
+<p>
+  <% if params[:token].blank? %>
+    Please enter the confirmation code you received via email and your new password.
+  <% else %>
+    Please enter your new password.
+  <% end %>
+</p>
+        
 
 <%= form_for 'user', :url => password_path, :html => { :method => :put } do |f| %>
   <% f.field_set do %>
     <% if current_user.anonymous? %>
-      <%= label_tag t(:'adva.passwords.attributes.token') %>
+      <%= label_tag "Token" %>
       <%= text_field_tag :token %>
     <% end %>
-    <%= f.password_field :password, :label => :"adva.users.attributes.new_password" %>
+    <%= f.password_field :password, label: "New password" %>
   <% end %>
 
   <% f.buttons do %>
-    <%= submit_tag t(:'adva.common.save') %>
+    <%= submit_tag "Save" %>
   <% end %>
 <% end %>

data/app/views/password/new.html.erb

@@ -1,13 +1,13 @@
-<h2><%= t(:'adva.passwords.titles.new') %></h2>
+<h2>New Password</h2>
 
 <%= form_tag password_path do %>
   <fieldset>
-    <p><%= t(:'adva.passwords.info.please_enter_email_to_reset_password') %></p>
-		<%= label_tag 'user[email]', t(:"adva.users.attributes.email") %>
-	  <%= text_field_tag 'user[email]' %>
-	</fieldset>
-	
+    <p>Please enter your email address. An email will be sent to you which will include a link to reset your password.</p>
+    <%= label_tag 'user[email]', "Email" %>
+    <%= text_field_tag 'user[email]' %>
+  </fieldset>
+
   <%= buttons do %>
-    <%= submit_tag t(:'adva.passwords.links.reset') %>
+    <%= submit_tag "Reset password" %>
   <% end %>
 <% end %>

data/app/views/password_mailer/reset_password_email.html.erb

@@ -1,3 +1,23 @@
-<%= t(:'adva.passwords.notifications.reset_password.body', :name => @user.name, :link => @reset_link, :token => @token) %>
+Dear <%= @user.name %>,
+
+Someone (hopefully you) has indicated that you cannot remember your password.
+To let you reset your password we have provided a link below that will allow
+you to reset your password.
+
+<%= @reset_link %>
+
+Alternatively, if your browser window is still open, you can use the following 
+confirmation code together with your new password:
+
+<%= @token %>
+
+It is suggested you reset your password as soon as possible since this is a
+time-limited link (to protect your account).
+
+If you did not request that your password be changed someone must have
+entered your account in the "Forgot password" page on our site. Your account is
+still perfectly safe since you were the only person this message was sent to.
+Simply delete this message and no changes will be made to your account if this
+message was sent in error.
 
 

data/app/views/password_mailer/updated_password_email.html.erb

@@ -1 +1,3 @@
-<%= t(:'adva.passwords.notifications.password_updated.body', :name => @user.name) %>
+Dear <%= @user.name %>,
+
+you have successfully updated your password.

data/app/views/session/new.html.erb

@@ -2,16 +2,16 @@
   <%= form_for @user, :url => session_path, :html => {:id => 'login'} do |f| %>
     <%= hidden_field_tag :return_to, params[:return_to] if params[:return_to] %>
 
-  	<fieldset>
-  		<%= f.email_field :email, :class => 'big', :label => "Email" %>
-  		<%= f.password_field :password, :class => 'big', :label => "Password" %>
-  		<%= check_box_tag 'user[remember_me]', 1, @remember_me, :id => 'user_remember_me' %>
-			<%= label_tag :user_remember_me, t(:'adva.session.labels.remember_me'), :class => 'inline light' %>
+    <fieldset>
+      <%= f.email_field :email, :class => 'big', :label => "Email" %>
+      <%= f.password_field :password, :class => 'big', :label => "Password" %>
+      <%= check_box_tag 'user[remember_me]', 1, @remember_me, :id => 'user_remember_me' %>
+      <%= label_tag :user_remember_me, "Remember me?", class: 'inline light' %>
     </fieldset>
-  	
-  	<fieldset>
-  	  <%= submit_tag "Login", :id => 'commit' %> <%= t(:'adva.common.connector.or')%>
-  	  <%= link_to t(:'adva.passwords.titles.new'), new_password_path %>
+
+    <fieldset>
+      <%= submit_tag "Login", id: "commit" %> or
+      <%= link_to "Reset your password", new_password_path %>
     </fieldset>
   <% end %>
 </div>

data/app/views/shared/_flash.html.erb

@@ -1,3 +1,3 @@
-<% [:notice, :error].each do |name| %>
-  <p id="flash_<%= name %>" class="flash <%= name %>" style="display: none;"></p>
+<% [:notice, :alert, :error].each do |name| %>
+  <p id="flash_<%= name %>" class="flash <%= name %>" hidden></p>
 <% end %>

data/app/views/shared/_sidebar.html.erb

@@ -1,6 +1,6 @@
 <div id="sidebar">
   <% if @section and @section.categories.present? %>
-    <h4><%= t(:'adva.sidebar.titles.topics') %></h4>
+    <h4>Topics</h4>
     <ul>
     <% @section.categories.each do |category| %>
       <li><%= link_to_category @section, category %></li>
@@ -9,7 +9,7 @@
   <% end %>
 
   <% if @section and @section.tag_counts.present? %>
-    <h4><%= t(:'adva.sidebar.titles.tags') %></h4>
+    <h4>Tags</h4>
     <ul>
     <% @section.tag_counts.each do |tag| %>
       <li><%= link_to_tag @section, tag %></li>

data/config/initializers/ckeditor.rb

@@ -0,0 +1,61 @@
+require "ckeditor"
+require "nacelle"
+
+# Use this hook to configure ckeditor
+Ckeditor.setup do |config|
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'ckeditor/orm/active_record'
+
+  # Allowed image file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(jpg jpeg png gif tiff)
+  # config.image_file_types = %w(jpg jpeg png gif tiff)
+
+  # Allowed flash file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(jpg jpeg png gif tiff)
+  # config.flash_file_types = %w(swf)
+
+  # Allowed attachment file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+  # config.attachment_file_types = %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+
+  # Setup authorization to be run as a before filter
+  # By default: there is no authorization.
+  # config.authorize_with :cancan
+
+  # Override parent controller CKEditor inherits from
+  # By default: 'ApplicationController'
+  # config.parent_controller = 'MyController'
+
+  # Asset model classes
+  # config.picture_model { Ckeditor::Picture }
+  # config.attachment_file_model { Ckeditor::AttachmentFile }
+
+  # Paginate assets
+  # By default: 24
+  # config.default_per_page = 24
+
+  # Customize ckeditor assets path
+  # By default: nil
+  # config.asset_path = 'http://www.example.com/assets/ckeditor/'
+
+  # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
+  # By default: nil (no limit)
+  # config.assets_languages = ['en', 'uk']
+  # config.assets_plugins = ['image', 'smiley']
+
+  # CKEditor CDN
+  # More info here http://cdn.ckeditor.com/
+  # By default: nil (CDN disabled)
+  # config.cdn_url = '//cdn.ckeditor.com/4.11.1/standard/ckeditor.js'
+
+  # JS config url
+  # Used when CKEditor CDN enabled
+  # By default: "ckeditor/config.js"
+  # config.js_config_url = 'ckeditor/config.js'
+end

data/config/initializers/time_format.rb

@@ -0,0 +1,2 @@
+Time::DATE_FORMATS[:time_only] = '%I:%M %p'
+