monologue 0.2.0 → 0.3.0

data/app/views/layouts/monologue/admin/_nav_bar.html.erb

@@ -1,33 +1,25 @@
 <div class="navbar">
   <div class="navbar-inner">
     <div class="container" data-monologue="nav-bar">
-      <%= link_to "Monologue", admin_path, :class => "brand" %>
+      <%= link_to "Monologue", admin_path, class: "brand" %>
       <ul class="nav pull-left" data-monologue="nav-bar-left">
-
-        <li class="<%= request.fullpath === new_admin_post_path ? "active":"" %>">
-          <%= link_to t(".add_a_monologue"), new_admin_post_path%>
-        </li>
-        <li class="<%= request.fullpath === admin_posts_path || request.fullpath === admin_path ? "active":"" %>">
-          <%= link_to t(".list_monologues"), admin_posts_path %>
-        </li>
-        <li class="<%= request.fullpath === admin_comments_path ? "active":"" %>">
-          <%= link_to t(".comments"), admin_comments_path %>
-        </li>
+        <%= activable_li_tag_with_link t(".add_a_monologue"), new_admin_post_path %>
+        <%= activable_li_tag_with_link t(".list_monologues"), admin_posts_path, admin_path %>
+        <%= activable_li_tag_with_link t(".comments"), admin_comments_path %>
       </ul>
+
       <ul class="nav pull-right" data-monologue="nav-bar-right">
+        <%= activable_li_tag_with_link t(".users"), admin_users_path %>
         <% if ActionController::Base.perform_caching %>
-          <li class="<%= request.fullpath === admin_cache_path ? "active":"" %>">
-            <%= link_to t(".cache"), admin_cache_path %>
-          </li>
+          <%= activable_li_tag_with_link t(".cache"), admin_cache_path %>
         <% end %>
         <li id="fat-menu" class="dropdown">
           <a href="#" id="settings" data-toggle="dropdown"><%= t(".settings") %> <b class="caret"></b></a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="settings">
-            <li><%= link_to t(".edit_user_info"), edit_admin_user_path(current_user)%></li>
+            <li><%= link_to t(".edit_user_info"), edit_admin_user_path(monologue_current_user)%></li>
           </ul>
         </li>
         <li><%= link_to t(".log_out"), admin_logout_path %></li>
-
       </ul>
 
     </div>

data/app/views/layouts/monologue/application.html.erb

@@ -12,7 +12,7 @@
       <%= rss_icon %>
       <h1><a href="<%= root_path %>"><%=Monologue.site_name%></a></h1>
       <h2><%=Monologue.site_subtitle%></h2>
-      <%= render :partial => "layouts/monologue/application/social_icons" %>
+      <%= render partial: "layouts/monologue/application/social_icons" %>
     </header>
 
     <div class="content twelve columns">

data/app/views/layouts/monologue/application/_fb_open_graph.html.erb

@@ -1,7 +1,7 @@
 <meta property="og:title" content="<%= monologue_accurate_title %>"/>
 <meta property="og:type" content="<%= controller.action_name == "show" ? "article" : "blog" %>"/>
-<meta property="og:url" content="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>"/>
+<meta property="og:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"/>
 <meta property="og:site_name" content="<%= Monologue.site_name %>"/>
 <% if Monologue.facebook_logo%>
    <meta property="og:image" content="<%= absolute_image_url(image_path(Monologue.facebook_logo)) %>" />
-<% end  %>
+<% end  %>

data/app/views/layouts/monologue/application/_sidebar.html.erb

@@ -1,5 +1,7 @@
+<% if Monologue.sidebar %>
 <aside class="sidebar four columns">
    <% Monologue.sidebar.each do |ext| %>
-     <%= render :partial => "monologue/sidebar/#{ext}" %>
+     <%= render partial: "monologue/sidebar/#{ext}" %>
    <% end %>
 </aside>
+<% end %>

data/app/views/layouts/monologue/application/_twitter_cards.html.erb

@@ -2,6 +2,6 @@
 <% if Monologue.twitter_username %>
   <meta name="twitter:site" content="<%= Monologue.twitter_username %>">
 <% end %>
-<meta name="twitter:url" content="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>">
+<meta name="twitter:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>">
 <meta name="twitter:title" content="<%= monologue_accurate_title %>">
-<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description  %>">
+<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description  %>">

data/app/views/monologue/admin/cache/_config.html.erb

@@ -1,5 +1,5 @@
 <h1>Current config</h1>
-<p>Want to know more about those configs? See here: <%= link_to "Configure Monologue's cache (english only)", "https://github.com/jipiboily/monologue/wiki/Configure-Monologue's-cache", :target => "_blank" %></p>
+<p>Want to know more about those configs? See here: <%= link_to "Configure Monologue's cache (english only)", "https://github.com/jipiboily/monologue/wiki/Configure-Monologue's-cache", target: "_blank" %></p>
 
 <div class="alert alert-<%= ActionController::Base.perform_caching ? "success" : "error" %>">
   ActionController::Base.perform_caching = <%= ActionController::Base.perform_caching %>

data/app/views/monologue/admin/cache/show.html.erb

@@ -5,7 +5,7 @@
 <hr>
 
 <h2><%= t(".delete") %></h2>
-<%= link_to t(".delete"), admin_cache_path, :data => {:confirm => t(".confirm")}, :method => :delete, :class => "btn btn-large btn-danger" %>
+<%= link_to t(".delete"), admin_cache_path, data: {confirm: t(".confirm")}, method: :delete, class: "btn btn-large btn-danger" %>
 
 <hr>
 

data/app/views/monologue/admin/posts/_form.html.erb

@@ -1,17 +1,31 @@
 <%= post.error_messages %>
-<%= post.fields_for @revision do |revision| %>
-  <%= revision.text_field :title, :label =>  t(".title"), :class =>  "span6" %>
-  <%= revision.text_area :content, :label =>  t(".content"), :class =>  "span12 ckeditor" %>
-  <%= revision.text_field :url, :label =>  raw(sprintf(t(".url.caption"), "#{DateTime.now.year}/#{t(".url.generated_title")}",monologue.root_path)) %>
-  <%= revision.text_field :published_at, :label =>  t(".published_at"), :data => {:datepicker => "datepicker"}, :value => revision.object.published_at.nil? ? "" : revision.object.published_at.strftime("%Y-%m-%d") %>
-<% end %>
+<%= post.text_field :title, label:  t(".title"), class:  "span6" %>
+<%= post.text_area :content, label:  t(".content"), class:  "span12 ckeditor", id: "post_content" %>
+<%= post.text_field :url, label:  raw(t(".url.caption", default_url: "#{DateTime.now.year}/#{t(".url.generated_title")}", root: monologue.root_path)) %>
+<%= post.text_field :published_at, label:  t(".published_at"), data: {datepicker: "datepicker"}, value: post.object.published_at.nil? ? "" : post.object.published_at.strftime("%Y-%m-%d") %>
+<%= post.text_field :tag_list, label:  raw(t(".tags")) %>
+<%= post.check_box :published, label:  t(".published") %>
 
-<%= post.text_field :tag_list, :label =>  raw(t(".tags")),  :value => tag_list_for(post.object.tags)%>
-<%= post.check_box :published, :label =>  t(".published") %>
-<%= post.submit t(".save"), :class =>  "btn btn-large btn-primary" %> <a href="<%= @revision.full_url %>" target="_blank" class="btn btn-large"><%= t(".preview") %></a>
+<div class="form-actions">
+  <%= post.button t(".save"), class:  "btn btn-large btn-primary" %> 
+  <%= post.button t(".preview"), class: "btn btn-large", type: "button", value: "preview"%>
+</div>
+
+<div class="post-preview modal-backdrop hide" data-url="<%=admin_post_preview_url%>" data-toggle="post-preview" data-trigger="button[value='preview']">
+  <div class="post-preview-inner">
+    <div class="navbar pull-right">
+      <div class="navbar-inner">
+        <span class="brand"><%=t(".preview")%></span> 
+        <a class="btn btn-primary pull-right" data-dismiss="post-preview"><%=t(".close")%></a>
+      </div>
+    </div>
+  </div>
+  <iframe src="" name="preview"></iframe>
+</div>
 
 <script>
   if($.fn.datepicker.defaults_<%= I18n.locale %>){
     $.fn.datepicker.defaults = $.fn.datepicker.defaults_<%= I18n.locale %>;
   }
+  $("#post_tag_list").select2({tags: <%= Monologue::Tag.all.map{|t| t.name }.to_json.html_safe %> });
 </script>

data/app/views/monologue/admin/posts/edit.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t(".header") %> "<%= @post.active_revision.title %>"</h1>
-<%= monologue_admin_form_for ["admin", @post], :method => :put do |post| %>
-  <%= render :partial => 'form', :locals => {:post => post} %>
+<h1><%= t(".header") %> "<%= @post.title %>"</h1>
+<%= monologue_admin_form_for ["admin", @post], method: :put do |post| %>
+  <%= render partial: 'form', locals: {post: post} %>
 <% end %>

data/app/views/monologue/admin/posts/index.html.erb

@@ -3,6 +3,7 @@
     <tr>
       <th><%= t(".title")%></th>
       <th><%= t(".status")%></th>
+      <th><%= t(".author")%></th>
       <th></th>
       <th></th>
     </tr>
@@ -10,10 +11,11 @@
   <tbody>
     <% @posts.each do |post|%>
       <tr>
-        <td><%= link_to post.posts_revisions.last.title, edit_admin_post_path(post) %></td>
+        <td><%= link_to post.title, edit_admin_post_path(post) %></td>
         <td><span class="label label-<%= post.published ? "success" : "important" %>"><%= post.published ? t(".published") : t(".not_published") %></span></td>
-        <td><%= link_to t(".edit"), edit_admin_post_path(post), :class => "btn btn-small" %></td>
-        <td><%= link_to t(".delete"), ["admin", post],:data => {:confirm => 'Are you sure?'}, :method => :delete, :class => "btn btn-small btn-danger" %></td>
+        <td><span><%= post.user.name %></span> </td>
+        <td><%= link_to t(".edit"), edit_admin_post_path(post), class: "btn btn-small" %></td>
+        <td><%= link_to t(".delete"), [:admin, post],data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-danger" %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/monologue/admin/posts/new.html.erb

@@ -1,4 +1,4 @@
 <h1><%= t(".header") %></h1>
 <%= monologue_admin_form_for ["admin", @post] do |post| %>
-  <%= render :partial => 'form', :locals => {:post => post} %>
+  <%= render partial: 'form', locals: {post: post} %>
 <% end %>

data/app/views/monologue/admin/sessions/new.html.erb

@@ -9,5 +9,5 @@
     <%= label_tag :password, t(".password") %>
     <%= password_field_tag :password %>
   </div>
-  <div class="actions"><%= submit_tag t(".button"), :class => "btn btn-large btn-primary" %></div>
+  <div class="actions"><%= submit_tag t(".button"), class: "btn btn-large btn-primary" %></div>
 <% end %>

data/app/views/monologue/admin/users/_form.html.erb

@@ -0,0 +1,5 @@
+<%= user.error_messages %>
+<%= user.text_field :name, label:  t(".name"), class:  "span6" %>
+<%= user.text_field :email, label:  t(".email"), class:  "span6" %>
+<%= user.password_field :password, label:  t(".password"), class:  "span6" %>
+<%= user.password_field :password_confirmation, label:  t(".password_confirmation"), class:  "span6" %>

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

@@ -1,9 +1,5 @@
 <h1><%= t(".header") %></h1>
-<%= monologue_admin_form_for ["admin", @user], :method => :put do |user| %>
-  <%= user.error_messages %>
-  <%= user.text_field :name, :label =>  t(".name"), :class =>  "span6" %>
-  <%= user.text_field :email, :label =>  t(".email"), :class =>  "span6" %>
-  <%= user.password_field :password, :label =>  t(".password"), :class =>  "span6" %>
-  <%= user.password_field :password_confirmation, :label =>  t(".password_confirmation"), :class =>  "span6" %>
-  <%= user.submit t(".save"), :class =>  "btn btn-large btn-primary" %>
+<%= monologue_admin_form_for [:admin, @user], method: :put do |user| %>
+  <%= render :partial => 'form', :locals => { :user => user } %>
+  <%= user.submit t(".save"), class:  "btn btn-large btn-primary" %>
 <% end %>

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

@@ -0,0 +1,28 @@
+<h2><%= link_to t(".create"), new_admin_user_path, class: "btn btn-success" %></h2>
+
+<table class="table table-striped table-bordered">
+  <thead>
+  <tr>
+    <th><%= t(".name") %></th>
+    <th><%= t(".email") %></th>
+    <th></th>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @users.each do |user| %>
+    <tr>
+      <td><%= user.name %></td>
+      <td><%= user.email %></td>
+      <td><%= link_to t(".edit"), edit_admin_user_path(user), class: "btn btn-small" %></td>
+      <td>
+        <% if monologue_current_user.can_delete?(user) %>
+          <%= link_to t(".delete"), [:admin, user], data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-small btn-danger" %>
+        <% else %>
+          <a href="#" class="btn btn-small btn-danger disabled"><%= t(".delete") %></a>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,5 @@
+<h1><%= t(".header") %></h1>
+<%= monologue_admin_form_for [:admin, @user], method: :post do |user| %>
+  <%= render :partial => 'form', :locals => { :user => user } %>
+  <%= user.submit t(".create"), class:  "btn btn-large btn-primary" %>
+<% end %>

data/app/views/monologue/posts/_pagination.html.erb

@@ -1,9 +1,9 @@
 <div id="pagination">
   <% if @posts.total_pages > 1 && @posts.total_pages != @page.to_i %>
-    <%= link_to t(".older_posts"), posts_page_path(@page.to_i+1), :class => "older_posts" %>
+    <%= link_to t(".older_posts"), posts_page_path(@page.to_i+1), class: "older_posts" %>
   <% end %>
 
   <% if @posts.total_pages > 1 && @page.to_i > 1 %>
-    <%= link_to t(".newer_posts"), posts_page_path(@page.to_i-1), :class => "newer_posts" %>
+    <%= link_to t(".newer_posts"), posts_page_path(@page.to_i-1), class: "newer_posts" %>
   <% end %>
 </div>

data/app/views/monologue/posts/_post.html.erb

@@ -1,14 +1,12 @@
-<% revision = post.active_revision %>
 <section>
-  <%= render :partial => 'monologue/posts/revision_header', :locals => {:revision=>revision} %>
+  <%= render partial: 'monologue/posts/post_header', locals: {post: post} %>
 
-  <div id="content" data-monologue="content">
-    <%= truncate_html(revision.content, :length => 1000, :omission => '...') %>
+  <div class="content" data-monologue="content">
+    <%= truncate_html(post.content, length: 1000, omission: '...') %>
   </div>
 
-  <div id="tags" data-monologue="tags">
+  <div class="tags" data-monologue="tags">
     <%= render post.tags %>
   </div>
-  <%= link_to t(".readmore"), revision.full_url, :class => "button" %>
-</section>
-
+  <%= link_to t(".readmore"), post.full_url, class: "button" %>
+</section>

data/app/views/monologue/posts/_post_header.html.erb

@@ -0,0 +1,16 @@
+<header class="post-header">
+  <h1><%= link_to post.title, post.full_url %></h1>
+  <div class="posted">
+    <span data-monologue="time">
+      <time datetime="<%= post.published_at %>">
+        <%= I18n.localize(post.published_at.to_date, format: :long) %>
+      </time>
+    </span>
+    <span data-monologue="user">
+      <%= post.user.name %>
+    </span>
+    <span data-monologue="disqus">
+      <a href="<%= post.full_url + "#disqus_thread" %>"></a>
+    </span>
+  </div>
+</header>

data/app/views/monologue/posts/_social_sharing.html.erb

@@ -2,7 +2,7 @@
   <span class="social-tagline"><%= t(".tagline") %></span>
   <div id="social-share">
     <div id="google-plus">
-     		<!-- GOOGLE +1 -->
+        <!-- GOOGLE +1 -->
          <!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
          <g:plusone size="medium"></g:plusone>
 
@@ -16,15 +16,15 @@
              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
            })();
          </script>
-     		<!-- /GOOGLE +1 -->
+        <!-- /GOOGLE +1 -->
        </div>
     <div id="twitter">
       <!-- TWITTER -->
       <a href="https://twitter.com/share" class="twitter-share-button"
           data-lang="<%= Monologue.twitter_locale || "en" %>"
-          data-url="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>"
+          data-url="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"
           data-via="<%=Monologue.twitter_username%>"
-          data-text="<%=@revision.title%>"
+          data-text="<%=@post.title%>"
           data-count="horizontal">Tweet</a>
 
       <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
@@ -34,7 +34,7 @@
 
     <div id="facebook">
       <!-- FACEBOOK LIKE -->
-  		<div id="fb-root"></div>
+      <div id="fb-root"></div>
       <script>(function(d, s, id) {
         var js, fjs = d.getElementsByTagName(s)[0];
         if (d.getElementById(id)) return;
@@ -48,4 +48,4 @@
 
 
   </div>
-</footer>
+</footer>

data/app/views/monologue/posts/feed.rss.builder

@@ -1,18 +1,17 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
+xml.instruct! :xml, version: "1.0"
+xml.rss version: "2.0" do
   xml.channel do
     xml.title Monologue.site_name
     xml.description Monologue.meta_description
     xml.link root_url
 
     for post in @posts
-      revision = post.posts_revisions.last
       xml.item do
-        xml.title revision.title
-        xml.description raw(revision.content)
-        xml.pubDate revision.published_at.to_s(:rfc822)
-        xml.link Monologue.site_url + revision.full_url
-        xml.guid Monologue.site_url + revision.full_url
+        xml.title post.title
+        xml.description raw(post.content)
+        xml.pubDate post.published_at.to_s(:rfc822)
+        xml.link Monologue.site_url + post.full_url
+        xml.guid Monologue.site_url + post.full_url
       end
     end
   end

data/app/views/monologue/posts/index.html.erb

@@ -1,5 +1,5 @@
 <%= render @posts %>
 
 <% if @page %>
-	<%= render :partial => "pagination" %>
+	<%= render partial: "pagination" %>
 <% end %>

data/app/views/monologue/posts/show.html.erb

@@ -1,22 +1,22 @@
 <% content_for :title do %>
-  <%= @revision.title %>
+  <%= @post.title %>
 <% end %>
 
 <% content_for :meta_description do %>
-  <%= truncate(strip_tags(@revision.content), :length => 155) %>
+  <%= truncate(strip_tags(@post.content), length: 155) %>
 <% end %>
 
 <article>
-  <%= render :partial => 'monologue/posts/revision_header', :locals => {:revision=>@revision}%>
-  <div id="content" data-monologue="content">
-    <%= raw @revision.content %>
+  <%= render partial: 'monologue/posts/post_header', locals: {post: @post }%>
+  <div class="content" data-monologue="content">
+    <%= raw @post.content %>
   </div>
 
-	<div id="tags" data-monologue="tags">
-    <%= render @revision.post.tags %>
+	<div class="tags" data-monologue="tags">
+    <%= render @post.tags %>
   </div>
 
-  <%= render "social_sharing" %>
+  <%= render "monologue/posts/social_sharing" %>
 
   <div id="disqus_thread"></div>
   <%= render 'layouts/monologue/application/disqus_embed' %>

data/app/views/monologue/sidebar/_latest_posts.html.erb

@@ -1,7 +1,7 @@
 <%= sidebar_section_for(t(".title")) do  %>
   <ul>
     <% @recent_posts.each do |post| %>
-      <li><%= link_to post.active_revision.title, post.active_revision.full_url %></li>
+      <li><%= link_to post.title, post.full_url %></li>
     <% end %>
   </ul>
 <% end %>

data/app/views/monologue/sidebar/_latest_tweets.html.erb

@@ -3,6 +3,6 @@
     <ul id="latest_tweets">
       <li id="tweet_template" style="display:none;">{{text}}</li>
     </ul>
-    <script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<%= Monologue.twitter_username %>.json?callback=TwitterWidget.callback&amp;count=5"></script>
+    <script type="text/javascript" src="https://api.twitter.com/1/statuses/user_timeline/<%= Monologue.twitter_username %>.json?callback=TwitterWidget.callback&amp;count=5"></script>
   <% end %>
 <% end %>

data/app/views/monologue/sidebar/_tag_cloud.html.erb

@@ -1,5 +1,5 @@
 <%= sidebar_section_for(t(".title")) do  %>
   <% @tags.each do |tag| %>
-    <%=link_to tag.name, tag_url(tag), :class =>label_for_tag(tag,@tags_frequency_min,@tags_frequency_max) %>
+    <%=link_to tag.name, tag_url(tag), class:label_for_tag(tag,@tags_frequency_min,@tags_frequency_max) %>
   <% end %>
 <% end  %>

data/config/locales/en.yml

@@ -2,111 +2,90 @@ en:
   monologue:
     posts:
       pagination:
-        older_posts:
-          "Older posts"
-        newer_posts:
-          "Newer posts"
+        older_posts: "Older posts"
+        newer_posts: "Newer posts"
       social_sharing:
-        tagline:
-          "Loved what you just read? Share it!"
+        tagline: "Loved what you just read? Share it!"
       post:
-        readmore:
-          "Read more"
+        readmore: "Read more"
       "404":
-        title:
-          "The page you were looking for doesn't exist."
-        message:
-          "You may have mistyped the address or the page may have moved."
+        title: "The page you were looking for doesn't exist."
+        message: "You may have mistyped the address or the page may have moved."
     sidebar:
       categories:
-        title:
-          "Categories"
+        title: "Categories"
       latest_posts:
-        title:
-          "Latest posts"
+        title: "Latest posts"
       latest_tweets:
-        title:
-          "Latest tweets"
+        title: "Latest tweets"
       tag_cloud:
-        title:
-          "Tags"
+        title: "Tags"
     tags:
       show:
-        showing_post_with_tag:
-          "Showing posts with label"
-        show_all_posts:
-          "Show all posts"
+        showing_post_with_tag: "Showing posts with label"
+        show_all_posts: "Show all posts"
     admin:
       login:
-        need_auth:
-          "You must first log in to access admin section."
+        need_auth: "You must first log in to access admin section."
       users:
-        edit:
-          header: "Edit your account"
+        form:
           email: "Email"
           name: "Name"
           password: "Password"
-          confirmation: "Password confirmation"
+          password_confirmation: "Password confirmation"
+        edit:
+          header: "Edit your account"
           save: "Save"
+        new:
+          create: "Create"
+          header: "Add a user"
+        create:
+          success: "User created"
+        delete:
+          removed: "User '%{user}' removed successfully"
+          failed: "Could not remove user '%{user}'"
+        index:
+          email: "Email"
+          name: "Name"
+          edit: "Edit"
+          delete: "Delete"
+          create: "Create"
       posts:
         index:
-          title:
-            "Title"
-          edit:
-            "Edit"
-          delete:
-            "Delete"
-          published:
-            "Yes"
-          not_published:
-            "Not published"
-          status:
-            "Published ?"
+          title: "Title"
+          edit: "Edit"
+          delete: "Delete"
+          published: "Yes"
+          not_published: "Not published"
+          status: "Published ?"
         new:
-          header:
-            "New monologue"
+          header: "New monologue"
         create:
-          created:
-            "Monologue created"
-          created_with_future_date_and_cache:
-            "Monologue created: posts with a future publication date will not be shown unless cache is cleared on that same day. Cache will most probably be generated before that and won't be refreshed automatically."
+          saved: "Monologue created"
+          saved_with_future_date_and_cache: "Monologue created: posts with a future publication date will not be shown unless cache is cleared on that same day. Cache will most probably be generated before that and won't be refreshed automatically."
         edit:
-          header:
-            "Edit"
+          header: "Edit"
         update:
-          saved_with_future_date_and_cache:
-            "Monologue saved: posts with a future publication date will not be shown unless cache is cleared on that same day. Cache will most probably be generated before that and won't be refreshed automatically."
-          saved:
-            "Monologue saved"
+          saved_with_future_date_and_cache: "Monologue saved: posts with a future publication date will not be shown unless cache is cleared on that same day. Cache will most probably be generated before that and won't be refreshed automatically."
+          saved: "Monologue saved"
         delete:
-          removed:
-            "Monologue removed"
-          fail:
-            "Failed to remove monologue!"
+          removed: "Monologue removed"
+          fail: "Failed to remove monologue!"
         form:
-          title:
-            "Title"
-          content:
-            "Content"
+          title: "Title"
+          content: "Content"
           url:
-            caption:
-              "URL<br/><i> This will be filled by default with '%s'. You can choose your own URL. Do not add '%s' at the beginning of your URL.</i>"
-            generated_title:
-              "your-post-title"
-          published_at:
-            "Published at"
-          published:
-            "Published"
-          save:
-            "Save"
-          preview:
-            "Preview"
-          tags:
-            "Tags <br/><i>Separate tags by commas</i>"
+            caption: "URL<br/><i> This will be filled by default with '%{default_url}'. You can choose your own URL. Do not add '%{root}' at the beginning of your URL.</i>"
+            generated_title: "your-post-title"
+          published_at: "Published at"
+          published: "Published"
+          save: "Save"
+          preview: "Preview"
+          close: "Close"
+          tags: "Tags"
       comments:
         show:
-          recent_comments:
-            "Recent comments"
+          recent_comments: "Recent comments"
       cache:
         show:
           title: "Manage cache"
@@ -114,44 +93,37 @@ en:
           files_in_cache: "Here are the files actually cached:"
           no_files_are_cached: "There are actually no file in cache."
           delete: "Completely wipe cache?"
-          confirm: 'Are you sure you want to competely clear cache?'
+          confirm: 'Are you sure you want to completely clear cache?'
           cache_wiped: "Cache was wiped!"
         how_to_enable:
           warning: "You can't manage cache!"
           explanations: "There are certain settings that are not set correctly to be able to use Monologue's basic cache. Please review configuration documentation."
       sessions:
         new:
-          title:
-            "Sign in"
-          email:
-            "Email"
-          password:
-            "Password"
-          button:
-            "Log in"
+          title: "Sign in"
+          email: "Email"
+          password: "Password"
+          button: "Log in"
         messages:
-          invalid:
-            "Invalid email or password"
-          logged_in:
-            "Logged in!"
-          logged_out:
-            "Logged out!"
+          invalid: "Invalid email or password"
+          logged_in: "Logged in!"
+          logged_out: "Logged out!"
   layouts:
     monologue:
       admin:
         nav_bar:
-          add_a_monologue:
-            "Add a monologue"
-          list_monologues:
-            "List of monologues"
-          comments:
-            "Comments"
+          add_a_monologue: "Add a monologue"
+          list_monologues: "List of monologues"
+          comments: "Comments"
           cache: "Manage cache"
           edit_user_info: "My account"
           settings: "Settings"
-          log_out:
-            "Log out"
+          log_out: "Log out"
+          users: "Users"
   activerecord:
+    attributes:
+      monologue/user:
+        password_digest: "Password confirmation"
     errors:
       format: "%{message}"
     errors:
@@ -159,21 +131,18 @@ en:
     errors:
       models:
         full_messages: "%{message}"
-        monologue/posts_revision:
-          blank:
-            "%{attribute} is required"
+        monologue/post:
+          blank: "%{attribute} is required"
+          taken: "%{attribute} is already used by another post"
           attributes:
             published_at:
-              blank:
-                "'Published at' is required"
+              blank: "'Published at' is required"
             url:
-              start_with_slash:
-                "URL can't start with a slash ('/')"
-              unique:
-                "URL is already used by another post"
+              start_with_slash: "URL can't start with a slash ('/')"
+
         monologue/user:
-          blank:
-            "%{attribute} is required"
+          blank: "%{attribute} is required"
+          taken: "%{attribute} has already been taken"
           attributes:
             password:
-              confirmation: "Password and confirmation doesn't match."
+              confirmation: "Password and confirmation doesn't match."