RubyGems - pages_core - Versions diffs - 3.11.3 → 3.12.1 - Mend

pages_core 3.11.3 → 3.12.1

Files changed (124) hide show

data/app/views/layouts/admin/_header.html.erb CHANGED Viewed

@@ -1,8 +1,8 @@
 <header>
-  <div id="logo">
-    <%= link_to image_tag("pages/admin/icon.png"), '/admin' %>
+  <div class="logo">
+    <%= link_to image_tag("pages/admin/icon.svg"), '/admin' %>
   </div>
-  <div id="site-name">
+  <div class="site-name">
     <h1>
       <%= link_to "Pages", "/admin" %> <%= PagesCore.config :site_name %>
     </h1>
@@ -10,28 +10,15 @@
   <% if logged_in? %>
     <div class="user">
       Hello, <%= link_to(current_user.name, admin_user_url(current_user)) %>
-      <%= link_separator %>
       <%= link_to("Log out", session_path, method: "delete") %>
     </div>
   <% end %>
-  <div class="tabs">
+  <nav class="tabs">
     <% if logged_in? %>
       <%= header_tabs(:pages) %>
       <%= header_tabs(:pages_plugins) %>
       <%= header_tabs(:custom) %>
       <%= header_tabs(:account) %>
     <% end -%>
-  </div>
+  </nav>
 </header>
-<% if flash[:error] && false %>
-  <div id="flash-error">
-    <%= flash[:error] %>
-  </div>
-<% end %>
-<% if flash[:notice] && false %>
-  <div id="flash-notice">
-    <%= flash[:notice] %>
-  </div>
-<% end %>

data/app/views/layouts/admin/_page_header.html.erb CHANGED Viewed

@@ -1,15 +1,16 @@
-<% if @page_description || @content_tabs %>
-  <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
-    <% if @page_description_links -%>
+<% if content_for?(:page_description) || @content_tabs %>
+  <div class="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
+    <% if content_for?(:page_description_links) %>
       <div class="links">
-        <%= @page_description_links.html_safe %>
+        <%= content_for(:page_description_links) %>
       </div>
     <% end %>
     <h3>
-      <%= (@page_description || @page_title).html_safe %>
+      <%= content_for(:page_description) || content_for(:page_title) %>
     </h3>
     <% if @content_tabs %>
-      <ul id="content-tabs">
+      <ul class="content-tabs"
+          role="tablist">
         <% @content_tabs.map do |t| %>
           <li id="content-tab-link-<%= t[:key] %>"
               data-tab="<%= t[:key] %>"
@@ -23,7 +24,8 @@
                 data: {
                   action: "click->main#changeTab",
                   tab: t[:key]
-              }) %>
+                },
+                role: "tab") %>
             <% end %>
           </li>
         <% end %>

data/app/views/layouts/admin.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>
-      <%= [@page_title, "Pages"].reject(&:blank?).uniq.join(" - ") %>
+      <%= [content_for(:page_title), "Pages"].reject(&:blank?).uniq.join(" - ") %>
     </title>
     <link rel="shortcut icon"
@@ -13,7 +13,7 @@
           href="<%= asset_path 'pages/favicon.gif' %>"
           type="image/gif" />
-    <%= stylesheet_link_tag "pages/admin" %>
+    <%= stylesheet_link_tag "pages_core/admin" %>
     <% if Dir.glob(Rails.root.join("app/assets/stylesheets/admin.*")).any? %>
       <%= stylesheet_link_tag "admin" %>
@@ -34,7 +34,7 @@
     <%= google_analytics_tags "UA-5468672-21" %>
   </head>
-  <body class="<%= body_classes.join(" ") %>"
+  <body class="<%= content_for(:body_class) %>"
         data-controller="<%= controller.class.to_s %>"
         data-action="<%= controller.action_name %>"
         data-locale="<%= @locale %>">

data/app/views/layouts/errors.html.erb CHANGED Viewed

@@ -5,15 +5,138 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title><%= @page_title || "We're sorry" %></title>
-  <%= stylesheet_link_tag "pages/errors" %>
+  <title><%= content_for(:page_title) || "We're sorry" %></title>
+  <style>
+    body {
+      background: #fff;
+      background: linear-gradient(180deg, rgba(236, 236, 236, 1) 0%, rgba(255, 255, 255, 1) 50%);
+      background-repeat: no-repeat;
+      margin: 0;
+      padding: 0;
+      border: 0;
+      font-family: Helvetica, Arial, sans-serif;
+      font-size: 16px;
+      color: #111;
+      line-height: 1.5;
+    }
+    main {
+      width: 600px;
+      margin: 150px auto;
+    }
+    h1, h2, h3, h4, h5, h6, p, ul, form {
+      margin: 0 0 16px 0;
+    }
+    h4 {
+      margin-bottom: 0;
+      font-size: 1em;
+      font-weight: bold;
+    }
+    h4 em {
+      font-weight: normal;
+      font-style: normal;
+    }
+    ul {
+      list-style-type: disc;
+      list-style-position: inside;
+      padding: 0;
+    }
+    ul li {
+      margin: 0;
+      padding: 0;
+    }
+    h1 {
+      font-weight: bold;
+      color: #111;
+      font-size: 36px;
+    }
+    p.footer {
+      margin-top: 64px;
+      font-size: 12px;
+      color: #868686;
+    }
+    p.error_id {
+      margin-top: 64px;
+      font-size: 12px;
+      color: #dcdbd2;
+    }
+    input[type=text],
+    textarea {
+      vertical-align: top;
+      border: 1px solid #c4c2bb;
+      color: #444;
+      font-family: Helvetica, Arial, sans-serif;
+      font-size: 18px;
+      padding: 6px 8px 6px 8px;
+      width: 490px;
+      border-radius: 3px;
+    }
+    input.with_button {
+      width: 400px;
+      margin-right: 4px;
+    }
+    a,
+    a:visited {
+      color: #0751b6;
+      text-decoration: underline;
+    }
+    a:hover {
+      color: #042d65;
+    }
+    form {
+      vertical-align: top;
+    }
+    button.clean-gray {
+      background-color: #eeeeee;
+      background-image: linear-gradient(top, #f8f8f8, #e0e0e0);
+      border: 1px solid #ccc;
+      border-bottom: 1px solid #bbb;
+      border-radius: 3px;
+      color: #333;
+      font: bold 15px Helvetica, Arial, sans-serif;
+      line-height: 1;
+      padding: 9px 0;
+      text-align: center;
+      text-shadow: 0 1px 0 #eee;
+      width: 150px;
+    }
+    button.clean-gray:hover {
+      background-color: #dddddd;
+      background-image: linear-gradient(top, #f0f0f0, #dddddd);
+      border: 1px solid #bbb;
+      border-bottom: 1px solid #aaa;
+      cursor: pointer;
+      text-shadow: 0 1px 0 #ddd;
+    }
+    button.clean-gray:active {
+      border: 1px solid #aaa;
+      border-bottom: 1px solid #888;
+      box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
+    }
+  </style>
 </head>
 <body>
-  <div id="content">
-    <% if @page_title %>
-      <h1><%= @page_title %></h1>
+  <main>
+    <% if content_for?(:page_title) %>
+      <h1><%= content_for(:page_title) %></h1>
     <% end %>
     <%= yield %>
-  </content>
+  </main>
 </body>
 </html>

data/config/routes.rb CHANGED Viewed

@@ -78,11 +78,16 @@ Rails.application.routes.draw do
     # Pages
     scope ":locale" do
+      resources :news,
+                only: %i[index],
+                path: "pages/news(/:year(/:month)(/page/:page))"
+      resource :calendar,
+               path: "pages/calendar(/:year(/:month)(/page/:page))"
       resources :pages do
         collection do
-          get "news(/:year(/:month)(/page/:page))", action: :news, as: :news
           get "deleted"
-          get "new_news" # TODO: Should be refactored
         end
         member do

data/lib/pages_core/engine.rb CHANGED Viewed

@@ -28,10 +28,11 @@ module PagesCore
     initializer :assets do |_config|
       Rails.application.config.assets.precompile += %w[
         pages_core/admin-dist.js
-        pages/admin.css
-        pages/errors.css
+        pages_core/admin.css
+        pages_core/fonts/*.ttf
+        pages_core/fonts/*.woff2
         pages/favicon.gif
-        pages/admin/icon.png
+        pages/admin/icon.svg
         pages/*.gif
         pages/*.png
         pages/*.jpg

data/lib/pages_core/pages_plugin.rb CHANGED Viewed

@@ -15,11 +15,16 @@ module PagesCore
     paths["db/migrate"] = "db/migrate"
-    admin_menu_item "News",  proc { news_admin_pages_path(@locale) }, :pages,
+    admin_menu_item "News",  proc { admin_news_index_path(@locale) }, :pages,
                     if: proc { Page.news_pages.any? },
                     current: proc { @page && @page.parent.try(&:news_page?) }
+    admin_menu_item "Calendar", proc { admin_calendar_path(@locale) }, :pages,
+                    if: proc { Page.with_dates.any? },
+                    current: proc { @page && @page.starts_at? }
     admin_menu_item "Pages", proc { admin_pages_path(@locale) }, :pages
     admin_menu_item "Users", proc { admin_users_path }, :account
   end
 end

data/lib/pages_core.rb CHANGED Viewed

@@ -41,7 +41,6 @@ require "will_paginate"
 require "will_paginate/view_helpers/action_view"
 # Assets
-require "font-awesome-rails"
 require "react-rails"
 # Pages

data/lib/rails/generators/pages_core/install/install_generator.rb CHANGED Viewed

@@ -58,8 +58,8 @@ module PagesCore
       end
       def create_delayed_job_script
-        template "delayed_job", File.join("script/delayed_job")
-        File.chmod(0o755, Rails.root.join("script/delayed_job"))
+        template "delayed_job", File.join("bin/delayed_job")
+        File.chmod(0o755, Rails.root.join("bin/delayed_job"))
       end
       def create_delayed_job_initializer

data/lib/rails/generators/pages_core/install/templates/delayed_job CHANGED Viewed

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-require File.expand_path(
-  File.join(File.dirname(__FILE__), "..", "config", "environment")
-)
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "config",
+                                   "environment"))
 require "delayed/command"
 Delayed::Command.new(ARGV).daemonize

data/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb CHANGED Viewed

@@ -31,7 +31,7 @@ require "shoulda-matchers"
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join("spec/support/**/*.rb")].sort.each do |f|
+Dir[Rails.root.join("spec/support/**/*.rb")].each do |f|
   require f
 end
@@ -41,7 +41,7 @@ ActiveRecord::Migration.maintain_test_schema!
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = Rails.root.join("spec/fixtures")
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false