pages_core 3.12.0 → 3.12.2

data/app/views/admin/users/deactivated.html.erb

@@ -1,12 +1,11 @@
-<%
-  self.page_title = "Deactivated users"
-  self.page_description = "Viewing deactivated users"
-  self.page_description_links = link_to("View active users", admin_users_path)
-%>
+<% content_for :page_title, "Deactivated users" %>
+<% content_for :page_description, "Viewing deactivated users" %>
 
+<% content_for(:page_description_links) do %>
+  <%= link_to("View active users", admin_users_path) %>
+<% end %>
 
 <% content_for :sidebar do %>
 <% end %>
 
-
-<%= render partial: 'list', locals: {users: @users} %>
+<%= render partial: "list", locals: { users: @users } %>

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

@@ -1,12 +1,10 @@
-<%
-  self.page_title = "Editing user: #{@user.name}"
-  if @user == current_user
-    self.page_description = "You are editing " + link_to("your own", [:admin, @user]) + " profile."
-  else
-    self.page_description = "You are editing " + link_to("#{@user.name}", [:admin, @user]) + "'s profile."
-  end
-  self.page_description_links = link_to("View all users", admin_users_path)
-%>
+<% content_for :page_title, "Editing user: #{@user.name}" %>
+
+<% content_for :page_description do %>
+  You are editing
+  <%= link_to((@user == current_user ? "your own profile" : "#{@user.name}"),
+              [:admin, @user]) %>
+<% end %>
 
 <% content_for :sidebar do %>
   <% if @user != current_user %>

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

@@ -1,8 +1,5 @@
-<%
-  self.page_title = "Users"
-  self.page_description = "Viewing active users"
-%>
-
+<% content_for :page_title, "Users" %>
+<% content_for :page_description, "Viewing active users" %>
 
 <% content_for :sidebar do %>
   <% if policy(User).new? %>
@@ -24,4 +21,4 @@
 <% end %>
 
 
-<%= render partial: 'list', locals: {users: @users} %>
+<%= render partial: "list", locals: { users: @users } %>

data/app/views/admin/users/login.html.erb

@@ -1,8 +1,7 @@
-<%
-  self.page_title = "Sign in"
-  self.page_description = "Please enter your email address and password to sign in"
-  add_body_class "login"
--%>
+<% content_for :page_title, "Sign in" %>
+<% content_for(:page_description,
+               "Please enter your email address and password to sign in") %>
+<% content_for :body_class, "login" %>
 
 <% content_for :sidebar do %>
   <h2>Please note</h2>

data/app/views/admin/users/new.html.erb

@@ -1,7 +1,5 @@
-<%
-  self.page_title = "Welcome"
-  self.page_description = "Welcome to Pages"
-%>
+<% content_for :page_title, "Welcome" %>
+<% content_for :page_description, "Welcome to Pages" %>
 
 <div class="content">
   <p>Welcome to Pages! Before you can log on, we need to create the first user account.</p>

data/app/views/admin/users/new_password.html.erb

@@ -1,8 +1,7 @@
-<%
-  self.page_title = "Log in &raquo; Forgotten password"
-  self.page_description = "Creating a new password"
-  add_body_class = "login"
-%>
+<% content_for :page_title, "Log in &raquo; Forgotten password" %>
+<% content_for :page_description, "Creating a new password" %>
+<% content_for :body_class, "login" -%>
+
 <div class="content">
 <p>
   Did you lose your password? Don't worry, it happens.

data/app/views/admin/users/show.html.erb

@@ -1,12 +1,14 @@
-<%
-  self.page_title = "#{@user.name}"
-  if @user == current_user
-    self.page_description = "You are viewing " + link_to( "your own", admin_user_path( @user ) ) + " profile."
-  else
-    self.page_description = "You are viewing " + link_to( "#{@user.name}", admin_user_path( @user ) ) + "'s profile."
-  end
-  self.page_description_links = [ ( link_to( "Edit", edit_admin_user_path( @user ) ) if policy(@user).edit? ), link_to( "View all users", admin_users_path ) ].compact.join( link_separator )
-%>
+<% content_for :page_title, @user.name %>
+
+<% content_for :page_description do %>
+  You are viewing
+  <%= link_to((@user == current_user ? "your own profile" : "#{@user.name}"),
+              [:admin, @user]) %>
+<% end %>
+
+<% content_for(:page_description_links) do %>
+  <%= link_to("Edit", edit_admin_user_path(@user)) if policy(@user).edit? %>
+<% end %>
 
 <% content_for :sidebar do %>
   <h2>People</h2>

data/app/views/errors/401.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "Unauthorized" %>
+<% content_for :page_title, "Unauthorized" %>
+
 <p>
   You are not authorized to access this resource.
 </p>

data/app/views/errors/403.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "Forbidden" %>
+<% content_for :page_title, "Forbidden" %>
+
 <p>
   You are not authorized to access this resource.
 </p>

data/app/views/errors/404.html.erb

@@ -1,6 +1,4 @@
-<%
-  @page_title = "Page not found"
-%>
+<% content_for :page_title, "Page not found" %>
 
 <p>
   The page you were looking for could not be found. It might have been removed,

data/app/views/errors/405.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "405: Method Not Allowed" %>
+<% content_for :page_title, "405: Method Not Allowed" %>
+
 <p>This method has not been implemented.</p>
 
 <%= render partial: 'errors/generic_help' %>

data/app/views/errors/422.html.erb

@@ -1,4 +1,5 @@
-<% @page_title = "422: Unacceptable" %>
+<% content_for :page_title, "422: Unacceptable" %>
+
 <p>
   The change you wanted was rejected.
   Maybe you tried to change something you didn't have access to.

data/app/views/errors/500.html.erb

@@ -1,6 +1,5 @@
-<%
-  @page_title = "500 Internal Server Error"
-%>
+<% content_for :page_title, "500 Internal Server Error" %>
+
 <p>
   We're experiencing an internal server problem. Please try again later.
 </p>

data/app/views/feeds/pages.rss.builder

@@ -4,9 +4,7 @@ xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
   xml.channel do
     xml.title(@title || PagesCore.config(:site_name))
-    xml.link(
-      url_for(controller: "pages", action: "index", only_path: false)
-    )
+    xml.link(root_url)
     xml.description "Recent items"
     xml.language locale
     xml.generator "Pages"
@@ -15,12 +13,8 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
       xml.item do
         xml.title { xml.cdata! item.name.to_s }
         xml.link page_url(@locale, item, only_path: false)
-        if PagesCore.config.rss_fulltext?
-          xml.description { xml.cdata! item.body.to_html }
-        else
-          xml.description do
-            xml.cdata!((item.extended? ? item.excerpt : item.body).to_html)
-          end
+        xml.description do
+          xml.cdata! item.excerpt.to_html + item.body.to_html
         end
         xml.guid page_url(@locale, item, only_path: false)
         xml.pubDate item.published_at.to_fs(:rfc822)

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

@@ -1,6 +1,6 @@
 <header>
   <div class="logo">
-    <%= link_to image_tag("pages/admin/icon.png"), '/admin' %>
+    <%= link_to image_tag("pages/admin/icon.svg"), '/admin' %>
   </div>
   <div class="site-name">
     <h1>
@@ -10,7 +10,6 @@
   <% 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 %>

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

@@ -1,12 +1,12 @@
-<% if @page_description || @content_tabs %>
+<% if content_for?(:page_description) || @content_tabs %>
   <div class="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
-    <% if @page_description_links -%>
+    <% 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 class="content-tabs"

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

@@ -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

@@ -5,13 +5,136 @@
 <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>
   <main>
-    <% if @page_title %>
-      <h1><%= @page_title %></h1>
+    <% if content_for?(:page_title) %>
+      <h1><%= content_for(:page_title) %></h1>
     <% end %>
     <%= yield %>
   </main>

data/config/routes.rb

@@ -88,6 +88,7 @@ Rails.application.routes.draw do
       resources :pages do
         collection do
           get "deleted"
+          get "search"
         end
 
         member do

data/lib/pages_core/configuration/pages.rb

@@ -11,7 +11,6 @@ module PagesCore
       setting :localizations,         :boolean, false
       setting :locales,               :hash
       setting :text_filter,           :symbol, :textile
-      setting :rss_fulltext,          :boolean, true
       setting :image_fallback_url,    :string
       setting :default_author,        :string
       setting :error_404_layout,      :string

data/lib/pages_core/engine.rb

@@ -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.rb

@@ -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/frontend/frontend_generator.rb

@@ -14,40 +14,56 @@ module PagesCore
       end
 
       def create_css_framework
-        ["application.sass.scss",
-         "config.scss",
-         "components/base.scss",
-         "framework/breakpoints.scss",
-         "framework/clearfix.scss",
-         "framework/grid.scss",
-         "framework/grid_overlay.scss",
-         "framework/fonts.scss",
-         "global/colors.scss",
-         "global/typography.scss",
-         "vendor/normalize.css"].each do |f|
+        ["application.postcss.css",
+         "config.css",
+         "components/base.css",
+         "components/layout.css",
+         "global/animation.css",
+         "global/colors.css",
+         "global/fonts.css",
+         "global/grid.css",
+         "global/typography.css"].each do |f|
           template("stylesheets/#{f}", File.join("app/assets/stylesheets/#{f}"))
         end
       end
 
       def create_js_framework
-        ["lib/ResponsiveEmbeds.js",
-         "lib/GridOverlay.js"].each do |f|
+        ["lib/responsiveEmbeds.ts",
+         "lib/gridOverlay.ts"].each do |f|
           template("javascript/#{f}", File.join("app/javascript/#{f}"))
         end
 
         append_to_file "app/javascript/application.js" do
           <<~JS
             // Responsive embeds
-            import ResponsiveEmbeds from "./lib/ResponsiveEmbeds";
-            ResponsiveEmbeds.start();
+            import responsiveEmbeds from "./lib/responsiveEmbeds";
+            responsiveEmbeds();
 
             // Grid overlay
-            import GridOverlay from "./lib/GridOverlay";
-            GridOverlay.start();
+            import gridOverlay from "./lib/gridOverlay";
+            gridOverlay();
           JS
         end
       end
 
+      def install_js_dependencies
+        run("yarn add autoprefixer cssnano normalize.css postcss " \
+            "postcss-calc postcss-cli postcss-import " \
+            "postcss-import-ext-glob postcss-mixins postcss-preset-env " \
+            "postcss-url")
+      end
+
+      def configure_postcss
+        copy_file("postcss.config.js",
+                  File.join("postcss.config.js"))
+      end
+
+      def configure_build_script
+        script = "postcss ./app/assets/stylesheets/application.postcss.css " \
+                 "-o ./app/assets/builds/application.css"
+        run %(npm set-script build:css "#{script}")
+      end
+
       def remove_application_css
         remove_file("app/assets/stylesheets/application.css")
       end

data/lib/rails/generators/pages_core/frontend/templates/application.html.erb

@@ -4,7 +4,6 @@
   <%= javascript_include_tag "application" %>
   <%= feed_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <%# google_analytics_tags "UA-xxxxxxxx-1" %>
 <% end %>
 <body>
   <% if Rails.env.development? %>

data/lib/rails/generators/pages_core/frontend/templates/javascript/lib/gridOverlay.ts

@@ -0,0 +1,40 @@
+function ready(callback: () => void) {
+  if (document.readyState === "complete" ||
+    (document.readyState !== "loading" && !document.documentElement.doScroll)) {
+      callback();
+    } else {
+      document.addEventListener("DOMContentLoaded", callback);
+    }
+}
+
+function applyGrid () {
+  let showGrid = false;
+  const gridOverlay = document.querySelector(".grid-overlay");
+
+  const setState = (newState: boolean) => {
+    showGrid = newState;
+
+    if (newState) {
+      window.localStorage.setItem("showGrid", "true");
+      gridOverlay.classList.add("grid-overlay--active");
+    } else {
+      window.localStorage.removeItem("showGrid");
+      gridOverlay.classList.remove("grid-overlay--active");
+    }
+  };
+
+  if (gridOverlay) {
+    setState(window.localStorage.getItem("showGrid") == "true");
+
+    // Keyboard toggle
+    document.addEventListener("keyup", (evt: KeyboardEvent) => {
+      if (evt.ctrlKey && evt.which == 71) {
+        setState(!showGrid);
+      }
+    });
+  }
+}
+
+export default function gridOverlay() {
+  ready(applyGrid);
+}

data/lib/rails/generators/pages_core/frontend/templates/javascript/lib/responsiveEmbeds.ts

@@ -0,0 +1,68 @@
+const selectors = [
+  "iframe[src*=\"bandcamp.com\"]",
+  "iframe[src*=\"player.vimeo.com\"]",
+  "iframe[src*=\"youtube.com\"]",
+  "iframe[src*=\"youtube-nocookie.com\"]",
+  "iframe[src*=\"spotify.com\"]",
+  "iframe[src*=\"kickstarter.com\"][src*=\"video.html\"]"
+];
+
+function readyHandler(fn: () => void) {
+  if (document.readyState === "complete" || document.readyState === "interactive") {
+    setTimeout(fn, 1);
+  } else {
+    document.addEventListener("DOMContentLoaded", fn);
+  }
+}
+
+function wrapEmbed(embed: HTMLElement): HTMLElement {
+  const parent = embed.parentNode as HTMLElement;
+
+  // Recycle the existing container if the embed is already responsive.
+  if (parent &&
+    parent.tagName === "DIV" &&
+    parent.childNodes.length === 1 &&
+    parent.style.position === "relative") {
+      return parent;
+    }
+
+  const wrapper = document.createElement("div");
+  if (parent.tagName === "P") {
+    parent.parentNode.replaceChild(wrapper, parent);
+  } else {
+    parent.replaceChild(wrapper, embed);
+  }
+  wrapper.appendChild(embed);
+  return wrapper;
+}
+
+function applyEmbed(embed: HTMLElement) {
+  const parent = embed.parentNode as HTMLElement;
+
+  if (parent && parent.classList.contains("responsive-embed")) {
+    return;
+  }
+
+  const width = embed.offsetWidth;
+  const height = embed.offsetHeight;
+  const ratio = height / width;
+  const wrapper = wrapEmbed(embed);
+
+  wrapper.classList.add("responsive-embed");
+  wrapper.style.position = "relative";
+  wrapper.style.width = "100%";
+  wrapper.style.paddingTop = 0;
+  wrapper.style.paddingBottom = `${ratio * 100}%`;
+
+  embed.style.position = "absolute";
+  embed.style.width = "100%";
+  embed.style.height = "100%";
+  embed.style.top = "0";
+  embed.style.left = "0";
+}
+
+export default function responsiveEmbeds() {
+  readyHandler(() => {
+    document.querySelectorAll(selectors.join(",")).forEach(applyEmbed);
+  });
+}

data/lib/rails/generators/pages_core/frontend/templates/postcss.config.js

@@ -0,0 +1,17 @@
+module.exports = {
+  plugins: [
+    require("postcss-import-ext-glob"),
+    require("postcss-import"),
+    require("postcss-url")(
+      { filter: "**/*.svg",
+        url: "inline",
+        basePath: "../images" }
+    ),
+    require("postcss-mixins"),
+    require("postcss-simple-vars"),
+    require("postcss-preset-env")({ stage: 1 }),
+    require("postcss-calc")({ precision: 10 }),
+    require("autoprefixer"),
+    require("postcss-discard-duplicates")
+  ],
+};

data/lib/rails/generators/pages_core/frontend/templates/stylesheets/application.postcss.css

@@ -0,0 +1,4 @@
+@import "normalize.css";
+@import "config";
+@import-glob "global/*.css";
+@import-glob "components/*.css";