RubyGems - archangel - Versions diffs - 0.3.0 → 0.4.0 - Mend

archangel 0.3.0 → 0.4.0

Files changed (589) hide show

data/app/themes/default/assets/stylesheets/default/frontend.css CHANGED

@@ -1,13 +1,15 @@
-/**
- *  Default Archangel frontend theme
- *= require_self
- *
- *  Third-party assets
- * none
- *
- *  Third-party Archangel assets (from the vendor directory)
- *= require archangel/frontend
- *
- *  Theme assets
- *= require_tree ./frontend
- */
+ /**
+  *** Default Archangel frontend theme
+  *
+  **  Third-party assets (from Ruby gems)
+  * none
+  *
+  **  Third-party assets (from gem vendor directory)
+  * none
+  *
+  **  Theme assets
+  *= require default/frontend/default
+  *
+  **  Third-party Archangel assets (from the application vendor directory)
+  *= require archangel/frontend
+  */

data/app/themes/default/assets/stylesheets/default/frontend/default.scss ADDED

@@ -0,0 +1,5 @@
+@import '../variables';
+@import 'bootstrap';
+@import '../theme';

data/app/themes/default/views/layouts/auth.html.erb CHANGED

@@ -4,25 +4,27 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= content_for?(:title) ? yield(:title) : Archangel.t(:archangel) %></title>
+    <%= display_meta_tags %>
     <%= csrf_meta_tags %>
     <%= stylesheet_link_tag "#{current_theme}/auth", media: "all" %>
     <%= yield(:stylesheet) if content_for?(:stylesheet) %>
   </head>
-  <body class="app flex-row align-items-center">
+  <body class="app bg-light">
     <div class="container">
       <div class="row justify-content-center">
-        <div class="col-md-6">
-          <div class="card">
-            <div class="card-body">
-              <%= render "archangel/shared/flash_messages" %>
+        <div class="col-lg-6 col-md-8 col-10">
+          <div class="card o-hidden shadow-lg my-5">
+            <div class="card-body p-0">
+              <div class="p-4">
+                <%= image_tag(current_site.logo.medium.url, alt: current_site.name, class: "mx-auto d-block") %>
-              <%= image_tag(current_site.logo.medium.url, alt: current_site.name, class: "mx-auto d-block") %>
+                <%= render "archangel/shared/flash_messages" %>
-              <%= yield %>
+                <%= yield %>
+              </div>
             </div>
           </div>
         </div>

data/app/themes/default/views/layouts/backend.html.erb CHANGED

@@ -1,10 +1,11 @@
-<!doctype html>
+<!DOCTYPE html>
 <html dir="<%= text_direction %>" lang="<%= locale %>">
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= content_for?(:title) ? yield(:title) : Archangel.t(:archangel) %></title>
+    <%= display_meta_tags %>
     <%= csrf_meta_tags %>
@@ -14,20 +15,26 @@
     <%= render "archangel/shared/auth_token" %>
   </head>
-  <body class="app header-fixed sidebar-fixed aside-menu-fixed aside-menu-hidden">
+  <body class="app">
     <%= render "layouts/backend/header" %>
-    <div class="app-body">
+    <div class="wrapper">
       <%= render "layouts/backend/sidebar" %>
-      <main class="main">
-        <%= render "archangel/shared/flash_messages" %>
+      <div class="content-wrapper">
+        <div class="container-fluid">
+          <%= render "archangel/shared/flash_messages" %>
-        <%= yield %>
-      </main>
+          <%= yield %>
+        </div>
+        <%= render "layouts/backend/footer" %>
+      </div>
     </div>
-    <%= render "layouts/backend/footer" %>
+    <a class="scroll-to-top rounded" href="#">
+      <i class="fas fa-angle-up"></i>
+    </a>
     <%= javascript_include_tag "#{current_theme}/backend" %>
     <%= yield(:javascript) if content_for?(:javascript) %>

data/app/themes/default/views/layouts/backend/_footer.html.erb CHANGED

@@ -1,7 +1,11 @@
-<footer class="app-footer">
-  <span class="ml-auto">
-    <span class="powered-by"><%= Archangel.t(:powered_by) %></span>
-    <a href="https://github.com/archangel/archangel" target="_blank"><%= Archangel.t(:archangel) %></a>
-    <span class="version">v<%= Archangel.version %></span>
-  </span>
+<footer class="sticky-footer">
+  <div class="container my-auto">
+    <div class="copyright text-center my-auto">
+      <span class="powered-by"><%= Archangel.t(:powered_by) %></span>
+      <a href="https://github.com/archangel/archangel" target="_blank"><%= Archangel.t(:archangel) %></a>
+      <span class="version">v<%= Archangel.version %></span>
+    </div>
+  </div>
 </footer>

data/app/themes/default/views/layouts/backend/_header.html.erb CHANGED

@@ -1,31 +1,35 @@
-<header class="app-header navbar">
-  <button class="navbar-toggler mobile-sidebar-toggler d-lg-none mr-auto" type="button">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+<nav class="navbar navbar-expand navbar-dark bg-primary static-top">
   <a class="navbar-brand" href="<%= backend_root_path %>">
-    <span class="d-lg-none"><%= image_tag(current_site.logo.tiny.url, alt: current_site.name) %></span>
-    <span class="d-md-down-none align-middle"><%= current_site.name %></span>
+    <%= image_tag(current_site.logo.tiny.url, alt: current_site.name,
+                                              class: "d-inline-block align-top") %>
+    <%= current_site.name %>
   </a>
-  <button class="navbar-toggler sidebar-toggler d-md-down-none" type="button">
-    <span class="navbar-toggler-icon"></span>
-  </button>
+  <div id="navbarTop" class="navbar-collapse collapse">
+    <ul class="navbar-nav ml-auto">
+      <li class="nav-item">
+        <a class="nav-link" href="<%= root_path %>" target="_blank"><%= Archangel.t(:website) %></a>
+      </li>
-  <div class="btn-group ml-auto" role="toolbar" aria-label="Toolbar">
-    <a class="nav-link" href="<%= root_path %>">
-      <span class="d-md-down-none"><%= Archangel.t(:website) %></span>
-      <%= fa_icon("home") %>
-    </a>
+      <li class="nav-item dropdown no-arrow">
+        <a href="#" id="userDropdown"class="nav-link dropdown-toggle"
+                    role="button"
+                    data-toggle="dropdown"
+                    aria-haspopup="true" aria-expanded="false">
+          <%= image_tag(current_user.avatar.tiny.url, alt: current_user.username, class: "rounded") %>
+        </a>
-    <a class="nav-link" href="<%= backend_profile_path %>">
-      <span class="d-md-down-none"><%= Archangel.t(:profile) %></span>
-      <%= fa_icon("user") %>
-    </a>
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
+          <a class="dropdown-item" href="<%= backend_profile_path %>"><%= Archangel.t(:profile) %></a>
-    <a class="nav-link" data-method="delete" href="<%= destroy_user_session_path %>" rel="nofollow">
-      <span class="d-md-down-none"><%= Archangel.t(:logout) %></span>
-      <%= fa_icon("power-off") %>
-    </a>
+          <a href="<%= destroy_user_session_path %>" class="dropdown-item"
+                                                     data-method="delete"
+                                                     rel="nofollow">
+            <%= Archangel.t(:logout) %>
+          </a>
+        </div>
+      </li>
+    </ul>
   </div>
-</header>
+</nav>

data/app/themes/default/views/layouts/backend/_sidebar.html.erb CHANGED

@@ -1,55 +1,75 @@
-<div class="sidebar">
-  <nav class="sidebar-nav">
-    <ul class="nav">
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_root_path %>"><%= fa_icon("home") %> <%= Archangel.t(:dashboard) %></a>
-      </li>
+<div id="navbarSidebar">
+  <ul class="sidebar navbar-nav">
+    <li class="nav-item<%= " active" if active_backend_menu_for("dashboards") %>">
+      <a class="nav-link" href="<%= backend_root_path %>">
+        <i class="fas fa-home"></i>
+        <span><%= Archangel.t(:dashboard) %></span>
+      </a>
+    </li>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_pages_path %>"><%= fa_icon("file") %> <%= Archangel.t(:pages) %></a>
-      </li>
+    <li class="nav-item<%= " active" if active_backend_menu_for("pages") %>">
+      <a class="nav-link" href="<%= backend_pages_path %>">
+        <i class="fas fa-file"></i>
+        <span><%= Archangel.t(:pages) %></span>
+      </a>
+    </li>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_collections_path %>"><%= fa_icon("folder-open") %> <%= Archangel.t(:collections) %></a>
-      </li>
+    <li class="nav-item<%= " active" if active_backend_menu_for("widgets") %>">
+      <a class="nav-link" href="<%= backend_widgets_path %>">
+        <i class="fas fa-star"></i>
+        <span><%= Archangel.t(:widgets) %></span>
+      </a>
+    </li>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_widgets_path %>"><%= fa_icon("star") %> <%= Archangel.t(:widgets) %></a>
-      </li>
+    <li class="nav-item dropdown<%= " active" if active_backend_menu_for("collections") %>">
+      <a href="<%= backend_collections_path %>" id="entriesDropdown" class="nav-link dropdown-toggle"
+                                                role="button"
+                                                data-toggle="dropdown"
+                                                aria-haspopup="true" aria-expanded="false">
+        <i class="fas fa-layer-group"></i>
+        <span><%= Archangel.t(:collections) %></span>
+      </a>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_assets_path %>"><%= fa_icon("paperclip") %> <%= Archangel.t(:assets) %></a>
-      </li>
+      <% if current_site.collections.present? %>
+        <div class="dropdown-menu" aria-labelledby="entriesDropdown">
+          <% current_site.collections.each_with_index do |item, index| %>
+            <% next unless item.persisted? %>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_templates_path %>"><%= fa_icon("flag") %> <%= Archangel.t(:templates) %></a>
-      </li>
+            <a class="dropdown-item" href="<%= backend_collection_entries_path(item) %>">
+              <i class="fas fa-circle"></i>
+              <span><%= item.name %></span>
+            </a>
+          <% end %>
+        </div>
+      <% end %>
+    </li>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_users_path %>"><%= fa_icon("user") %> <%= Archangel.t(:users) %></a>
-      </li>
+    <li class="nav-item<%= " active" if active_backend_menu_for("designs") %>">
+      <a class="nav-link" href="<%= backend_designs_path %>">
+        <i class="fas fa-paint-roller"></i>
+        <span><%= Archangel.t(:designs) %></span>
+      </a>
+    </li>
-      <li class="nav-item">
-        <a class="nav-link" href="<%= backend_site_path %>"><%= fa_icon("cog") %> <%= Archangel.t(:site) %></a>
-      </li>
+    <li class="nav-item<%= " active" if active_backend_menu_for("assets") %>">
+      <a class="nav-link" href="<%= backend_assets_path %>">
+        <i class="fas fa-images"></i>
+        <span><%= Archangel.t(:assets) %></span>
+      </a>
+    </li>
-      <% if current_site.collections.present? %>
-        <% current_site.collections.each_with_index do |item, index| %>
-          <% if item.persisted? %>
-            <% if index.zero? %>
-              <li class="nav-title">
-                <%= Archangel.t(:collections) %>
-              </li>
-            <% end %>
-            <li class="nav-item">
-              <a class="nav-link" href="<%= backend_collection_entries_path(item) %>"><%= fa_icon("circle") %> <%= item.name %></a>
-            </li>
-          <% end %>
-        <% end %>
-      <% end %>
-    </ul>
-  </nav>
+    <li class="nav-item<%= " active" if active_backend_menu_for("users") %>">
+      <a class="nav-link" href="<%= backend_users_path %>">
+        <i class="fas fa-users"></i>
+        <span><%= Archangel.t(:users) %></span>
+      </a>
+    </li>
-  <button class="sidebar-minimizer brand-minimizer" type="button"></button>
+    <li class="nav-item<%= " active" if active_backend_menu_for("sites") %>">
+      <a class="nav-link" href="<%= backend_site_path %>">
+        <i class="fas fa-globe-americas"></i>
+        <span><%= Archangel.t(:site) %></span>
+      </a>
+    </li>
+  </ul>
 </div>

data/app/themes/default/views/layouts/frontend.html.erb ADDED

@@ -0,0 +1,20 @@
+<!doctype html>
+<html dir="<%= text_direction %>" lang="<%= locale %>">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <%= display_meta_tags %>
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag "#{current_theme}/frontend", media: "all" %>
+    <%= yield(:stylesheet) if content_for?(:stylesheet) %>
+  </head>
+  <body>
+    <%= yield %>
+    <%= javascript_include_tag "#{current_theme}/frontend" %>
+    <%= yield(:javascript) if content_for?(:javascript) %>
+  </body>
+</html>

data/app/views/archangel/backend/assets/_asset.html.erb CHANGED

@@ -1,12 +1,19 @@
 <tr>
   <td><%= image_tag(asset.file.tiny.url, alt: asset.file_name) %></td>
-  <td><%= asset.file_name %></td>
-  <td><%= asset.content_type %></td>
-  <td><%= number_to_human_size(asset.file_size) %></td>
+  <td class="d-none d-sm-table-cell">
+    <%= asset.file_name %>
+  </td>
+  <td class="d-none d-lg-table-cell">
+    <%= asset.content_type %>
+  </td>
+  <td class="d-none d-lg-table-cell">
+    <%= number_to_human_size(asset.file_size) %>
+  </td>
   <td class="actions text-right">
-    <%= link_to(fa_icon("info-circle", text: Archangel.t(:show)), backend_asset_path(asset), class: "btn btn-info btn-sm") %>
-    <%= link_to(fa_icon("check-circle", text: Archangel.t(:edit)), edit_backend_asset_path(asset), class: "btn btn-warning btn-sm") %>
-    <%= link_to(fa_icon("times-circle", text: Archangel.t(:destroy)), backend_asset_path(asset), class: "btn btn-danger btn-sm",
-                                        method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+    <%= link_to(Archangel.t(:show), backend_asset_path(asset), class: "btn btn-info btn-sm") %>
+    <%= link_to(Archangel.t(:edit), edit_backend_asset_path(asset), class: "btn btn-warning btn-sm") %>
+    <%= link_to(Archangel.t(:destroy), backend_asset_path(asset), class: "btn btn-danger btn-sm d-none d-md-inline-block",
+                                                                  method: :delete,
+                                                                  data: { confirm: Archangel.t(:are_you_sure) }) %>
   </td>
 </tr>

data/app/views/archangel/backend/assets/_buttons.html.erb CHANGED

@@ -1,18 +1,20 @@
 <div class="btn-group pull-right" role="group" aria-label="Button group">
   <% if member_action? || new_action? %>
-    <%= link_to(fa_icon("chevron-left", text: Archangel.t(:back)), backend_assets_path, class: "btn btn-link") %>
+    <%= link_to(Archangel.t(:back), backend_assets_path, class: "btn btn-link", role: "button") %>
   <% end %>
   <% if collection_action? || show_action? || edit_action? %>
-    <%= link_to(fa_icon("plus", text: Archangel.t(:new)), new_backend_asset_path, class: "btn btn-link") %>
+    <%= link_to(Archangel.t(:new), new_backend_asset_path, class: "btn btn-link", role: "button") %>
   <% end %>
   <% if show_action? %>
-    <%= link_to(fa_icon("check", text: Archangel.t(:edit)), edit_backend_asset_path(@asset), class: "btn btn-link") %>
+    <%= link_to(Archangel.t(:edit), edit_backend_asset_path(@asset), class: "btn btn-link", role: "button") %>
   <% end %>
   <% if show_action? || edit_action? %>
-    <%= link_to(fa_icon("times", text: Archangel.t(:destroy)), backend_asset_path(@asset), class: "btn btn-link",
-                                 method: :delete, data: { confirm: Archangel.t(:are_you_sure) }) %>
+    <%= link_to(Archangel.t(:destroy), backend_asset_path(@asset), class: "btn btn-link d-none d-md-inline-block",
+                                                                   role: "button",
+                                                                   method: :delete,
+                                                                   data: { confirm: Archangel.t(:are_you_sure) }) %>
   <% end %>
 </div>

data/app/views/archangel/backend/assets/_form.html.erb CHANGED

@@ -22,6 +22,6 @@
   </div>
   <div class="form-actions text-right">
-    <%= f.button :submit %>
+    <%= f.button :submit, class: "btn btn-primary" %>
   </div>
 <% end %>

data/app/views/archangel/backend/assets/edit.html.erb CHANGED

@@ -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("paperclip") %> <%= Archangel.t(:edit_resource, resource: @asset.model_name.human.titleize) %></h2>
+    <h2><%= Archangel.t(:edit_resource, resource: @asset.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 assets-edit">
+  <div class="card-header">
+    <%= render "buttons" %>
+  </div>
-        <div class="card-body">
-          <%= render "form", asset: @asset %>
-        </div>
-      </div>
-    </div>
+  <div class="card-body">
+    <%= render "form", asset: @asset %>
   </div>
 </div>

data/app/views/archangel/backend/assets/index.html.erb CHANGED

@@ -1,51 +1,43 @@
-<div class="card card-default">
+<div class="card card-default sticky-title rounded-0">
   <div class="card-body">
-    <h2><%= fa_icon("paperclip") %> <%= Archangel.t(:index_resource, resource: @assets.model_name.human.titleize) %></h2>
+    <h2><%= Archangel.t(:index_resource, resource: @assets.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">
-          <% if @assets.present? %>
-            <%= paginate @assets %>
-            <div class="table-responsive">
-              <table class="table table-hover table-bordered table-striped">
-                <thead>
-                  <tr>
-                    <th scope="col"><%= Archangel.t(:file) %></th>
-                    <th scope="col"><%= Archangel.t(:file_name) %></th>
-                    <th scope="col"><%= Archangel.t(:content_type) %></th>
-                    <th scope="col"><%= Archangel.t(:file_size) %></th>
-                    <th class="actions text-right" scope="col"><%= Archangel.t(:actions) %></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <%= render partial: "asset", collection: @assets %>
-                </tbody>
-              </table>
-            </div>
-            <%= paginate @assets %>
-          <% else %>
-            <p class="no-resources">
-              <%= Archangel.t(:no_resources, resources: @assets.model_name.human.pluralize.downcase) %>
-            </p>
-          <% end %>
-        </div>
+<div class="card assets-index">
+  <div class="card-header">
+    <%= render "buttons" %>
+  </div>
+  <div class="card-body">
+    <% if @assets.present? %>
+      <div class="table-responsive text-nowrap">
+        <table class="table table-hover table-bordered table-striped">
+          <thead>
+            <tr>
+              <th scope="col"><%= Archangel.t(:file) %></th>
+              <th scope="col" class="d-none d-sm-table-cell"><%= Archangel.t(:file_name) %></th>
+              <th scope="col" class="d-none d-lg-table-cell"><%= Archangel.t(:content_type) %></th>
+              <th scope="col" class="d-none d-lg-table-cell"><%= Archangel.t(:file_size) %></th>
+              <th class="actions text-right" scope="col"><%= Archangel.t(:actions) %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render partial: "asset", collection: @assets %>
+          </tbody>
+        </table>
       </div>
-    </div>
+      <%= paginate @assets %>
+    <% else %>
+      <p class="no-resources">
+        <%= Archangel.t(:no_resources, resources: @assets.model_name.human.pluralize.downcase) %>
+      </p>
+    <% end %>
   </div>
 </div>