georgia 0.7.8 → 0.8.0

data/app/views/georgia/revisions/fields/_content.html.erb

@@ -4,7 +4,6 @@
     <%= link_to_available_locales %>
   </div>
   <div class="fieldset-fields">
-    <%= warning_message(@page, @revision) %>
     <%= f.input :text, label: false, as: :ckeditor, input_html: {toolbar: 'Full'} %>
   </div>
 </fieldset>
@@ -17,7 +16,7 @@
   </div>
   <div class="fieldset-fields">
     <%= f.input :excerpt, as: :text, label: 'Excerpt/Description', input_html: {rows: 3}, hint: "Describe in a short paragraph what this page is about." %>
-    <%= f.input :keyword_list, label: 'Keywords', hint: "Comma-separated list of keywords, e.g. spiderman, superman, comics, superhero.", input_html: {class: 'js-token-input'} %>
+    <%= f.input :keyword_list, as: :text, label: 'Keywords', hint: "Comma-separated list of keywords, e.g. spiderman, superman, comics, superhero.", input_html: {class: 'js-taggable', row: 1} %>
   </div>
 </fieldset>
 <fieldset>

data/app/views/georgia/revisions/fields/_message.html.erb

@@ -0,0 +1,11 @@
+<% if @status_message.partial or @draft_revision %>
+  <fieldset>
+    <div class="fieldset-help">
+      <legend><%= icon_tag('exclamation-triangle', size: 'lg') %> Attention</legend>
+    </div>
+    <div class="fieldset-fields">
+      <%= render partial: "georgia/revisions/messages/continue_draft" if @draft_revision %>
+      <%= render partial: "georgia/revisions/messages/#{@status_message.partial}" if @status_message.partial %>
+    </div>
+  </fieldset>
+<% end -%>

data/app/views/georgia/revisions/fields/_ui_section.html.erb

@@ -8,7 +8,7 @@
     </ul>
     <div class="form-group">
       <%= select_tag :widget, widgets_collection, prompt: 'Select a widget', class: 'form-control select-widget' %>
-      <%= link_to "#{icon_tag('plus')} Add".html_safe, '#', class: 'btn btn-inverse js-add-widget' %>
+      <%= link_to "#{icon_tag('plus')} Add".html_safe, '#', class: 'btn btn-primary js-add-widget' %>
     </div>
   </div>
 </div>

data/app/views/georgia/revisions/fields/_widgets.html.erb

@@ -2,7 +2,7 @@
   <div class="fieldset-help">
     <legend>Widgets</legend>
     <p class='hint'>
-      <%= link_to "#{icon_tag('cogs')} Manage Widgets".html_safe, widgets_path, class: 'btn btn-inverse' if can?(:manage, @page) %>
+      <%= link_to "#{icon_tag('cogs')} Manage Widgets".html_safe, widgets_path, class: 'btn btn-primary' if policy(Georgia::Widget).index? %>
     </p>
   </div>
   <div class="fieldset-fields">

data/app/views/georgia/revisions/index.html.erb

@@ -9,8 +9,8 @@
       </h1>
     </div>
     <div class="header-actions">
+      <%= button_to_edit if policy(@page).edit? %>
       <%= button_to_settings %>
-      <%= page_actions_tag(@page, @revision) %>
     </div>
   </div>
 </header>
@@ -19,7 +19,7 @@
     <% if @revisions and @revisions.any? %>
       <%= render @revisions %>
     <% else -%>
-      <h3>There are no past revisions for this page yet. <%= link_to 'Go Back', @page %></h3>
+      <h3>There are no past revisions available for this page.</h3>
     <% end -%>
   </div>
 </section>

data/app/views/georgia/revisions/messages/_awaiting_review.html.erb

@@ -0,0 +1,15 @@
+<div class="well">
+  <p>
+    <%= icon_tag('clock-o') %> Your revision is awaiting review from an Editor. Feel free to further customize its content or grab a <%= icon_tag('coffee') %> and wait it out.
+  </p>
+  <% if policy(@revision).approve? %>
+    <p>
+      <%= link_to('Approve & Publish', [:approve, @page, @revision], class: 'btn btn-success') %>
+      <%= link_to('Decline & Move to trash', [:decline, @page, @revision], class: 'btn btn-danger text-danger btn-link') %>
+    </p>
+  <% else %>
+    <p>
+      <%= link_to('Cancel & Delete draft', [@page, @revision], data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger text-danger btn-link') if policy(@revision).destroy? %>
+    </p>
+  <% end -%>
+</div>

data/app/views/georgia/revisions/messages/_continue_draft.html.erb

@@ -0,0 +1,8 @@
+<div class="well">
+  <p>You already have a draft of this page.</p>
+  <p>
+    <%= link_to('Continue editing', [:edit, @page, @draft_revision], class: 'btn btn-primary') %>
+    <%= link_to('Start Fresh', [:draft, @page, @revision], class: 'btn btn-info') %>
+    <%= link_to('Cancel & Delete draft', [@page, @draft_revision], data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger text-danger btn-link') if policy(@draft_revision).destroy? %>
+  </p>
+</div>

data/app/views/georgia/revisions/messages/_edit_current_revision.html.erb

@@ -0,0 +1,12 @@
+<div class="well">
+  <p>You are looking at a past revision. Updating this content will not change anything on your website.</p>
+  <p>
+    <%= link_to("#{icon_tag('pencil')} Edit current revision".html_safe, [:edit, @page, @page.current_revision], class: 'btn btn-primary') %>
+  </p>
+  <% if policy(@revision).restore? %>
+    <p>Optionally, you can also restore this revision as the current version of this page.</p>
+    <p>
+      <%= link_to "#{icon_tag('undo')} Set as current revision".html_safe, [:restore, @page, @revision] , class: 'btn btn-info'  %>
+    </p>
+  <% end -%>
+</div>

data/app/views/georgia/revisions/messages/_insufficient_rights.html.erb

@@ -0,0 +1,6 @@
+<div class="alert alert-warning">
+  <p><%= icon_tag('warning') %> You do not have rights to edit this revision.</p>
+  <p>
+    <%= link_to('Start a new draft', [:draft, page, revision], class: 'btn btn-primary') %>
+  </p>
+</div>

data/app/views/georgia/revisions/messages/_request_review.html.erb

@@ -0,0 +1,7 @@
+<div class="well">
+  <p>Nice job editing this new draft! Ask a pair to review your changes if you have completed.</p>
+  <p>
+    <%= link_to("#{icon_tag('check')} Submit for review".html_safe, [:request_review, @page, @revision], class: 'btn btn-success') %>
+    <%= link_to('Cancel & Delete draft', [@page, @revision], data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger text-danger btn-link') if policy(@revision).destroy? %>
+  </p>
+</div>

data/app/views/georgia/revisions/messages/_review.html.erb

@@ -0,0 +1,7 @@
+<div class="well">
+  <p><%= @revision.user.name rescue 'Someone' %> submitted this draft for review.</p>
+  <p>
+    <%= link_to('Approve & Publish', [:approve, @page, @revision], class: 'btn btn-success') %>
+    <%= link_to('Decline & Move to trash', [:decline, @page, @revision], class: 'btn btn-danger text-danger btn-link') %>
+  </p>
+</div>

data/app/views/georgia/revisions/messages/_start_draft.html.erb

@@ -0,0 +1,4 @@
+<div class="alert alert-warning">
+  <p>You are looking at a past revision. Updating this content will not change anything on your website.</p>
+  <p><%= link_to('Start new draft from this revision', [:draft, @page, @revision], class: 'btn btn-primary') %></p>
+</div>

data/app/views/georgia/revisions/panels/_actions.html.erb

@@ -0,0 +1,7 @@
+<div class='clearfix'>
+  <% if policy(@revision).draft? and !%w(draft review).include? @revision.status and !@draft_revision %>
+    <%= link_to 'Start a new draft', [:draft, @page, @revision], class: 'btn btn-primary' %>
+  <% end -%>
+  <%= link_to "#{icon_tag('eye')} Preview".html_safe, [:preview, @page, @revision], target: '_blank', class: 'btn btn-default pull-right' %>
+</div>
+<hr />

data/app/views/georgia/revisions/panels/_activities.html.erb

@@ -0,0 +1,6 @@
+<div class="activities panel panel-default">
+  <div class="panel-heading"><h3 class="panel-title">Activity Feed</h3></div>
+  <div class="panel-body">
+    <%= render_activities(@activities, fallback: 'default') %>
+  </div>
+</div>

data/app/views/georgia/revisions/panels/_drafts.html.erb

@@ -0,0 +1,28 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title">Pending Review</h3>
+  </div>
+  <div class="panel-body">
+    <% if @awaiting_revisions and @awaiting_revisions.any? %>
+      <ul class="media-list">
+        <% @awaiting_revisions.each do |revision| %>
+          <li class="media">
+            <%= image_tag(avatar_url(revision.user.try(:email)), alt: '', class: 'media-object pull-left') %>
+            <div class="media-body">
+              <h4 class="media-heading">
+                <%= revision.title %>
+                <%= link_to 'Review', [:edit, revision.revisionable, revision], class: 'pull-right btn btn-default btn-xs' %>
+              </h4>
+              <%= truncate(strip_tags(revision.text), length: 120, separator: ' ') %>
+            </div>
+          </li>
+        <% end -%>
+      </ul>
+    <% else -%>
+      <h5>Good Job! Nothing to review.</h5>
+    <% end -%>
+  </div>
+  <div class="panel-footer text-center">
+    <%= link_to 'show all revisions', [@page, :revisions] %>
+  </div>
+</div>

data/app/views/georgia/revisions/panels/_info.html.erb

@@ -0,0 +1,39 @@
+<div class="panel panel-default">
+  <div class="panel-heading"><h3 class="panel-title">Information</h3></div>
+  <div class="panel-body">
+    <table class='table'>
+      <tr>
+        <td>Revised by</td>
+        <td><%= image_tag avatar_url(@revision.user.try(:email)), alt: '' %> <%= @revision.user.try(:name) %></td>
+      </tr>
+      <tr>
+        <td>Status</td>
+        <td><span class="label label-<%= @revision.status %>"><%= @revision.status %></span></td>
+      </tr>
+      <tr>
+        <td>Visibility</td>
+        <td><span class="label label-<%= @revision.visibility %>"><%= @revision.visibility %></span></td>
+      </tr>
+      <tr>
+        <td>Created</td>
+        <td><%= l @revision.created_at, format: :long %></td>
+      </tr>
+      <tr>
+        <td>Last updated</td>
+        <td>About <%= time_ago_in_words(@revision.updated_at) %> ago</td>
+      </tr>
+      <% if policy(@page).publish? or policy(@page).unpublish? %>
+        <tr>
+          <td colspan="2">
+            <% if @page.public? %>
+              <%= link_to "#{icon_tag('thumbs-down')} Unpublish".html_safe, unpublish_pages_path(id: [@page.id]), data: {confirm: 'Are you sure?'}, method: :post, class: 'btn btn-danger' %>
+            <% else %>
+              <%= link_to "#{icon_tag('thumbs-up')} Publish".html_safe, publish_pages_path(id: [@page.id]), method: :post, class: 'btn btn-success' %>
+            <% end -%>
+            <%= link_to("#{icon_tag('trash-o')} Move to Trash".html_safe, @page, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-link text-danger pull-right') if policy(@page).destroy? %>
+          </td>
+        </tr>
+      <% end -%>
+    </table>
+  </div>
+</div>

data/app/views/georgia/shared/modals/_media_library.html.erb

@@ -27,7 +27,9 @@
         </div>
 
         <div class='results' data-media='results'>
-          <%= spinner_tag %>
+          <div class="spinner">
+            <%= icon_tag 'spinner fa-spin fa-4x' %>
+          </div>
         </div>
       </div>
     </div>

data/app/views/georgia/shared/search/_messages.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :search, url: search_messages_url, html: {class: 'form-search'}, method: :get do |f| %>
+<%= form_for :search, url: search_messages_path, html: {class: 'form-search'}, method: :get do |f| %>
   <%= text_field_tag :query, params[:query], class: 'search-query' %>
   <%= f.submit 'Search', name: nil, class: 'btn' %>
 <% end %>

data/app/views/georgia/users/_form.html.erb

@@ -19,9 +19,24 @@
 </fieldset>
 <fieldset>
   <div class="fieldset-help">
-    <legend>Roles</legend>
+    <legend>Role</legend>
+    <p class="hint">
+      <%= icon_tag('info-circle') %>
+      Users have different abilities depending on the access level (role) they are granted.
+      <%= link_to 'Learn more', permissions_users_path %>
+    </p>
   </div>
   <div class="fieldset-fields">
-    <%= f.association :roles, as: :check_boxes %>
+    <%= f.association :roles, as: :check_boxes, collection: georgia_roles_collection, label: false %>
+  </div>
+</fieldset>
+<fieldset>
+  <div class="fieldset-help">
+    <legend>Notifications</legend>
+  </div>
+  <div class="fieldset-fields">
+    <label class='checkbox'>
+      <%= f.check_box :receives_notifications, class: 'boolean optional form-control' %> Will receive email notifications and reminders from Georgia CMS
+    </label>
   </div>
 </fieldset>

data/app/views/georgia/users/_user.html.erb

@@ -1,7 +1,7 @@
 <tr>
   <td><%= link_to user.name, [:edit, user], class: 'user-name' %></td>
   <td><%= user.email %></td>
-  <td><%= user.roles_names %></td>
+  <td><%= user.role_names.join(', ') %></td>
   <td class='actions nowrap'>
     <%= link_to "#{icon_tag 'pencil'} Edit".html_safe, [:edit, user], class: 'btn btn-default' %>
     <%= link_to_delete user %>

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

@@ -1,4 +1,3 @@
-
 <%= simple_form_for(@user, url: user_path(@user), html: { class: 'form-horizontal'}, defaults: { input_html: { class: "form-control" }}) do |f| %>
 
   <header class='header-main'>

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

@@ -1,6 +1,6 @@
 <header class='header-main'>
   <div class="header-gutter">
-    <%= link_to_back %>
+    <%= link_to_back users_path %>
   </div>
   <div class="header-title">
     <h1>Users</h1>

data/app/views/georgia/users/permissions.html.erb

@@ -0,0 +1,15 @@
+<header class='header-main'>
+  <div class="header-gutter">
+    <%= link_to_back users_path %>
+  </div>
+  <div class="header-title">
+    <h1>User Permissions</h1>
+  </div>
+  <div class="header-actions">
+    <%= link_to "#{icon_tag 'plus'} Add User".html_safe, new_user_path, class: 'btn btn-primary' %>
+  </div>
+</header>
+
+<section class="body-main">
+  <%= permissions_view %>
+</section>

data/app/views/georgia/users/sessions/new.html.erb

@@ -10,8 +10,8 @@
   <% end %>
 
   <%= simple_form_for(resource, as: resource_name, url: georgia.user_session_path, html: {class: 'form-horizontal'}) do |f| %>
-    <%= f.input :email, placeholder: 'Email', label: false %>
-    <%= f.input :password, placeholder: 'Password', label: false %>
-    <%= f.submit 'Log In', class: 'btn' %>
+    <%= f.input :email, placeholder: 'Email', label: false, input_html: {class: 'form-control'} %>
+    <%= f.input :password, placeholder: 'Password', label: false, input_html: {class: 'form-control'} %>
+    <%= f.submit 'Log in', class: 'btn input-submit' %>
   <% end %>
 </div>

data/app/views/layouts/georgia/_footer.html.erb

@@ -1,7 +1,5 @@
 <footer id='footer'>
   <div class="container-fluid">
-    &copy; <%= Time.new.year %> -
-    Georgia is developed and maintained by
-    <%= link_to 'Motion Eleven', motioneleven_url %>
+    &copy; <%= Time.new.year %> - <%= link_to 'Georgia CMS', 'http://www.georgiacms.org' %>
   </div>
 </footer>

data/app/views/layouts/georgia/_head.html.erb

@@ -2,14 +2,13 @@
 <meta http-equiv="Content-Language" content="en-US" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title><%= Georgia.title %> CMS</title>
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
 <%= stylesheet_link_tag    "georgia/application", media: 'all' %>
 <%= javascript_include_tag "georgia/application" %>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
 <%= csrf_meta_tags %>
 <!--[if lt IE 9]>
   <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<%= favicon_link_tag %>
 <%= yield :head %>

data/app/views/layouts/georgia/_header.html.erb

@@ -1,7 +1,7 @@
 <header id='header' class='hidden-print'>
-  <nav class="navbar navbar-fixed-top" role="navigation">
+  <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
@@ -11,21 +11,19 @@
     </div>
 
     <% if signed_in? %>
-      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      <div class="navbar-collapse collapse navbar-inverse-collapse" id="navbar-main">
         <ul class="nav navbar-nav">
           <li>
-            <%= link_to 'Visit your website', main_app.root_url, class: 'header-link' %>
+            <%= link_to 'Visit your website', main_app.root_url %>
           </li>
         </ul>
         <ul class="nav navbar-nav navbar-right">
-          <% if can? :index, Georgia::User %>
-            <li>
-              <%= link_to icon_tag('users'), georgia.users_path, class: 'header-link--icon' %>
-            </li>
+          <% if Georgia::UserPolicy.new(current_user, Georgia::User).index? %>
+            <li><%= link_to icon_tag('users'), georgia.users_path, class: 'header-link--icon' %></li>
           <% end -%>
           <li class='dropdown'>
-            <%= link_to '#', class: 'dropdown-toggle header-link', data: {toggle: 'dropdown'} do %>
-              <%= image_tag avatar_url(current_user.email, size: 25), alt: '' %>
+            <%= link_to '#', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do %>
+              <%= image_tag avatar_url(current_user.email, size: 25), alt: '', class: 'img-circle' %>
               <span><%= current_user.name %></span>
               <%= content_tag(:b, nil, class: 'caret') %>
             <% end -%>

data/app/views/public_activity/_default.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has <%= activity.key %> <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_page/_copy.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has copied <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_page/_create.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has created <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_page/_decline.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has decline a review for <em><%= link_to activity.trackable.title, [:edit, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>