quadro 0.5.6 → 0.5.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzllZWY2MzZmZjhkOWQ2M2UzMjU2MmM2YzhkNGNmN2UwYTJjNmYzYw==
+    N2EzM2YwMmQxZDFiYmY1MzhiMzgwNjQwNzA0YzJhNmY3MDNjYjI2Zg==
   data.tar.gz: !binary |-
-    YmI2ZmU1ZDhhNjI1NDJlOTVhMmUwOGE5ZmY3M2E4OTNkMTFjOWRhZA==
+    MWRhZjYwN2I5ZDBlNzJiMWJkY2M1NjE2NzdhOGU0MjgzNDM3YjNlZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDlhMDdlYzBlZDg1Y2YxYmE0ZDQ2ZWIwZDk4YmY1YWJkN2I1ZTQ5YzdhNzA0
-    YTY4MTY5Mzk1NzdmNTg3MzI5MzZmZmViZWE4NzlkYzNiYzdlMzViZDg4NjE2
-    OWY0ODk3ZGM0M2EwYWNlMThlODVhNGEzYjgwYWE2MDgyYjRiNDY=
+    MTExMDc0Mzg0NzdjYTVjYmVhYWIyOTVkM2MwMGYyMzhlNDc3NzRmNGNkOWM1
+    MGQ5NWYzNTExZDAzZTU3ODg3NWVhZTY4ODVkNTA4ZWQ4NmY4M2ZhZWM4ZjA3
+    YzExMjA0ZTZjZWI2NzcxZDM5ZjlkNzU0ODZmMWE5MDI1MzJjZjA=
   data.tar.gz: !binary |-
-    MjE1OGFiMTBlNmZhYjBlYmMyNmIwMTQzZDgxMTJmNjYzYjZhN2QyODc5MjZh
-    OGYzMmQ5NTYyODRhZjJmZTVjMDIyMzkxYWVkZThhZjdhNWIwYWQ5MmQxZWI4
-    Y2Y0MzI4YzEyNDc5YzEyMzRhNTUzMDE5NDZlZGQ4Y2YxM2FkMDc=
+    OWNlMDU3OThmZDg4YmEwMWI3MzRkNTg0Yzk3NTdlOTcxYzFlZGFkYzljZjli
+    OGQ1NTQzNjU2OWRhY2Q5MWI0MWExMTE2Y2ExNjU5MGJhMzUxZTc4MjJlOGZl
+    MzJhYmNkNWY3MzIyMDZhNDI0M2U5YzliN2M4MDc3MTQ5OGY4NWE=

data/README.md

@@ -35,10 +35,11 @@ Current stable version.
 
 [![Gem Version](https://badge.fury.io/rb/quadro.png)](https://badge.fury.io/rb/quadro)
 
-## Code Climate and Travis CI status
+## Code Climate, Hakiri and Travis CI status
 
 [![Code Climate](https://codeclimate.com/github/hugogilmar/quadro/badges/gpa.svg)](https://codeclimate.com/github/hugogilmar/quadro)
 [![Test Coverage](https://codeclimate.com/github/hugogilmar/quadro/badges/coverage.svg)](https://codeclimate.com/github/hugogilmar/quadro/coverage)
+[![Security](https://hakiri.io/github/hugogilmar/quadro/develop.svg)](https://hakiri.io/github/hugogilmar/quadro/develop)
 [![Build Status](https://travis-ci.org/hugogilmar/quadro.svg?branch=master)](https://travis-ci.org/hugogilmar/quadro)
 
 ## Installation
@@ -147,7 +148,7 @@ You can also set a playlist:
 = widget_for :video, type: :video, src: "https://www.youtube.com/watch?v=YE7VzlLtp-4&list=PLcsq2jjTfJ_pEUj2Cl4MlXnpgpSQMTO-f"
 ```
 
-*Note: works the same with vimeo's videos and playlists.*
+*Note: works the same with Vimeo's videos and playlists.*
 
 ## Working with page templates
 

data/app/assets/javascripts/quadro/application.js.coffee

@@ -12,17 +12,17 @@
 #= require summernote
 #= require jquery.slick
 #= require moment
+#= require unobtrusive_flash
+#= require unobtrusive_flash_bootstrap
 #= require quadro/plugins/jquery.fs.dropper.min
 #= require quadro/plugins/jasny-bootstrap.min
 #= require quadro/plugins/jquery.smartmenus.min
 #= require quadro/plugins/jquery.smartmenus.bootstrap.min
 #= require quadro/plugins/jquery.show_char_limit.min
 #= require quadro/plugins/pace.min
-#= require quadro/plugins/humane.min
 #= require quadro/plugins/lightbox.min
 #= require quadro/plugins/gmaps.min
 #= require quadro/plugins/bootstrap-datetimepicker.min
-#= require quadro/message
 #= require quadro/widget
 #= require quadro/uploader
 #= require quadro/quadro

data/app/assets/javascripts/quadro/quadro.js.coffee

@@ -20,14 +20,14 @@ $(document).ready ->
     uploader = new Uploader $(this)
 
   $('#quadro-airmode-on').on 'click', ->
-    $('#quadro-airmode-off').removeClass 'active'
-    $(this).addClass 'active'
+    $('#quadro-airmode-off').removeClass 'hidden'
+    $(this).addClass 'hidden'
     for widget in Object.keys(widgets)
       widgets[widget].switchAirmodeOn()
 
   $('#quadro-airmode-off').on 'click', ->
-    $('#quadro-airmode-on').removeClass 'active'
-    $(this).addClass 'active'
+    $('#quadro-airmode-on').removeClass 'hidden'
+    $(this).addClass 'hidden'
     for widget in Object.keys(widgets)
       widgets[widget].switchAirmodeOff()
 
@@ -41,3 +41,5 @@ $(document).ready ->
       $('#quadro-gallery').removeClass('collapsed').addClass('expanded')
     else
       $('#quadro-gallery').removeClass('expanded').addClass('collapsed')
+
+  UnobtrusiveFlash.flashOptions['timeout'] = 3000

data/app/assets/javascripts/quadro/widget.js.coffee

@@ -52,10 +52,8 @@ class Widget
         widget:
           content: @content
       success: (data) ->
-        new Message "Content updated"
         return
       error: ->
-        new Message "Content not updated"
         return
     return
 

data/app/assets/stylesheets/quadro/application.css.sass

@@ -13,7 +13,6 @@
 @import quadro/plugins/jasny-bootstrap.min
 @import quadro/plugins/jquery.smartmenus.bootstrap.min
 @import quadro/plugins/pace.min
-@import quadro/plugins/humane-libnotify.min
 @import quadro/plugins/lightbox.min
 @import quadro/plugins/bootstrap-datetimepicker.min
 @import quadro/quadro

data/app/assets/stylesheets/quadro/quadro.css.sass

@@ -8,6 +8,14 @@ form
   span.status
     @extend .help-block
 
+.unobtrusive-flash-container
+  position: fixed
+  top: 0px
+  left: 10%
+  width: 80%
+  z-index: 2000
+  padding: 8px 0px 0px
+
 #quadro-toolbar
   padding: 8px
 
@@ -35,6 +43,7 @@ form
     height: 0em
 
 #quadro-gallery.expanded
+  margin-bottom: 8px
   padding: 0px
   height: 25em
   +transition-property(height)

data/app/controllers/quadro/application_controller.rb

@@ -1,5 +1,6 @@
 module Quadro
   class ApplicationController < ActionController::Base
+    after_filter :prepare_unobtrusive_flash
     helper_method :widget, :asset, :interaction, :root, :parent, :page, :subpages, :geoip, :video, :user, :users
 
     def after_sign_in_path_for(_resource)

data/app/controllers/quadro/assets_controller.rb

@@ -7,15 +7,27 @@ module Quadro
     respond_to :js, :json, :xml
 
     def create
-      asset.save
+      if asset.save
+        flash[:notice] = t('flash.created')
+      else
+        flash[:alert] = t('flash.not_created')
+      end
     end
 
     def update
-      asset.update_attributes(params[:asset])
+      if asset.update_attributes(params[:asset])
+        flash[:notice] = t('flash.updated')
+      else
+        flash[:alert] = t('flash.not_updated')
+      end
     end
 
     def destroy
-      asset.destroy
+      if asset.destroy
+        flash[:notice] = t('flash.deleted')
+      else
+        flash[:alert] = t('flash.not_deleted')
+      end
     end
   end
 end

data/app/controllers/quadro/pages_controller.rb

@@ -10,29 +10,58 @@ module Quadro
 
     def create
       page.author = current_user
-      page.save
+      if page.save
+        flash[:notice] = t('flash.created')
+      else
+        flash[:alert] = t('flash.not_created')
+      end
     end
 
     def update
-      page.update_attributes(params[:page])
+      if page.update_attributes(params[:page])
+        flash[:notice] = t('flash.updated')
+      else
+        flash[:alert] = t('flash.not_updated')
+      end
     end
 
     def destroy
-      page.destroy unless page.is_root?
+      unless page.is_root?
+        if page.destroy
+          flash[:notice] = t('flash.deleted')
+        else
+          flash[:alert] = t('flash.not_deleted')
+        end
+      else
+        flash[:alert] = t('flash.could_not_be_deleted')
+      end
     end
 
     def form
       interaction.ip_address = request.remote_ip
       interaction.user_agent = request.user_agent
-      interaction.update_attributes(content: params[:form])
+      interaction.content = params[:form]
+      if interaction.save
+        flash[:notice] = t('flash.created')
+      else
+        flash[:alert] = t('flash.not_created')
+      end
     end
 
     def publish
-      page.publish!
+      if page.publish!
+        flash[:notice] = t('flash.published')
+      else
+        flash[:alert] = t('flash.not_published')
+      end
     end
 
     def unpublish
-      page.unpublish!
+      if page.unpublish!
+        flash[:notice] = t('flash.unpublished')
+      else
+        flash[:alert] = t('flash.not_unpublished')
+      end
     end
 
     private

data/app/controllers/quadro/tools_controller.rb

@@ -8,6 +8,7 @@ module Quadro
 
     def sitemap_notifier
       notifier.run(sitemap_url)
+      flash[:notice] = t('flash.notified')
     end
   end
 end

data/app/controllers/quadro/widgets_controller.rb

@@ -7,7 +7,12 @@ module Quadro
     respond_to :js, :json, :xml
 
     def update
-      widget.update_attributes(params[:widget])
+      if widget.update_attributes(params[:widget])
+        flash[:notice] = t('flash.updated')
+      else
+        flash[:alert] = t('flash.not_updated')
+      end
+
       respond_with widget
     end
   end

data/app/models/quadro/page.rb

@@ -6,7 +6,7 @@ module Quadro
     SITEMAP_PRIORITY = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0].freeze
 
     # attributes
-    attr_accessible :title, :summary, :template, :frequency, :priority, :cover_attributes, :author_id
+    attr_accessible :title, :summary, :template, :frequency, :priority, :cover_attributes, :author_id, :published_at
     store :settings, accessors: [:template, :frequency, :priority]
 
     # validations

data/app/views/layouts/quadro/application.html.haml

@@ -24,6 +24,7 @@
     = favicon_link_tag 'quadro/favicon.ico'
     = csrf_meta_tags
   %body(class="#{(user_signed_in? ? 'quadro-signed-in' : '')}")
+    .unobtrusive-flash-container
     = yield
     - if user_signed_in?
       = render 'quadro/shared/toolbar'

data/app/views/layouts/quadro/devise.html.haml

@@ -8,4 +8,6 @@
     = favicon_link_tag 'quadro/favicon.ico'
     = csrf_meta_tags
   %body
+    .unobtrusive-flash-container
     = yield
+    = javascript_include_tag 'quadro/application'

data/app/views/quadro/assets/create.js.erb

@@ -5,7 +5,5 @@
   <% when 'slide' %>
     $('.asset-list').filter('[data-assetable-type="<%= asset.assetable.class.to_s %>"],[data-assetable-id="<%= asset.assetable.id %>"]').append('<%= escape_javascript(render("quadro/assets/slide/slide", asset: asset, widget: widget, page: page))%>');
   <% end %>
-  new Message('Asset created');
 <% else %>
-  new Message('Asset not created');
 <% end %>

data/app/views/quadro/assets/destroy.js.erb

@@ -5,7 +5,5 @@
   <% when 'slide' %>
     $('#slide-<%= asset.id %>').remove();
   <% end %>
-  new Message('Asset deleted');
 <% else %>
-  new Message('Asset not deleted');
 <% end %>

data/app/views/quadro/assets/image/_image.html.haml

@@ -5,6 +5,6 @@
       .pull-right
 
         = link_to (widget.present? ? edit_page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : edit_page_asset_path(id: asset.id, page_id: page.id)), remote: true, class: "btn btn-link btn-xs" do
-          %i.fa.fa-cog.text-muted
-        = link_to (widget.present? ? page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : page_asset_path(id: asset.id, page_id: page.id)), method: "delete", confirm: "Are you sure of delete this image?", remote: true, class: "btn btn-link btn-xs" do
+          %i.fa.fa-pencil.text-muted
+        = link_to (widget.present? ? page_widget_asset_path(page_id: page.id, widget_id: widget.id, id: asset.id) : page_asset_path(id: asset.id, page_id: page.id)), method: "delete", confirm: t('confirmation.image'), remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-trash-o.text-danger

data/app/views/quadro/assets/slide/_slide.html.haml

@@ -4,6 +4,6 @@
     .caption.clearfix
       .pull-right
         = link_to edit_page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), remote: true, class: "btn btn-link btn-xs" do
-          %i.fa.fa-cog.text-muted
-        = link_to page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), method: "delete", confirm: "Are you sure of delete this slide?", remote: true, class: "btn btn-link btn-xs" do
+          %i.fa.fa-pencil.text-muted
+        = link_to page_widget_asset_path(id: asset.id, widget_id: widget.id, page_id: page.id), method: "delete", confirm: t('confirmation.slide'), remote: true, class: "btn btn-link btn-xs" do
           %i.fa.fa-trash-o.text-danger

data/app/views/quadro/assets/update.js.erb

@@ -1,11 +1,10 @@
-<% if asset.errors.size > 0 %>
+<% if asset.changed? %>
   <% case asset.type.constantize.short_name %>
   <% when 'image' %>
     $("#quadro-modal .modal-content").html("<%= escape_javascript(render('quadro/assets/image/form', asset: asset, page: page)) %>");
   <% when 'slide' %>
     $("#quadro-modal .modal-content").html("<%= escape_javascript(render('quadro/assets/slide/form', asset: asset, widget: widget, page: page)) %>");
   <% end %>
-  new Message('Asset not updated');
 <% else %>
   <% case asset.type.constantize.short_name %>
   <% when 'image' %>
@@ -14,5 +13,4 @@
     $('#slide-<%= asset.id %>').replaceWith('<%= escape_javascript(render("quadro/assets/slide/slide", asset: asset, widget: widget, page: page))%>');
   <% end %>
   $("#quadro-modal").modal('hide');
-  new Message('Asset updated');
 <% end %>

data/app/views/quadro/pages/_edit.html.haml

@@ -30,10 +30,10 @@
             = form.input :published_at, as: :string, input_html: { class: 'form-control' }
     .row
       .col-md-4
-        = form.input :template, collection: page.templates, input_html: { class: 'form-control' }
+        = form.input :template, collection: page.templates, input_html: { class: 'form-control' }, include_blank: false
       .col-md-4
-        = form.input :frequency, collection: Quadro::Page::SITEMAP_FREQUENCY, input_html: { class: 'form-control' }
+        = form.input :frequency, collection: Quadro::Page::SITEMAP_FREQUENCY, input_html: { class: 'form-control' }, include_blank: false
       .col-md-4
-        = form.input :priority, collection: Quadro::Page::SITEMAP_PRIORITY, input_html: { class: 'form-control' }
+        = form.input :priority, collection: Quadro::Page::SITEMAP_PRIORITY, input_html: { class: 'form-control' }, include_blank: false
     .text-right
       = form.submit class: 'btn btn-primary'

data/app/views/quadro/pages/create.js.erb

@@ -1,7 +1,5 @@
-<% if page.errors.size > 0 %>
-  $("#quadro-modal .modal-body").html("<%= escape_javascript(render('quadro/pages/new', page: page)) %>");
-  new Message('Page not created');
-<% else %>
+<% if page.persisted? %>
   $("#quadro-modal").modal('hide');
-  new Message('Page created');
+<% else %>
+  $("#quadro-modal .modal-body").html("<%= escape_javascript(render('quadro/pages/new', page: page)) %>");
 <% end %>

data/app/views/quadro/pages/destroy.js.erb

@@ -1,5 +1,3 @@
 <% if page.destroyed? %>
-  new Message('Page deleted');
 <% else %>
-  new Message('Page not deleted');
 <% end %>

data/app/views/quadro/pages/form.js.erb

@@ -1,6 +1,4 @@
 <% if interaction.persisted? %>
-  new Message('Message sent');
   $('form#<%= interaction.interactable.name %>')[0].reset();
 <% else %>
-  new Message('Message not sent');
 <% end %>

data/app/views/quadro/pages/publish.js.erb

@@ -1,5 +1,5 @@
 <% if page.published? %>
-  new Message('Page published');
+  $('#quadro-unpublish').removeClass('hidden');
+  $('#quadro-publish').addClass('hidden');
 <% else %>
-  new Message('Page not published');
 <% end %>

data/app/views/quadro/pages/unpublish.js.erb

@@ -1,5 +1,5 @@
 <% if page.unpublished? %>
-  new Message('Page unpublished');
+  $('#quadro-publish').removeClass('hidden');
+  $('#quadro-unpublish').addClass('hidden');
 <% else %>
-  new Message('Page not unpublished');
 <% end %>

data/app/views/quadro/pages/update.js.erb

@@ -1,7 +1,5 @@
-<% if page.errors.size > 0 %>
+<% if page.changed? %>
   $("#quadro-modal .modal-content").html("<%= escape_javascript(render('quadro/pages/edit', page: page)) %>");
-  new Message('Page not updated');
 <% else %>
   $("#quadro-modal").modal('hide');
-  new Message('Page updated');
 <% end %>

data/app/views/quadro/shared/_navigation.html.haml

@@ -2,16 +2,15 @@
   .container
     .navbar-header
       %button.navbar-toggle.collapsed(data-target='#navigation' data-toggle='collapse' type='button')
-        %span.sr-only Toggle navigation
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
       = link_to root_path, class: 'navbar-brand' do
         = Quadro.config.site
     #navigation.collapse.navbar-collapse
+      = navigation_for root, class: "nav navbar-nav navbar-right"
       - unless user_signed_in?
         %ul.nav.navbar-nav.navbar-right
           %li
             = link_to new_user_session_path, rel: "nofollow" do
-              Sign In
-      = navigation_for root, class: "nav navbar-nav navbar-right"
+              = t('navigation.sign_in')

data/app/views/quadro/shared/_toolbar.html.haml

@@ -8,51 +8,34 @@
     .pull-left
       = link_to root_path, class: "quadro-brand" do
         = image_tag 'quadro/quadro-logo-mini.png'
-      = link_to new_page_path(parent_id: page.id), remote: true, class: "btn btn-default btn-sm hidden-xs" do
+      = link_to new_page_path(parent_id: page.id), remote: true, id: "quadro-new", class: "btn btn-default btn-sm" do
         %i.fa.fa-plus
-        New sub page
-      = link_to edit_page_path(page.slug), remote: true, class: "btn btn-default btn-sm hidden-xs" do
+        %span.hidden-xs.hidden-sm= t('toolbar.new')
+      = link_to edit_page_path(page.slug), remote: true, id: "quadro-edit", class: "btn btn-default btn-sm" do
         %i.fa.fa-pencil
-        Edit
-      = link_to page_path(page.slug), remote: true, method: "delete", confirm: "Are you sure of delete this page?", class: "btn btn-default btn-sm hidden-xs" do
-        %i.fa.fa-trash-o
-        Delete
+        %span.hidden-xs.hidden-sm= t('toolbar.edit')
+      = link_to page_path(page.slug), remote: true, method: "delete", confirm: t('confirmation.page'), id: "quadro-delete", class: "btn btn-default btn-sm" do
+        %i.fa.fa-trash-o.text-danger
+        %span.hidden-xs.hidden-sm.text-danger= t('toolbar.delete')
       - unless page.is_root?
-        - if page.published?
-          = link_to unpublish_page_path(page.slug), remote: true, class: "btn btn-default btn-sm hidden-xs" do
-            %i.fa.fa-eye-slash
-            Unpublish
-        - else
-          = link_to publish_page_path(page.slug), remote: true, class: "btn btn-default btn-sm hidden-xs" do
-            %i.fa.fa-eye
-            Publish
-      .btn-group.visible-xs-inline-block(role='group')
-        = link_to new_page_path(parent_id: page.id), remote: true, class: "btn btn-default btn-sm" do
-          %i.fa.fa-plus
-        = link_to edit_page_path(page.slug), remote: true, class: "btn btn-default btn-sm" do
-          %i.fa.fa-pencil
-        = link_to page_path(page.slug), remote: true, method: "delete", confirm: "Are you sure of delete this page?", class: "btn btn-default btn-sm" do
-          %i.fa.fa-trash-o
-        - unless page.is_root?
-          - if page.published?
-            = link_to unpublish_page_path(page.slug), remote: true, class: "btn btn-default btn-sm" do
-              %i.fa.fa-eye-slash
-          - else
-            = link_to publish_page_path(page.slug), remote: true, class: "btn btn-default btn-sm" do
-              %i.fa.fa-eye
+        = link_to unpublish_page_path(page.slug), remote: true, id: "quadro-unpublish", class: "btn btn-default btn-sm #{page.unpublished? ? 'hidden' : ''}" do
+          %i.fa.fa-eye-slash
+          %span.hidden-xs.hidden-sm= t('toolbar.unpublish')
+        = link_to publish_page_path(page.slug), remote: true, id: "quadro-publish", class: "btn btn-default btn-sm #{page.published? ? 'hidden' : ''}" do
+          %i.fa.fa-eye
+          %span.hidden-xs.hidden-sm= t('toolbar.publish')
     .pull-right
       %a#quadro-save.btn.btn-default.btn-sm.hide
         %i.fa.fa-floppy-o
-        Save changes
+        %span.hidden-xs.hidden-sm= t('toolbar.save')
       %a#quadro-gallery-toggle.btn.btn-default.btn-sm.hidden-xs.hidden-sm
         %i.fa.fa-picture-o
-        Image gallery
-      %span.hidden-xs.hidden-sm Editor:
-      .btn-group.hidden-xs.hidden-sm(role='group')
-        %button#quadro-airmode-off.btn.btn-default.btn-sm(type='button')
-          %i.fa.fa-toggle-on
-        %button#quadro-airmode-on.btn.btn-default.btn-sm.active(type='button')
-          %i.fa.fa-toggle-off
+        %span= t('toolbar.gallery')
+      %span.hidden-xs.hidden-sm= t('toolbar.editor')
+      %button#quadro-airmode-off.btn.btn-default.btn-sm.hidden-xs.hidden-sm(type='button')
+        %i.fa.fa-toggle-on
+      %button#quadro-airmode-on.btn.btn-default.btn-sm.hidden-xs.hidden-sm.hidden(type='button')
+        %i.fa.fa-toggle-off
       .btn-group.dropup.hidden-xs
         %button.btn.btn-default.btn-sm.dropdown-toggle(type='button' data-toggle='dropdown')
           = gravatar_image_tag(current_user.email, alt: current_user.email, title: current_user.email, gravatar: { size: 16 }, class: 'img-rounded')
@@ -63,14 +46,14 @@
             %li
               = link_to sitemap_notifier_path, remote: true do
                 %i.fa.fa-sitemap
-                Notify sitemap.xml
+                = t('toolbar.sitemap')
           %li
             = link_to edit_user_path, remote: true do
               %i.fa.fa-user
-              Edit user
+              = t('toolbar.profile')
           %li
             = link_to destroy_user_session_path, method: :delete do
               %i.fa.fa-sign-out
-              Sign Out
+              = t('toolbar.sign_out')
       = link_to destroy_user_session_url, method: :delete, class: "btn btn-default btn-sm visible-xs-inline-block hidden-sm" do
-        Sign Out
+        = t('toolbar.sign_out')

data/app/views/quadro/shared/templates/page/_list.html.haml

@@ -5,5 +5,5 @@
   .media-body
     %h4.media-heading
       = link_to page.title, page_path(page)
-    %small.text-muted= l(page.published_at, format: :short)
+    %small.text-muted= l(page.published_at, format: :short) unless page.unpublished?
     %p= page.summary

data/app/views/quadro/shared/templates/page/_thumbnail.html.haml

@@ -5,5 +5,5 @@
     .caption
       %h2
         = link_to page.title, page_path(page)
-      %small.text-muted= l(page.published_at, format: :short)
+      %small.text-muted= l(page.published_at, format: :short) unless page.unpublished?
       %p= page.summary

data/app/views/quadro/tools/sitemap_notifier.js.erb

@@ -1 +0,0 @@
-new Message('Sitemap notified');

data/app/views/quadro/users/update.js.erb

@@ -1,7 +1,5 @@
-<% if user.errors.size > 0 %>
+<% if user.changed? %>
   $("#quadro-modal .modal-content").html("<%= escape_javascript(render('quadro/users/edit', user: user)) %>");
-  new Message('User not updated');
 <% else %>
   $("#quadro-modal").modal('hide');
-  new Message('User updated');
 <% end %>

data/app/views/quadro/widgets/form/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Form
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/quadro/widgets/gallery/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Gallery
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/quadro/widgets/html/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Html
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/quadro/widgets/map/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Map
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/quadro/widgets/slider/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Slider
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/quadro/widgets/video/_toolbar.html.haml

@@ -4,4 +4,4 @@
       .text-muted.text-uppercase Video
   .pull-right
     %button.btn.btn-link.btn-xs
-      %i.fa.fa-cog.text-muted
+      %i.fa.fa-pencil.text-muted

data/app/views/users/mailer/reset_password_instructions.html.haml

@@ -1,6 +1,5 @@
-%p
-  Hello #{@resource.email}!
-%p Someone has requested a link to change your password. You can do this through the link below.
-%p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token)
-%p If you didn't request this, please ignore this email.
-%p Your password won't change until you access the link above and create a new one.
+%p= t('devise.mailer.reset_password_instructions.greeting', recipient: @resource.email)
+%p= t('devise.mailer.reset_password_instructions.instruction')
+%p= link_to t('devise.mailer.reset_password_instructions.action'), edit_password_url(@resource, reset_password_token: @token)
+%p= t('devise.mailer.reset_password_instructions.instruction_2')
+%p= t('devise.mailer.reset_password_instructions.instruction_3')

data/app/views/users/mailer/unlock_instructions.html.haml

@@ -1,5 +1,4 @@
-%p
-  Hello #{@resource.email}!
-%p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
-%p Click the link below to unlock your account:
-%p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token)
+%p= t('devise.mailer.unlock_instructions.greeting', recipient: @resource.email)
+%p= t('devise.mailer.unlock_instructions.message')
+%p= t('devise.mailer.unlock_instructions.instruction')
+%p= link_to t('devise.mailer.unlock_instructions.action'), unlock_url(@resource, unlock_token: @token)