adva 0.1.3 → 0.2.0

data/app/views/admin/activities/_activities.html.erb

@@ -1,10 +1,10 @@
 <div class="activities">
-  <h3><%= t(:'adva.activity.titles.today', :date => l(Date.current, :format => :short)) %></h3>
+  <h3>Today <%= Date.current.to_fs(:short) %></h3>
   <%= render_activities activities[0], true %>
 
-  <h3><%= t(:'adva.activity.titles.yesterday', :date => l(Date.current.yesterday, :format => :short)) %></h3>
+  <h3>Yesterday <%= Date.current.yesterday.to_fs(:short) %></h3>
   <%= render_activities activities[1], true %>
 
-  <h3><%= t(:'adva.activity.titles.past', :date => l(Date.current.yesterday, :format => :short)) %></h3>
+  <h3>Before <%= Date.current.yesterday.to_fs(:short) %></h3>
   <%= render_activities activities[2] %>
-</div>
+</div>

data/app/views/admin/activities/_comment.html.erb

@@ -6,30 +6,30 @@
   </p>
 
   <p>
-		<%= t(:'adva.activity.comment', :actions => activity.all_actions.collect { |a| t(:"adva.activity.action_names.#{a.downcase}" }.to_sentence) %>
-	</p>
-  
-	<p>
-		<%= truncate strip_tags(activity.body), 100 %>
-	</p>
+    Comment <%= activity.all_actions.to_sentence) %>
+  </p>
+
+  <p>
+    <%= truncate strip_tags(activity.body), 100 %>
+  </p>
 
   <% if activity.object -%>
     <ul>
-    	<% unless activity.object.commentable_type == 'Topic' %>
-      	<% unless activity.object.approved? -%>
-        	<li>
-						<%= link_to t(:'adva.common.approve'), admin_comment_path(activity.object, "comment[approved]" => 1, :return => true), :method => :put  %>
-					</li>
-	      <% else -%>  
-	        <li>
-						<%= link_to t(:'adva.common.unapprove'), admin_comment_path(activity.object, "comment[approved]" => 0, :return => true), :method => :put  %>
-					</li>
-	      <% end -%>
-	    <% end -%>
-	    <li>
-				<%= link_to_edit(activity.object, :url => edit_admin_comment_path(activity.object, :return => true)) %>
-				<%= link_to_delete(activity.object, :url => admin_comment_path(activity.object, :return => true)) %>
-			</li>
+      <% unless activity.object.commentable_type == 'Topic' %>
+        <% unless activity.object.approved? -%>
+          <li>
+            <%= link_to "Approve", admin_comment_path(activity.object, "comment[approved]" => 1, :return => true), :method => :put  %>
+          </li>
+        <% else -%>  
+          <li>
+            <%= link_to "Unapprove", admin_comment_path(activity.object, "comment[approved]" => 0, :return => true), :method => :put  %>
+          </li>
+        <% end -%>
+      <% end -%>
+      <li>
+        <%= link_to_edit(activity.object, :url => edit_admin_comment_path(activity.object, :return => true)) %>
+        <%= link_to_delete(activity.object, :url => admin_comment_path(activity.object, :return => true)) %>
+      </li>
     </ul>
   <% end -%>    
 </li>

data/app/views/admin/activities/_content.html.erb

@@ -7,9 +7,10 @@
   </p>
 
   <p>
-    <%= t(:'adva.activity.actions', :type => t(:"adva.activity.types.#{activity.object_attributes['type'].tableize.singularize}"),
-      :actions => activity.all_actions.collect { |a| t(:"adva.activity.action_names.#{a.downcase}") }.to_sentence,
-      :activity => (activity.section ? link_to(activity.section.title, [:admin, activity.section, :contents]) : "Deleted Section")).html_safe %>
+    <% type = activity.object_attributes['type'].tableize.singularize.titleize %>
+    <% actions = activity.all_actions.to_sentence %>
+    <% name = (activity.section ? link_to(activity.section.title, [:admin, activity.section, :contents]) : "Deleted Section").html_safe %>
+    <%= "#{type} #{actions} in #{name}." %>
   </p>
   <%= link_to_if activity.section, activity.title, [:edit, :admin, activity.section, activity.object] %>
 </li>

data/app/views/admin/activities/_topic.html.erb

@@ -4,13 +4,13 @@
     <%= link_to_activity_user(activity) %>
     <%= link_to_content(activity.object) if activity.object %>
   </p>
-  <p><%= t(:'adva.activity.topic', :actions => activity.all_actions.collect { |a| t(:"adva.activity.action_names.#{a.downcase}" }.to_sentence) %></p>
+  <p>Topic <%= activity.all_actions.to_sentence %></p>
   <p><%= truncate strip_tags(activity.title), 100 %></p>
-  
-	<% if activity.object -%>
+
+  <% if activity.object -%>
     <ul>
-			<li><%= link_to_edit(activity.object) %></li>
-			<li><%= link_to_delete(activity.object) %></li>
+      <li><%= link_to_edit(activity.object) %></li>
+      <li><%= link_to_delete(activity.object) %></li>
     </ul>
   <% end -%>    
 </li>

data/app/views/admin/install/confirmation.html.erb

@@ -1,10 +1,10 @@
-<h2><%= t(:'adva.titles.success') %></h2>
+<h2>Success!</h2>
 
 <p>
-  <%= t(:'adva.sites.install.success_fully_created') %>
+  You have successfully created your site. Enjoy!
 </p>
 
 <p>
-  <%= link_to t(:'adva.sites.links.manage_new'), admin_site_path %>
+  <%= link_to "Manage your new site &raquo;", admin_site_path %>
 </p>
 

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

@@ -1,38 +1,38 @@
-<h2><%= t(:'adva.titles.install') %></h2>
+<h2>Install Site</h2>
 
-<p><%= t(:'adva.sites.install.welcome_to_installation') %></p>
-<p><%= t(:'adva.sites.install.can_always_change_settings') %></p>
+<p>Welcome to adva-cms' less-than-one-minute installation process. Just fill in the information below and you're done.</p>
+<p>Don't worry. You can always change these settings later.</p>
 
 <%= form_for Site.new, url: admin_install_path do |f| %>
-  <h3><%= t(:'adva.titles.website') %></h3>
+  <h3>Website</h3>
   <% f.field_set :site do %>
     <%= fields_for @site do |site| %>
       <%= site.text_field :name, label: true %>
     <% end %>
   <% end %>
 
-  <h3><%= t(:'adva.titles.home_section') %></h3>
-	<% f.field_set :home_section do %>
+  <h3>Home Section</h3>
+  <% f.field_set :home_section do %>
     <%= fields_for :section, @section do |section| %>
       <p>
-      	<%= section.text_field :title, label: true %>
+      <%= section.text_field :title, label: true %>
       </p>
     <% end %>
   <% end %>
-  
-  <h3><%= t(:'adva.titles.admin_account') %></h3>
-	<% f.field_set :admin_account do %>
+
+  <h3>Admin Account</h3>
+  <% f.field_set :admin_account do %>
     <%= fields_for @user do |user| %>
       <p>
-        <%= user.email_field :email, label: true %>
+      <%= user.email_field :email, label: true %>
       </p>
       <p>
-        <%= user.password_field :password, label: true %>
+      <%= user.password_field :password, label: true %>
       </p>
     <% end %>
   <% end %>
-  
+
   <% f.buttons do %>
-    <%= submit_tag t(:'adva.sites.links.create_site_and_account') %>
+    <%= submit_tag "Create site and account" %>
   <% end %>
 <% end %>

data/app/views/admin/page/articles/_form.html.erb

@@ -1,40 +1,43 @@
 <!-- HACK: empty line must be here for split_form_for to work properly -->
 <fieldset>
   <div class="col">
-	  <%= hidden_field_tag 'cl', Article.locale %>
-		
-    <p>
-      <%= f.text_field :title, :class => 'big', :label => "Title", style: "float: none" %>
-    </p>
+    <%= hidden_field_tag 'cl', Article.locale %>
+
+    <p><%= f.text_field :title, class: 'big', label: "Title", style: "float: none" %></p>
 
-	  <p id="article_excerpt_wrapper" style="<%= @article.has_excerpt? ? "" : "display:none" %>">
-	    <label for="article_excerpt">
-	      <%= t(:'adva.articles.attributes.excerpt') %>
-	      <span class="inline" id="hide_excerpt_hint">(<%= link_to t(:'adva.common.hide'), '#', :id => 'hide_excerpt' %>)</span>
-	    </label>
-	    <%= f.text_area :excerpt, :class => 'wysiwyg' %>
-	  </p>
+    <input id="toggle_excerpt" type="checkbox" <%= "checked" if @article.has_excerpt? %>>
+
+    <p class="show-if-previous-checked">
+      <label for="article_excerpt">
+        Excerpt
+        <span>(<%= link_to "Hide", '#', onclick: 'document.getElementById("toggle_excerpt").checked = false; return false' %>)</span>
+      </label>
+      <%= f.text_area :excerpt, class: 'wysiwyg' %>
+    </p>
 
-    <p>
+    <p class="show-if-previous-unchecked">
+      <label for="article_body" style="display: inline">Body</label>
+      <span>(<%= link_to "Add an excerpt", '#', onclick: 'document.getElementById("toggle_excerpt").checked = true; return false' %>)</span>
+    </p>
+    <p class="show-if-previous-checked">
       <label for="article_body" style="display: inline">Body</label>
-      <span id="add_excerpt_hint">(<%= link_to t(:'adva.articles.excerpt_add'), '#', :id => 'add_excerpt' %>)</span>
     </p>
 
-    <%= f.text_area :body, :class => editor_class_for(@article) %>
+    <%= f.text_area :body, class: editor_class_for(@article) %>
   </div>
 </fieldset>
 
-<%= render :partial => 'options', :locals => { :f => f } %>
+<%= render 'options', f: f %>
 
 <%= content_for :sidebar do %>
-  <%= f.label :draft, t(:'adva.articles.question_save_as_draft') %>
-  <%= f.check_box :draft?, :id => 'toggle_draft', :label => :'adva.articles.confirm_save_as_draft' %>
-
-  <p id="publish_date_wrapper" style="<%= @article.draft? ? "display:none" : "" %>">
-    <%= f.label :published_at, t(:'adva.articles.publish_on_date') %>
-    <%= f.datetime_select :published_at,
-                          :start_year => (@article.published_at || Time.zone.now).year-1,
-                          :end_year => (Time.zone.now.year + 5),
-                          :order => [:month, :day, :year] %>
+  <%= f.label :draft, "Save as Draft?" %>
+  <%= f.check_box :draft?, label: "Yes, save this article as a draft" %>
+
+  <p class=".show-if-previous-unchecked">
+  <%= f.label :published_at, "Publish on this date" %>
+  <%= f.datetime_select :published_at,
+    start_year: (@article.published_at || Time.zone.now).year-1,
+    end_year: (Time.zone.now.year + 5),
+    order: [:month, :day, :year] %>
   </p>
 <% end %>

data/app/views/admin/page/articles/_options.html.erb

@@ -3,17 +3,16 @@
     f.tabs do
       f.tab :options do
         html = (@section.try(:single_link_mode) ? '' : f.text_field(:permalink, :label => true)).html_safe
-        html << f.text_field(:tag_list, :label => true, :hint => :'adva.hints.tags')
+        html << f.text_field(:tag_list, label: true, hint: "Enter one or more tags separated by a space. You may include spaces by enclosing a tag with quotes. (For example, <em>\"Web Dev\" Tutorials</em>).")
 
         if @categories.present?
           if !(@section.try(:single_link_mode) ? @section.single_link_mode : false)
-            html << %(<label>#{t(:'adva.titles.publish_in_categories')}</label>).html_safe +
+            html << %(<label>Publish in Categories</label>).html_safe +
               render(:partial => 'categories/checkboxes', :locals => { :categories => @categories, :content => @article })
           end
         end
 
-        html << f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter', :hint => :'adva.hints.filter') +
-          f.select(:author_id, author_options(@site.users), { :selected => author_selected(@article) }, :label => true)
+        html << f.select(:author_id, author_options(@site.users), { :selected => author_selected(@article) }, :label => true)
       end
     end
   end

data/app/views/admin/page/articles/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t(:'adva.articles.titles.edit') %></h2>
+<h2>Edit Article</h2>
 
 <%= split_form_for @article, :url => [:admin, @section, @article], :html => {:multipart => true, :method => :put} do |f| -%>
   <%= f.hidden_field :updated_at, :value => @article.updated_at %>
@@ -7,8 +7,8 @@
   <%= content_for :sidebar do %>
     <div id="save">
       <p class="buttons">
-        <%= submit_tag t(:'adva.common.save'), :name => 'save_revision' %>
-        <%= link_to t(:'adva.common.cancel'), [:admin, @section, :articles] %>
+        <%= submit_tag "Save", name: "save_revision" %>
+        <%= link_to "Cancel", [:admin, @section, :articles] %>
       </p>
     </div>
   <% end %>

data/app/views/admin/page/articles/new.html.erb

@@ -1,12 +1,12 @@
-<h2><%= t(:'adva.articles.titles.new', :content_locale => Article.locale) %></h2>
+<h2>New article</h2>
 
-<%= split_form_for @article, :as => :article, :url => [:admin, @section, :articles], :html => {:multipart => true, :id => 'content_form'} do |f| -%>
+<%= split_form_for @article, as: :article, url: [:admin, @section, :articles], html: { multipart: true, id: 'content_form' } do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>
 
   <%= content_for :sidebar do %>
     <div id="save">
-      <%= submit_tag t(:'adva.common.save'), :name => 'save_revision' %>
-      <%= link_to t(:'adva.common.cancel'), [:admin, @section, :articles] %>
+      <%= submit_tag "Save", :name => 'save_revision' %>
+      <%= link_to "Cancel", [:admin, @section, :articles] %>
     </div>
   <% end %>
 <% end %>

data/app/views/admin/page/categories/edit.html.erb

@@ -1,20 +1,20 @@
 <%= content_for :sidebar do %>
-	<p class="hint text_only large padded">
-		<%= t :'adva.categories.hints.parent_setting_for_edit' %>
-	</p>
+  <p class="hint text_only large padded">
+  You can use the reorder button on the index page of categories to nest and reorder your categories, you can find further instructions for this on the index page help hints.
+  </p>
 <% end %>
 
-<h2><%= t(:'adva.categories.titles.edit') %></h2>
+<h2>Edit Category</h2>
 
 <%= form_for [:admin, @section, @category] do |f| %>
-	<% f.field_set do %>
+  <% f.field_set do %>
     <div class="col">
-      <%= f.text_field :title, :label => true, :hint => :'adva.hints.categories' %>
-		</col>
+      <%= f.text_field :title, label: true, hint: "Avoid names countaining only 4 or 2 digits!" %>
+    </div>
 
     <div class="col">
-      <%= f.text_field :permalink, :label => true, :hint => :'adva.categories.hints.permalink' %>
-		</col>
+      <%= f.text_field :permalink, label: true, hint: "You can use normal letters and special letters like scandinavian letters but avoid special characters like $%&!" %>
+    </div>
   <% end %>
 
   <% save_or_cancel_links f, cancel_url: [:admin, @section, :categories] %>

data/app/views/admin/page/categories/index.html.erb

@@ -1,23 +1,23 @@
 <%= content_for :sidebar do %>
-	<p class="hint text_only large padded">
-		<%= t(:'adva.categories.hints.reorder')%>
-	</p>
+  <p class="hint text_only large padded">
+    You can use the reorder option to reorder your categories. If you want to nest your categories you can drag the category to the right and its gets set as a child of the upper category. Finish the reordering by clicking the reorder button. Please note that this option is only available when you have 2 or more categories.
+  </p>
 <% end %>
 
 <%=
-	table_for @section.categories, :class => 'categories list tree' do |t|
-		t.column :category, :actions
+  table_for @section.categories, :class => 'categories list tree' do |t|
+    t.column :category, :actions
 
-		t.row do |r, category|
-			r.add_class "level_#{category.level}"
-			r.cell link_to(category.title, [:edit, :admin, @section, category], class: 'category')
-			r.cell link_to("Edit category", [:edit, :admin, @section, category], class: 'edit') + "\n" +
-             link_to("Delete category", [:admin, @section, category], method: :delete, class: "delete", data: { confirm: "Are you sure you want to delete this category?" })
-		end
+    t.row do |r, category|
+      r.add_class "level_#{category.level}"
+      r.cell link_to(category.title, [:edit, :admin, @section, category], class: 'category')
+      r.cell link_to("Edit category", [:edit, :admin, @section, category], class: 'edit') + "\n" +
+        link_to("Delete category", [:admin, @section, category], method: :delete, class: "delete", data: { confirm: "Are you sure you want to delete this category?" })
+    end
 
-		t.empty :p, :class => 'empty' do
-	    t(:'adva.categories.no_categories_in_section', :section => @section.title) + "\n" +
-			link_to(t(:'adva.categories.links.create_now'), [:new, :admin, @section, :category])
-		end
-	end
+    t.empty :p, :class => 'empty' do
+      "There are no categories in #{@section.title}\n" +
+        link_to("Create one now &raquo;", [:new, :admin, @section, :category])
+    end
+  end
 %>

data/app/views/admin/page/categories/new.html.erb

@@ -1,15 +1,17 @@
-<h2><%= t(:'adva.categories.titles.new') %></h2>
+<h2>New Category</h2>
 
 <%= form_for [:admin, @section, @category] do |f| %>
   <fieldset>
     <div class="col">
-      <%= f.text_field :title, :label => true, :hint => :'adva.hints.categories' %>
+      <%= f.text_field :title, label: true, hint: "Avoid names countaining only 4 or 2 digits!" %>
     </div>
 
     <% unless @section.categories.size < 2 %>
       <div class="col">
         <%= f.select :parent_id, @section.categories.collect {|p| [p.title, p.id] unless p == @category }.compact, { :include_blank => true, :label => true } %>
-        <span class="hint" for="category_parent_id"><%= t :'adva.categories.hints.parent_setting' %></span>
+        <span class="hint" for="category_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>
       </div>
     <% end %>
   </fieldset>

data/app/views/admin/page/contents/index.html.erb

@@ -11,30 +11,15 @@
       r.add_class "level_#{content.level}"
       r.cell content_status(content) + " " + link_to(content.title, [:edit, :admin, @section, content], :class => content.state)
       r.cell content.category_titles.join(", ") if @section.categories.any?
-      r.cell content.accept_comments? && content.comments.present? ? link_to(content.comments.size, admin_comments_path) : t(:"adva.common.none") if defined?(Comment)
+      r.cell content.accept_comments? && content.comments.present? ? link_to(content.comments.size, admin_comments_path) : "None" if defined?(Comment)
       r.cell published_at_formatted(content)
       r.cell link_to("Edit", [:edit, :admin, @section, content], :class => "edit content") +
         link_to("Delete", [:admin, @section, content], method: :delete, class: "delete content", data: { confirm: "Are you sure you want to delete this content?" })
     end
 
     t.empty :p, :class => 'empty' do
-      raw params[:filters] ?
-        t(:'adva.content.no_filtered_contents') :
-        t(:'adva.contents.no_contents', :section => @section.title) + "\n" +
-        link_to(t(:'adva.contents.links.create_now'), [:new, :admin, @section, :content])
+      raw "There are no contents in #{@section.title}. " +
+        link_to("Create one now", [:new, :admin, @section, :content])
     end
   end
 %>
-
-<%= content_for :sidebar do -%>
-  <!--
-  <div class="tabs">
-    <ul>
-      <li class="active"><a href="#filters" onclick="return false;">Filters</a></li>
-    </ul>
-    <div class="tab active" id="tab_filters">
-      <%= filter_for(Article, :categories => @section.categories) %>
-    </div>
-  </div>
-  -->
-<% end -%>

data/app/views/admin/page/links/_form.html.erb

@@ -1,26 +1,26 @@
 <!-- HACK: empty line must be here for split_form_for to work properly -->
 <fieldset>
   <div class="col">
-	  <%= hidden_field_tag 'cl', Article.locale %>
-		
-	  <%= f.text_field :title, :class => 'big', :label => true  %>
+    <%= hidden_field_tag 'cl', Article.locale %>
 
-	  <label for="link_body">
-	    <%= t(:'adva.links.write_link') %>
-	  </label>
-	  <%= f.text_field :body, :class => 'big' %>
+    <%= f.text_field :title, class: 'big', label: true %>
 
-	  <%= f.label :draft, t(:'adva.links.question_save_as_draft') %>
-	  <%= f.check_box :draft?, :id => 'toggle_draft', :label => :'adva.links.confirm_save_as_draft' %>
+      
+    <label for="link_body">Enter the link address</label>
+    <%= f.text_field :body, class: 'big' %>
 
-	  <p id="publish_date_wrapper" style="<%= @link.draft? ? "display:none" : "" %>">
-	    <%= f.label :published_at, t(:'adva.links.publish_on_date') %>
-	    <%= f.datetime_select :published_at,
-	                          :start_year => (@link.published_at || Time.zone.now).year-1,
-	                          :end_year => (Time.zone.now.year + 5),
-	                          :order => [:month, :day, :year] %>
-		</p>
+    <%= f.label :draft, "Save as Draft?" %>
+    <%= f.check_box :draft?, id: 'toggle_draft', label: "Yes, save this link as a draft" %>
+
+    <p class="show-if-previous-unchecked">
+      <%= f.label :published_at, "Publish on this date" %>
+      <%= f.datetime_select :published_at,
+        start_year: (@link.published_at || Time.zone.now).year-1,
+        end_year: (Time.zone.now.year + 5),
+        order: [:month, :day, :year] %>
+    </p>
   </div>
 </fieldset>
 
-<%= render :partial => 'options', :locals => { :f => f } %>
+<%= render 'options', f: f %>
+

data/app/views/admin/page/links/_options.html.erb

@@ -1,23 +1,20 @@
 <%=
-	content_for :sidebar do
-		f.tabs do
-		  f.tab :options do
-		    # html = label_tag(:content_locale, t(:'adva.common.locale')) +
-		    #         %(<select id="content_locale" name="cl">#{options_for_select I18n.available_locales, Article.locale}</select>) +
-		    html = (@section.try(:single_link_mode) ? '' : f.text_field(:permalink, :label => true)) +
-								%(<p class="hint" for="content_locale">#{t(:'adva.hints.locale')}</p>).html_safe +
-		            f.text_field(:tag_list, :label => true, :hint => :'adva.hints.tags')
+  content_for :sidebar do
+    f.tabs do
+      f.tab :options do
+        html = (@section.try(:single_link_mode) ? '' : f.text_field(:permalink, label: true)) +
+          f.text_field(:tag_list, label: true, hint: "Enter one or more tags separated by a space. You may include spaces by enclosing a tag with quotes. (For example, <em>\"Web Dev\" Tutorials</em>).")
 
-			  	if @categories.present?
-				 		if !(@section.try(:single_link_mode) ? @section.single_link_mode : false)
-		  	  		html << %(<label>#{t(:'adva.titles.publish_in_categories')}</label>) +
-		  	          render(:partial => 'categories/checkboxes', :locals => { :categories => @categories, :content => @link })
-						end
-		  	end
+        if @categories.present?
+          if !(@section.try(:single_link_mode) ? @section.single_link_mode : false)
+      
+            html << %(<label>Publish in these categories</label>) +
+              render(:partial => 'categories/checkboxes', :locals => { :categories => @categories, :content => @link })
+          end
+        end
 
-		    html << f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter', :hint => :'adva.hints.filter') +
-		            f.select(:author_id, author_options(@site.users), { :selected => author_selected(@link) }, :label => true)
-		  end
-		end
-	end
+        html << f.select(:author_id, author_options(@site.users), { :selected => author_selected(@link) }, :label => true)
+      end
+    end
+  end
 %>

data/app/views/admin/page/links/edit.html.erb

@@ -1,12 +1,12 @@
-<h2><%= t(:'adva.links.titles.edit') %></h2>
+<h2>Edit Link</h2>
 
 <%= split_form_for @link, :as => :link, :url => [:admin, @section, @link] do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>  
 
   <%= content_for :sidebar do %>
     <div id="save">
-      <%= submit_tag t(:'adva.common.save'), :name => 'save_revision' %>
-      <%= link_to t(:'adva.common.cancel'), [:admin, @section, :contents] %>
+      <%= submit_tag "Save", name: 'save_revision' %>
+      <%= link_to "Cancel", [:admin, @section, :contents] %>
     </div>
   <% end %>
 <% end -%>

data/app/views/admin/page/links/new.html.erb

@@ -1,12 +1,12 @@
-<h2><%= t(:'adva.links.titles.new', :content_locale => Article.locale) %></h2>
+<h2>New Link</h2>
 
 <%= split_form_for @link, :as => :link, :url => [:admin, @section, :links] do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 
   <%= content_for :sidebar do %>
     <div id="save">
-      <%= submit_tag t(:'adva.common.save'), :name => 'save_revision' %>
-      <%= link_to t(:'adva.common.cancel'), [:admin, @section, :contents] %>
+      <%= submit_tag "Save", :name => 'save_revision' %>
+      <%= link_to "Cancel", [:admin, @section, :contents] %>
     </div>
   <% end %>
 <% end %>

data/app/views/admin/sections/_form.html.haml

@@ -1,19 +1,19 @@
 = content_for :sidebar do
   %p.hint.text_only.large.padded
-    = t :'adva.sections.hints.parent_setting_for_edit'
+    You can use the reorder button on the index page of sections to nest and reorder your sections, you can find further instructions for this on the index page help hints.
 
-%h2= t(:'adva.titles.general_settings')
+%h2 General Settings
 
 %fieldset
   .col
     = f.text_area :title, :label => "Title"
     %p
-      %label{:for => "published"}= t(:'adva.sections.titles.publish')
-      %span.hint{:for => "published"}= t :'adva.sections.hints.publish'
+      %label(for="published") Publish option
+      %span.hint(for="published") Uncheck this if you don't want this section published.
       = f.check_box :published, :label => true
     %p= f.check_box :hidden_on_global_nav, :label => true
 
   .col
-    = f.text_field :permalink, :label => true, :hint => :'adva.sections.hints.permalink'
+    = f.text_field :permalink, label: true, hint: "You can use normal letters and special letters like scandinavian letters but avoid special characters like $%&!"
 
 = render :partial => "admin/sections/settings/#{@section.type.underscore}", :locals => { :f => f }

data/app/views/admin/sections/edit.html.haml

@@ -2,5 +2,5 @@
   = render :partial => 'form', :locals => {:f => f}
 
   %p.buttons
-    = submit_tag t(:'adva.common.save'), :name => 'save_revision'
-    = link_to t(:'adva.common.cancel'), [:admin, :sections]
+    = submit_tag "Save", :name => 'save_revision'
+    = link_to "Cancel", [:admin, :sections]