archangel 0.3.0 → 0.4.0

data/app/views/archangel/backend/widgets/new.html.erb

@@ -1,21 +1,15 @@
-<div class="card card-default">
+<div class="card card-default sticky-title rounded-0">
   <div class="card-body">
-    <h2><%= fa_icon("star") %> <%= Archangel.t(:new_resource, resource: @widget.model_name.human.titleize) %></h2>
+    <h2><%= Archangel.t(:new_resource, resource: @widget.model_name.human.titleize) %></h2>
   </div>
 </div>
 
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="card pages-index">
-        <div class="card-header">
-          <%= render "buttons" %>
-        </div>
+<div class="card widgets-new">
+  <div class="card-header">
+    <%= render "buttons" %>
+  </div>
 
-        <div class="card-body">
-          <%= render "form", widget: @widget %>
-        </div>
-      </div>
-    </div>
+  <div class="card-body">
+    <%= render "form", widget: @widget %>
   </div>
 </div>

data/app/views/archangel/backend/widgets/show.html.erb

@@ -1,42 +1,31 @@
-<div class="card card-default">
+<div class="card card-default sticky-title rounded-0">
   <div class="card-body">
-    <h2><%= fa_icon("star") %> <%= Archangel.t(:show_resource, resource: @widget.model_name.human.titleize) %></h2>
+    <h2><%= Archangel.t(:show_resource, resource: @widget.model_name.human.titleize) %></h2>
   </div>
 </div>
 
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="card pages-index">
-        <div class="card-header">
-          <%= render "buttons" %>
-        </div>
-
-        <div class="card-body">
-          <p>
-            <strong><%= Archangel.t(:name) %>:</strong>
-            <%= @widget.name %>
-          </p>
+<div class="card widgets-show">
+  <div class="card-header">
+    <%= render "buttons" %>
+  </div>
 
-          <p>
-            <strong><%= Archangel.t(:slug) %>:</strong>
-            <%= @widget.slug %>
-          </p>
+  <div class="card-body">
+    <p>
+      <strong><%= Archangel.t(:name) %>:</strong>
+      <%= @widget.name %>
+    </p>
 
-          <p>
-            <strong><%= Archangel.t(:content) %>:</strong>
-            <%= @widget.content %>
-          </p>
+    <p>
+      <strong><%= Archangel.t(:slug) %>:</strong>
+      <%= @widget.slug %>
+    </p>
 
-          <p>
-            <pre>
-              <code>
+    <div>
+      <pre>
+        <code>
 {% widget "<%= @widget.slug %>" %}
-              </code>
-            </pre>
-          </p>
-        </div>
-      </div>
+        </code>
+      </pre>
     </div>
   </div>
 </div>

data/app/views/archangel/frontend/pages/show.json.jbuilder

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 json.page do
-  json.extract! @page, :id, :title, :path, :content
+  json.extract! @page, :id, :title, :homepage, :content
 
-  json.published_at @page.published_at.strftime("%F %T")
-  json.published_at_timestamp @page.published_at.to_time.to_i
+  json.permalink frontend_resource_path(@page)
+
+  json.published_at @page.published_at
 end

data/app/views/archangel/shared/_flash_messages.html.erb

@@ -1,8 +1,11 @@
-<div id="alert-messages">
+<div class="alert-messages">
   <% unless flash.empty? %>
     <% flash.delete(:timedout).each do |type, message| %>
-      <div class="alert alert-<%= flash_class_for(type) %> alert-link alert-dismissable" role="alert">
+      <div class="alert alert-<%= flash_class_for(type) %> alert-link fade show" role="alert">
         <%= message %>
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
       </div>
     <% end %>
   <% end %>

data/app/views/devise/confirmations/new.html.erb

@@ -1,17 +1,19 @@
 <h2>Resend confirmation instructions</h2>
 
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :confirmation_token %>
 
   <div class="form-inputs">
-    <div class="form-group string required email">
-      <%= f.label :email, class: "control-label string email required" %>
-      <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: "form-control string email required" %>
-    </div>
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
+                input_html: { autocomplete: "email" } %>
   </div>
 
-  <div class="form-actions text-right">
-    <%= f.submit "Resend confirmation instructions", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Resend confirmation instructions", class: "btn btn-primary" %>
   </div>
 <% end %>
 

data/app/views/devise/invitations/edit.html.erb

@@ -0,0 +1,17 @@
+<h2><%= t "devise.invitations.edit.header" %></h2>
+
+<%= simple_form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put } do |f| %>
+  <%= f.error_notification %>
+  <%= f.hidden_field :invitation_token %>
+
+  <div class="form-inputs">
+    <%= f.input :name %>
+    <%= f.input :username %>
+    <%= f.input :password %>
+    <%= f.input :password_confirmation %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t("devise.invitations.edit.submit_button"), class: "btn btn-primary" %>
+  </div>
+<% end %>

data/app/views/devise/invitations/new.html.erb

@@ -0,0 +1,15 @@
+<h2><%= t "devise.invitations.new.header" %></h2>
+
+<%= simple_form_for resource, as: resource_name, url: invitation_path(resource_name), html: { method: :post} do |f| %>
+  <%= f.error_notification %>
+
+  <% resource.class.invite_key_fields.each do |field| -%>
+    <div class="form-inputs">
+      <%= f.input field %>
+    </div>
+  <% end -%>
+
+  <div class="form-actions">
+    <%= f.button :submit, t("devise.invitations.new.submit_button"), class: "btn btn-primary" %>
+  </div>
+<% end %>

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -0,0 +1,11 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
+
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", url: archangel.root_url) %></p>
+
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
+
+<% if @resource.invitation_due_at %>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
+<% end %>
+
+<p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

data/app/views/devise/mailer/invitation_instructions.text.erb

@@ -0,0 +1,11 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
+
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", url: archangel.root_url) %>
+
+<%= accept_invitation_url(@resource, :invitation_token => @token) %>
+
+<% if @resource.invitation_due_at %>
+  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
+<% end %>
+
+<%= t("devise.mailer.invitation_instructions.ignore") %>

data/app/views/devise/passwords/edit.html.erb

@@ -1,27 +1,23 @@
 <h2>Change your password</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
 
-  <div class="form-inputs">
-    <div class="form-group string required password">
-      <%= f.label :password, "New password", class: "control-label string password required" %>
-      <% if @minimum_password_length %>
-        <em>(<%= @minimum_password_length %> characters minimum)</em><br />
-      <% end %>
-      <%= f.password_field :password, autofocus: true, autocomplete: "off", class: "form-control string password required" %>
-    </div>
+  <%= f.input :reset_password_token, as: :hidden %>
+  <%= f.full_error :reset_password_token %>
 
-    <div class="form-group string required confirm_password">
-      <%= f.label :password_confirmation, "Confirm new password", class: "control-label string password required" %>
-      <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control string password required" %>
-    </div>
+  <div class="form-inputs">
+    <%= f.input :password,
+                label: "New password",
+                required: true,
+                autofocus: true,
+                hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation, label: "Confirm your new password", required: true %>
   </div>
 
-
-  <div class="form-actions text-right">
-    <%= f.submit "Change my password", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Change my password", class: "btn btn-primary" %>
   </div>
 <% end %>
 

data/app/views/devise/passwords/new.html.erb

@@ -1,17 +1,17 @@
 <h2>Forgot your password?</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= devise_error_messages! %>
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
 
   <div class="form-inputs">
-    <div class="form-group string required email">
-      <%= f.label :email, class: "control-label string email required"%>
-      <%= f.email_field :email, autofocus: true, class: "form-control string email required" %>
-    </div>
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
   </div>
 
-  <div class="form-actions text-right">
-    <%= f.submit "Send me reset password instructions", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Send me reset password instructions", class: "btn btn-primary" %>
   </div>
 <% end %>
 

data/app/views/devise/registrations/edit.html.erb

@@ -1,45 +1,35 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= devise_error_messages! %>
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
 
   <div class="form-inputs">
-    <div class="form-group string required email">
-      <%= f.label :email, class: "control-label string email required" %>
-      <%= f.email_field :email, autofocus: true, class: "form-control string email required" %>
-    </div>
+    <%= f.input :email, required: true, autofocus: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-      <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+      <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
     <% end %>
 
-    <div class="form-group string required password">
-      <%= f.label :password, class: "control-label string password required" %> <i>(leave blank if you don't want to change it)</i><br />
-      <%= f.password_field :password, autocomplete: "off", class: "form-control string password required" %>
-      <% if @minimum_password_length %>
-        <br />
-        <em><%= @minimum_password_length %> characters minimum</em>
-      <% end %>
-    </div>
-
-    <div class="form-group string required password">
-      <%= f.label :password_confirmation, class: "control-label string password required" %>
-      <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control string password required" %>
-    </div>
-
-    <div class="form-group string required password">
-      <%= f.label :current_password, class: "control-label string password required" %> <i>(we need your current password to confirm your changes)</i><br />
-      <%= f.password_field :current_password, autocomplete: "off", class: "form-control string password required" %>
-    </div>
+    <%= f.input :password,
+                hint: "leave it blank if you don't want to change it",
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :current_password,
+                hint: "we need your current password to confirm your changes",
+                required: true,
+                input_html: { autocomplete: "current-password" } %>
   </div>
 
-  <div class="form-actions text-right">
-    <%= f.submit "Update", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Update", class: "btn btn-primary" %>
   </div>
 <% end %>
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
 
 <%= link_to "Back", :back %>

data/app/views/devise/registrations/new.html.erb

@@ -1,40 +1,28 @@
 <h2>Sign up</h2>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= f.error_notification %>
 
   <div class="form-inputs">
-    <div class="form-group string required name">
-      <%= f.label :name, class: "control-label string name required" %>
-      <%= f.text_field :name, autofocus: true, class: "form-control string name required" %>
-    </div>
-
-    <div class="form-group string required username">
-      <%= f.label :username, class: "control-label string username required" %>
-      <%= f.text_field :username, class: "form-control string username required" %>
-    </div>
-
-    <div class="form-group string required email">
-      <%= f.label :email, class: "control-label string email required" %>
-      <%= f.email_field :email, class: "form-control string email required" %>
-    </div>
-
-    <div class="form-group string required password">
-      <%= f.label :password, class: "control-label string password required" %>
-      <% if @minimum_password_length %>
-        <em>(<%= @minimum_password_length %> characters minimum)</em>
-      <% end %><br />
-      <%= f.password_field :password, autocomplete: "off", class: "form-control string password required" %>
-    </div>
-
-    <div class="form-group string required password">
-      <%= f.label :password_confirmation, class: "control-label string password required" %>
-      <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control string password required" %>
-    </div>
+    <%= f.input :name,
+                required: true,
+                autofocus: true %>
+    <%= f.input :username,
+                required: true %>
+    <%= f.input :email,
+                required: true,
+                input_html: { autocomplete: "email" }%>
+    <%= f.input :password,
+                required: true,
+                hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
   </div>
 
-  <div class="form-actions text-right">
-    <%= f.submit "Sign up", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Sign up", class: "btn btn-primary" %>
   </div>
 <% end %>
 

data/app/views/devise/sessions/new.html.erb

@@ -1,27 +1,19 @@
 <h2>Log in</h2>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="form-inputs">
-    <div class="form-group string required email">
-      <%= f.label :email, class: "control-label string email required" %>
-      <%= f.email_field :email, autofocus: true, class: "form-control string email required" %>
-    </div>
-
-    <div class="form-group string required password">
-      <%= f.label :password, class: "control-label string password required" %>
-      <%= f.password_field :password, autocomplete: "off", class: "form-control string password required" %>
-    </div>
-
-    <% if devise_mapping.rememberable? -%>
-      <div class="form-group boolean optional remember_me">
-        <%= f.check_box :remember_me %>
-        <%= f.label :remember_me %>
-      </div>
-    <% end -%>
+    <%= f.input :email,
+                required: false,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+    <%= f.input :password,
+                required: false,
+                input_html: { autocomplete: "current-password" } %>
+    <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
   </div>
 
-  <div class="form-actions text-right">
-    <%= f.submit "Log in", class: "btn btn-default" %>
+  <div class="form-actions">
+    <%= f.button :submit, "Log in", class: "btn btn-primary" %>
   </div>
 <% end %>
 

data/app/views/devise/shared/_error_messages.html.erb

@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>