publify_core 9.0.0.pre5 → 9.2.0

data/app/views/admin/settings/feedback.html.erb

@@ -1,115 +1,107 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-    <%= t(".feedback_settings") %>
+    <%= t('.feedback_settings') %>
   </h2>
 <% end %>
 
 <%= form_tag action: 'update' do %>
   <fieldset class='form-horizontal'>
-    <legend><%= t(".feedback")%></legend>
+    <legend><%= t('.feedback') %></legend>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".comments") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.comments') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <div class='checkbox'>
           <label for="setting_default_allow_comments">
             <%= check_box(:setting, :default_allow_comments) %>
-            <%= t(".enable_comments_by_default") %>
+            <%= t('.enable_comments_by_default') %>
           </label>
         </div>
         <div class='checkbox'>
-          <label for="setting_default_moderate_comments"><%= t(".enable_feedback_moderation") %>
-          <%= check_box(:setting, :default_moderate_comments) %>
+          <label for="setting_default_moderate_comments">
+            <%= check_box(:setting, :default_moderate_comments) %>
+            <%= t('.enable_feedback_moderation') %>
           </label>
-          <small class='help-block'><%= t(".explain_feedback_moderation") %></small>
+          <small class='help-block'><%= t('.explain_feedback_moderation') %></small>
         </div>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".trackbacks") %></label>
-      <div class='col-sm-5'>
-        <div class='checkbox'>
-          <label for="setting_default_allow_pings">
-            <%= check_box(:setting, :default_allow_pings) %>
-            <%= t(".enable_trackbacks_by_default") %>
-          </label>
-        </div>
-        <div class='checkbox'>
-          <label for="setting_global_pings_disable">
-            <%= check_box(:setting, :global_pings_disable) %>
-            <%= t(".disable_trackbacks_sitewide") %>
-          </label>
-          <small class='help-block'><%= t(".explain_disable_trackbacks") %></small>
-        </div>
-      </div>
-    </div>
-    <div class='form-group'>
-      <label class='control-label col-sm-2' for="comment_text_filter"><%= t(".comments_filter") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="comment_text_filter"><%= t('.comments_filter') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <select name="setting[comment_text_filter]" id="comment_text_filter" class='form-control'>
-          <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
+          <%= options_for_select text_filter_options, this_blog.comment_text_filter %>
         </select>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_plugin_avatar"><%= t(".avatars_provider") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_plugin_avatar"><%= t('.avatars_provider') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <select name="setting[plugin_avatar]" id="setting_plugin_avatar" class='form-control'>
-          <%= options_for_select plugin_options(:avatar).push([t(".none"),'']), this_blog.plugin_avatar %>
+          <%= options_for_select plugin_options(:avatar).push([t('.none'), '']), this_blog.plugin_avatar %>
         </select>
       </div>
     </div>
   </fieldset>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t(".spam") %></legend>
+    <legend><%= t('.spam') %></legend>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".spam_protection") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.spam_protection') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <div class='checkbox'>
-          <label for="setting_sp_global"><%= t(".enable_spam_protection")%>
-          <%= check_box(:setting, :sp_global) %>
+          <label for="setting_sp_global">
+            <%= check_box(:setting, :sp_global) %>
+            <%= t('.enable_spam_protection') %>
           </label>
-          <small class='help-block'><%= t(".explain_spam_protection") %>.</small>
+          <small class='help-block'><%= t('.explain_spam_protection') %>.</small>
         </div>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_sp_akismet_key"><%= t(".askimet_key") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :sp_akismet_key, {:class => 'form-control'}) %>
-        <small class='help-block'><%= t(".explain_spamfiltering_html") %>.</small>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_akismet_key"><%= t('.askimet_key') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :sp_akismet_key, class: 'form-control') %>
+        <small class='help-block'><%= t('.explain_spamfiltering_html') %>.</small>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_sp_article_auto_close"><%= t(".disable_comments_after") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :sp_article_auto_close, {:size => 4, :class => 'form-control'}) %>
-      </div>
-      <div class='pull-left'>
-        <span class='help-block'><%= t(".days") %></span>
-      </div>
-      <div class='col-sm-10'>
-        <small class='help-block'><%= t(".set_to_0_to_never_disable_comments") %>.</small>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_article_auto_close"><%= t('.disable_comments_after') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <div class="row">
+          <div class='col-sm-3 col-md-2 col-lg-3'>
+            <%= text_field(:setting, :sp_article_auto_close, size: 4, class: 'form-control') %>
+          </div>
+          <div class='col-sm-9 col-md-10 col-lg-9'>
+            <span class='help-block'><%= t('.days') %></span>
+          </div>
+          <div class='col-sm-12'>
+            <small class='help-block'><%= t('.set_to_0_to_never_disable_comments') %>.</small>
+          </div>
+        </div>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_sp_url_limit"><%= t(".max_links") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :sp_url_limit, {:size => 4, :class => 'form-control'}) %>
-      </div>
-      <div class='col-md-offset-2 col-sm-10'>
-        <small class='help-block'><%= t(".explain_reject_comments")%>. <%= t(".set_to_0_to_never_reject_comments") %>.</small>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_sp_url_limit"><%= t('.max_links') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <div class="row">
+          <div class='col-sm-3 col-md-2 col-lg-3'>
+            <%= text_field(:setting, :sp_url_limit, size: 4, class: 'form-control') %>
+          </div>
+          <div class='col-sm-12'>
+            <small class='help-block'><%= t('.explain_reject_comments') %>. <%= t('.set_to_0_to_never_reject_comments') %>.</small>
+          </div>
+        </div>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".captcha") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.captcha') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <div class='checkbox'>
-          <label for="setting_use_recaptcha"><%= t(".enable_recaptcha") %>
-          <%= check_box(:setting, :use_recaptcha) %>
+          <label for="setting_use_recaptcha">
+            <%= check_box(:setting, :use_recaptcha) %>
+            <%= t('.enable_recaptcha') %>
           </div>
-          <small class='help-block'><%= t(".remember_to_set_your_recaptcha") %></small>
+          <small class='help-block'><%= t('.remember_to_set_your_recaptcha') %></small>
         </label>
       </div>
     </div>
@@ -117,9 +109,9 @@
 
   <%= hidden_field_tag 'from', 'feedback' %>
   <div class='form-group'>
-    <hr>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
-    <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
+    <hr />
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
+    <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
   </div>
 <% end %>

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

@@ -1,73 +1,72 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-    <%= t(".general_settings") %>
+    <%= t('.general_settings') %>
   </h2>
 <% end %>
 
-<%= form_tag :action => 'update' do %>
+<%= form_tag action: 'update' do %>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t(".your_blog")%></legend>
+    <legend><%= t('.your_blog') %></legend>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_blog_name"><%= t(".blog_name") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :blog_name, {:class => 'form-control', :size => this_blog.blog_name.length }) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_name"><%= t('.blog_name') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :blog_name, class: 'form-control', size: this_blog.blog_name.length) %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_blog_subtitle"><%= t(".blog_subtitle") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :blog_subtitle, {:class => 'form-control', :size => this_blog.blog_subtitle.length}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_blog_subtitle"><%= t('.blog_subtitle') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :blog_subtitle, class: 'form-control', size: this_blog.blog_subtitle.length) %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_base_url"><%= t(".blog_url") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :base_url, {:size => this_blog.base_url.length, :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_base_url"><%= t('.blog_url') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :base_url, size: this_blog.base_url.length, class: 'form-control') %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_lang"><%= t(".language") %></label>
-      <div class='col-sm-5'>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_lang"><%= t('.language') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
         <select name="setting[lang]" id='setting_lang' class='form-control'>
-          <% langs = Hash[PublifyCore::Lang::LIST.map{|l| [t("langs.#{l}"), l]}]%>
+          <% langs = Hash[PublifyCore::Lang::LIST.map { |l| [t("langs.#{l}"), l] }] %>
           <%= options_for_select(langs, this_blog.lang) %>
         </select>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".users") %></label>
-      <div class="col-sm-5">
+      <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.users') %></label>
+      <div class="col-sm-8 col-md-6 col-lg-4">
         <div class='checkbox'>
           <label for="setting_allow_signup">
             <%= check_box(:setting, :allow_signup) %>
-            <%= t(".allow_users_to_register")%>
+            <%= t('.allow_users_to_register') %>
           </label>
         </div>
-        <small class='help-block'><%= t(".explain_allow_users_to_register_html") %></small>
+        <small class='help-block'><%= t('.explain_allow_users_to_register_html') %></small>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_email_from"><%= t(".source_email") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :email_from, { :class => 'form-control'}) %>
-        <small class='help-block'><%= t(".email_address_used_to_notify") %></small>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_email_from"><%= t('.source_email') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :email_from, class: 'form-control') %>
+        <small class='help-block'><%= t('.email_address_used_to_notify') %></small>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_admin_display_elements"><%= t(".items_to_display_in_admin_lists") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :admin_display_elements, {:size => 4, :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_admin_display_elements"><%= t('.items_to_display_in_admin_lists') %></label>
+      <div class="col-sm-2 col-md-1">
+        <%= text_field(:setting, :admin_display_elements, size: 4, class: 'form-control') %>
       </div>
     </div>
   </fieldset>
 
   <%= hidden_field_tag 'from', 'index' %>
   <div class='form-group'>
-    <hr>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
-    <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
+    <hr />
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
+    <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
   </div>
 <% end %>

data/app/views/admin/settings/write.html.erb

@@ -1,87 +1,68 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-    <%= t(".write") %>
+    <%= t('.write') %>
   </h2>
 <% end %>
 
 <%= form_tag action: 'update' do %>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t(".publish") %></legend>
+    <legend><%= t('.publish') %></legend>
     <div class='form-group'>
-      <label class='control-label col-sm-2'><%= t(".trackbacks") %></label>
-      <div class="col-sm-5">
-        <div class='checkbox'>
-          <label for="setting_send_outbound_pings">
-            <%= check_box(:setting, :send_outbound_pings) %>
-            <%= t(".send_trackbacks") %>
-          </label>
-          <small class='help-block'><%= t(".explain") %></small>
-        </div>
-      </div>
-    </div>
-    <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_ping_urls"><%= t(".urls_to_ping") %></label>
-      <div class='col-sm-5'>
-        <%= text_area(:setting, :ping_urls, :rows => 4, :class => 'form-control') %>
-      </div>
-    </div>
-    <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_geourl_location"><%= t(".latitude_longitude") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :geourl_location, { :class => 'form-control'}) %>
-        <small class='help-block'><%= t(".display")%> <a href="http://geourl.org"><%= t(".your_geoloc") %></a> (<%= t(".example") %>: <tt>47.774,-122.201</tt>)</small>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_geourl_location"><%= t('.latitude_longitude') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :geourl_location, class: 'form-control') %>
+        <small class='help-block'><%= t('.display') %> <a href="http://geourl.org"><%= t('.your_geoloc') %></a> (<%= t('.example') %>: <tt>47.774,-122.201</tt>)</small>
       </div>
     </div>
   </fieldset>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t(".media") %></legend>
+    <legend><%= t('.media') %></legend>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_image_thumb_size"><%= t(".image_thumbnail_size") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :image_thumb_size, { :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_thumb_size"><%= t('.image_thumbnail_size') %></label>
+      <div class='col-sm-2 col-md-1'>
+        <%= text_field(:setting, :image_thumb_size, class: 'form-control') %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_image_medium_size"><%= t(".image_medium_size") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :image_medium_size, { :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_image_medium_size"><%= t('.image_medium_size') %></label>
+      <div class='col-sm-2 col-md-1'>
+        <%= text_field(:setting, :image_medium_size, class: 'form-control') %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="image_avatar_size"><%= t(".avatar_size") %></label>
-      <div class='col-sm-1'>
-        <%= text_field(:setting, :image_avatar_size, { :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="image_avatar_size"><%= t('.avatar_size') %></label>
+      <div class='col-sm-2 col-md-1'>
+        <%= text_field(:setting, :image_avatar_size, class: 'form-control') %>
       </div>
     </div>
   </fieldset>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t(".publish_on_twitter") %></legend>
+    <legend><%= t('.publish_on_twitter') %></legend>
     <% unless twitter_available?(this_blog, current_user) %>
       <%= render 'admin/shared/twitter_alert' %>
     <% end %>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_twitter_consumer_key"><%= t(".twitter_consumer_key") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :twitter_consumer_key, { :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_key"><%= t('.twitter_consumer_key') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :twitter_consumer_key, class: 'form-control') %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="setting_twitter_consumer_secret"><%= t(".twitter_consumer_secret") %></label>
-      <div class='col-sm-5'>
-        <%= text_field(:setting, :twitter_consumer_secret, { :class => 'form-control'}) %>
+      <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_twitter_consumer_secret"><%= t('.twitter_consumer_secret') %></label>
+      <div class='col-sm-8 col-md-6 col-lg-4'>
+        <%= text_field(:setting, :twitter_consumer_secret, class: 'form-control') %>
       </div>
     </div>
   </fieldset>
 
   <%= hidden_field_tag 'from', 'write' %>
   <div class='form-group'>
-    <hr>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
-    <%= submit_tag(t(".update_settings"), class: 'btn btn-success') %>
+    <hr />
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
+    <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% className = form_action.delete(:class) %>
-<%= form_tag(form_action, id: "#{form_type}_form", enctype: "multipart/form-data", class: className) do %>
-  <%= render partial: "form" %>
+<% class_name = form_action.delete(:class) %>
+<%= form_tag(form_action, id: "#{form_type}_form", enctype: 'multipart/form-data', class: class_name) do %>
+  <%= render partial: 'form' %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <nav class='navbar navbar-default navbar-fixed-top' role="navigation">
   <div class="navbar-header">
-    <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-home'), {controller: 'admin/dashboard'}, {class: "navbar-brand"} %>
+    <%= link_to t(".home"), { controller: 'admin/dashboard' }, { class: 'navbar-brand' } %>
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#sidebar-top">
       <span class="sr-only">Toggle navigation</span>
       <span class="icon-bar"></span>
@@ -18,11 +18,11 @@
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
             <%= menu_item(t('.all_articles'), admin_content_index_path) %>
-            <%= menu_item(t('.new_article'),  new_admin_content_path) %>
-            <%= menu_item(t('.feedback'),     admin_feedback_index_path) %>
-            <%= menu_item(t('.tags'),         admin_tags_path) %>
-            <%= menu_item(t('.article_types'),admin_post_types_path) %>
-            <%= menu_item(t('.redirects'),    admin_redirects_path) %>
+            <%= menu_item(t('.new_article'), new_admin_content_path) %>
+            <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
+            <%= menu_item(t('.tags'), admin_tags_path) %>
+            <%= menu_item(t('.article_types'), admin_post_types_path) %>
+            <%= menu_item(t('.redirects'), admin_redirects_path) %>
           </ul>
         </li>
       <% end %>
@@ -37,7 +37,7 @@
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
             <%= menu_item(t('.all_pages'), admin_pages_path) %>
-            <%= menu_item(t('.new_page'),  new_admin_page_path) %>
+            <%= menu_item(t('.new_page'), new_admin_page_path) %>
           </ul>
         </li>
       <% end %>
@@ -51,7 +51,7 @@
             <b class="caret"></b>
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-            <%= menu_item(t('.choose_theme'),      admin_themes_path) %>
+            <%= menu_item(t('.choose_theme'), admin_themes_path) %>
             <%= menu_item(t('.customize_sidebar'), admin_sidebar_index_path) %>
           </ul>
         </li>
@@ -64,10 +64,10 @@
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
             <%= menu_item(t('.general_settings'), admin_settings_path) %>
-            <%= menu_item(t('.write'),            write_admin_settings_path) %>
-            <%= menu_item(t('.display'),          display_admin_settings_path) %>
-            <%= menu_item(t('.feedback'),         feedback_admin_settings_path) %>
-            <%= menu_item(t('.manage_users'),     admin_users_path) %>
+            <%= menu_item(t('.write'), write_admin_settings_path) %>
+            <%= menu_item(t('.display'), display_admin_settings_path) %>
+            <%= menu_item(t('.feedback'), feedback_admin_settings_path) %>
+            <%= menu_item(t('.manage_users'), admin_users_path) %>
           </ul>
         </li>
       <% end %>
@@ -79,8 +79,8 @@
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
             <%= menu_item(t('.global_seo_settings'), admin_seo_path(section: 'general')) %>
-            <%= menu_item(t('.permalinks'),          admin_seo_path(section: 'permalinks')) %>
-            <%= menu_item(t('.titles'),              admin_seo_path(section: 'titles')) %>
+            <%= menu_item(t('.permalinks'), admin_seo_path(section: 'permalinks')) %>
+            <%= menu_item(t('.titles'), admin_seo_path(section: 'titles')) %>
           </ul>
         </li>
       <% end %>
@@ -88,32 +88,32 @@
     <ul class='nav navbar-nav pull-right'>
       <li class='dropdown'>
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-          <%= t(".logged_in_as", login: current_user.display_name) %>
+          <%= t('.logged_in_as', login: current_user.display_name) %>
           <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><%= link_to t(".profile"), { :controller => 'admin/profiles', :action => 'index'}  %></li>
+          <li><%= link_to t('.profile'), controller: 'admin/profiles', action: 'index' %></li>
           <li role="presentation" class="divider"></li>
-          <li><%= link_to t(".documentation"), "https://github.com/fdv/publify/wiki" %></li>
-          <li><%= link_to t(".report_a_bug"), "https://github.com/fdv/publify/issues" %></li>
-          <li><%= link_to t(".in_page_plugins"), "https://github.com/fdv/publify/wiki/In-Page-Plugins" %></li>
-          <li><%= link_to t(".sidebar_plugins"), "https://github.com/fdv/publify/wiki/Sidebar-plugins" %></li>
+          <li><%= link_to t('.documentation'), 'https://github.com/fdv/publify/wiki' %></li>
+          <li><%= link_to t('.report_a_bug'), 'https://github.com/fdv/publify/issues' %></li>
+          <li><%= link_to t('.in_page_plugins'), 'https://github.com/fdv/publify/wiki/In-Page-Plugins' %></li>
+          <li><%= link_to t('.sidebar_plugins'), 'https://github.com/fdv/publify/wiki/Sidebar-plugins' %></li>
           <li role="presentation" class="divider"></li>
-          <li><%= link_to t(".logout_html"), destroy_user_session_path, method: :delete %></li>
+          <li><%= link_to t('.logout_html'), destroy_user_session_path, method: :delete %></li>
         </ul>
       </li>
     </ul>
     <ul class='nav navbar-nav pull-right'>
       <li class='dropdown'>
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-          <%= t(".new")%>
+          <%= t('.new') %>
           <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><%= link_to(t(".new_article"), {controller: 'content', action: 'new'}) %></li>
-          <li><%= link_to(t(".new_page"), {controller: 'pages', actions: 'new'}) %></li>
-          <li><%= link_to(t(".new_media"), {controller: 'resources', action: 'index'}) %></li>
-          <li><%= link_to(t(".new_note"), {controller: 'notes'}) %></li>
+          <li><%= link_to(t('.new_article'), controller: 'content', action: 'new') %></li>
+          <li><%= link_to(t('.new_page'), controller: 'pages', actions: 'new') %></li>
+          <li><%= link_to(t('.new_media'), controller: 'resources', action: 'index') %></li>
+          <li><%= link_to(t('.new_note'), controller: 'notes') %></li>
         </ul>
       </li>
     </ul>