pages_core 3.4.3 → 3.7.0

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

@@ -7,7 +7,10 @@
       <%= f.check_box :activated %> The user account is activated<br />
     <% end %>
     <% Role.roles.each do |role| %>
-      <%= check_box_tag "#{model_name_from_record_or_class(f.object).param_key}[role_names][]", role.name, f.object.role?(role.name.to_sym) %>
+      <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",
+                        role.name,
+                        f.object.role?(role.name.to_sym),
+                        class: "role") %>
       <%= role.description %><br>
     <% end %>
   </p>

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

@@ -13,7 +13,7 @@
       <%= invite.email %>
     </td>
     <td>
-      <%= invite.roles.map(&:to_s).to_sentence %>
+      <%= invite.roles.map(&:to_s).sort.to_sentence %>
     </td>
     <td>
       <% if invite.sent_at? %>
@@ -22,15 +22,20 @@
       <% end %>
     </td>
     <td>
-      <%= link_to "Cancel invite", [:admin, invite], method: 'delete', data: {confirm: "Are you sure?"}, class: 'delete' %>
+      <% if current_user.role?(:users) %>
+        <%= link_to("View invite",
+                    admin_invite_with_token_url(invite, invite.token)) %> /
+        <%= link_to("Cancel invite",
+                    [:admin, invite],
+                    method: 'delete',
+                    data: { confirm: "Are you sure?" },
+                    class: 'delete') %>
+      <% end %>
     </td>
   </tr>
 <% end %>
 <% @users.each do |user| -%>
-  <tr class="<%=
-    classes = []
-    classes.join( " " )
-   %>">
+  <tr class="user-<%= user.id %>">
     <td>
       <strong><%= link_to user.name, admin_user_url( user ) %></strong>
       <% if policy(user).edit? %>
@@ -40,7 +45,7 @@
     <td>
       <%= user.email %>
     </td>
-    <td><%= user.roles.map(&:to_s).to_sentence %></td>
+    <td><%= user.roles.map(&:to_s).sort.to_sentence %></td>
     <td>
       <% if user.online? -%>
         <strong>Online now</strong>

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

@@ -18,23 +18,17 @@
   <% end %>
 <% end %>
 
-<%= form_for [:admin, @user], html: {multipart: true}, builder: PagesCore::FormBuilder do |f| %>
+<%= form_for([:admin, @user],
+             html: { multipart: true },
+             builder: PagesCore::Admin::FormBuilder) do |f| %>
 
   <h2>Account details</h2>
   <%= f.labelled_text_field :name %>
   <%= f.labelled_text_field :email %>
 
-  <h2>Picture</h2>
-  <% if @user.image %>
-    <p id="user-image-info">
-      <%= (@user==current_user) ? "You already have" : "#{@user.name} already has" %> a profile picture.
-      You can
-      <%= link_to "delete it", delete_image_admin_user_path(@user), method: :delete, class: :delete %>
-      or upload a new file below to replace it.
-    </p>
-  <% end %>
+  <h2>Profile picture</h2>
 
-  <%= f.labelled_file_field :image %>
+  <%= f.image_uploader :image, alternative: @user.name %>
 
   <% if policy(@user).change_password? %>
     <h2>Password</h2>

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

@@ -1,15 +1,58 @@
-<%
-  self.page_title = "Sign in"
-  self.page_description = "Please enter your email address and password to sign in"
-  add_body_class "login"
--%>
-
-<% content_for :sidebar do %>
-  <h2>Please note</h2>
-  <p>
-    Please contact support if you experience problems logging in or using Pages.
-  </p>
-<% end %>
-
-
-<%= login_form(success_url: admin_default_path, login_url: login_admin_users_path) %>
+<%
+  self.page_title = "Sign in"
+  self.page_description = "Please enter your email address and password to sign in"
+  add_body_class "login"
+-%>
+
+<% content_for :sidebar do %>
+  <h2>Please note</h2>
+  <p>
+    Please contact support if you experience problems logging in or using Pages.
+  </p>
+<% end %>
+
+<div class="login-form">
+  <div class="login-tab password">
+    <%= form_tag session_path do %>
+      <p>
+        <label>Email address</label>
+        <%= text_field_tag :username, '' %>
+      </p>
+      <p>
+        <label>Password</label>
+        <%= password_field_tag :password, '' %>
+      </p>
+      <p>
+        <button type="submit">Sign in</button>
+      </p>
+      <ul>
+        <li>
+          <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
+                      login_admin_users_path,
+                      class: 'show-password-reset') %>
+        </li>
+      </ul>
+    <% end %>
+  </div>
+
+  <div class="login-tab password-reset">
+    <%= form_tag admin_password_resets_path do %>
+      <h2>
+        Forgot your password?
+      </h2>
+      <p>
+        Don't worry, it happens.
+        Enter your email address below,
+        and we'll send you a link where you can reset your password.
+      </p>
+      <p>
+        <%= text_field_tag :username, '' %>
+      </p>
+      <p>
+        <button type="submit">
+          Send
+        </button>
+      </p>
+    <% end %>
+  </div>
+</div>

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

@@ -25,7 +25,7 @@
 <div class="content">
   <% if @user.image -%>
     <div style="float: right;">
-      <%= editable_dynamic_image_tag(@user.image, size: '150x150', class: 'thumbnail') %>
+      <%= editable_dynamic_image_tag(@user.image) %>
     </div>
   <% end -%>
   <h2><%= @user.name %></h2>

data/app/views/admin_mailer/invite.text.erb

@@ -6,4 +6,4 @@ Click the link below to create your account and get started.
 
 <%= @url %>
 
-If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@manualdesign.no (or simply by replying to this message).
+If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@anyone.no (or simply by replying to this message).

data/app/views/admin_mailer/password_reset.text.erb

@@ -10,4 +10,4 @@ This will take you to a web page where you can set a new password of your choosi
 
 If you do not want to change your password, please ignore this email.
 
-If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@manualdesign.no (or simply by replying to this message).
+If you have any further trouble, please don't hesitate in contacting us by sending us an email at support@anyone.no (or simply by replying to this message).

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

@@ -0,0 +1,6 @@
+<% @page_title = "Unauthorized" %>
+<p>
+  You are not authorized to access this resource.
+</p>
+
+<%= render partial: 'errors/generic_help' %>

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

@@ -1,4 +1,4 @@
-<% @page_title = "I'm afraid I can't do that." %>
+<% @page_title = "Forbidden" %>
 <p>
   You are not authorized to access this resource.
 </p>

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

@@ -0,0 +1,7 @@
+<% @page_title = "422: Unacceptable" %>
+<p>
+  The change you wanted was rejected.
+  Maybe you tried to change something you didn't have access to.
+</p>
+
+<%= render partial: 'errors/generic_help' %>

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

@@ -1,19 +1,6 @@
 <%
-  @page_title = "Oh dear..."
+  @page_title = "500 Internal Server Error"
 %>
 <p>
-  Something went terribly wrong. Of course, this shouldn't happen, and we'd really appreciate it if you
-  could click the button below to notify us about the problem.
+  We're experiencing an internal server problem. Please try again later.
 </p>
-<p>
-  Please include your email address if you'd like to hear back from us.
-</p>
-
-<form action="/errors/report" method="post">
-  <p>
-    <input name="email" type="text" class="text" value="<%= @email %>" placeholder="Your email (optional)" />
-  </p>
-  <p>
-    <button type="submit" class="clean-gray">Report error</button>
-  </p>
-</form>

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

@@ -6,7 +6,7 @@
   <li>Try searching this site using <%= link_to "Google", "http://www.google.com/" %> for the information you want:</li>
 </ul>
 
-<form action="http://www.google.com/search" method="get" onSubmit="googleSearch( this );">
+<form action="https://www.google.com/search" method="get" onSubmit="googleSearch( this );">
   <input name="q" type="hidden" />
   <input name="qinput" type="text" class="text with_button" />
   <button type="submit" class="clean-gray">Search</button>

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
@@ -19,7 +19,7 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
           xml.description { xml.cdata! item.body.to_html }
         else
           xml.description do
-            xml.cdata! (item.extended? ? item.excerpt : item.body).to_html
+            xml.cdata!((item.extended? ? item.excerpt : item.body).to_html)
           end
         end
         xml.guid page_url(@locale, item, only_path: false)

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

@@ -1,79 +1,83 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      Pages
-      <% if @page_title %>
-        : <%= @page_title %>
-      <% end %>
-    </title>
-
-    <link rel="shortcut icon"
-          href="<%= asset_path 'pages/favicon.gif' %>"
-          type="image/gif" />
-    <link rel="icon"
-          href="<%= asset_path 'pages/favicon.gif' %>"
-          type="image/gif" />
-
-    <%= stylesheet_link_tag "pages/admin" %>
-    <%= stylesheet_link_tag "pages/admin/print", media: 'print' %>
-
-    <% if Dir.glob(Rails.root.join("app/assets/stylesheets/admin.*")).any? %>
-      <%= stylesheet_link_tag "admin" %>
-    <% end %>
-
-    <%= javascript_include_tag "pages/admin" %>
-    <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
-      <%= javascript_include_tag "admin" %>
-    <% end %>
-
-    <%= csrf_meta_tag %>
-  </head>
-
-  <body class="<%= body_classes %>"
-        data-controller="<%= controller.class.to_s %>"
-        data-action="<%= controller.action_name %>"
-        data-locale="<%= @locale %>">
-
-    <%= render partial: "layouts/admin/header" %>
-
-    <% if content_for?(:sidebar) %>
-      <div id="sidebar">
-        <%= content_for(:sidebar) %>
-      </div>
-    <% end %>
-
-    <div id="main">
-      <% if @page_description || @content_tabs %>
-        <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
-          <% if @page_description_links -%>
-            <div class="links">
-              <%= @page_description_links.html_safe %>
-            </div>
-          <% end %>
-          <h3>
-            <%= (@page_description || @page_title).html_safe %>
-          </h3>
-          <% if @content_tabs %>
-            <ul id="content-tabs">
-              <% @content_tabs.map do |t| %>
-                <li id="content-tab-link-<%= t[:key] %>" data-tab-name="<%= t[:key] %>">
-                  <% if t[:options][:disabled] == true %>
-                    <%= t[:name] %>
-                  <% else %>
-                    <%= link_to(t[:name], anchor: "#{t[:key]}") %>
-                  <% end %>
-                </li>
-              <% end %>
-            </ul>
-          <% end %>
-        </div>
-      <% end %>
-
-      <%= yield %>
-    </div>
-
-    <%= render partial: "layouts/admin/analytics" %>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>
+      <%= [@page_title, "Pages"].reject(&:blank?).uniq.join(" - ") %>
+    </title>
+
+    <link rel="shortcut icon"
+          href="<%= asset_path 'pages/favicon.gif' %>"
+          type="image/gif" />
+    <link rel="icon"
+          href="<%= asset_path 'pages/favicon.gif' %>"
+          type="image/gif" />
+
+    <%= stylesheet_link_tag "pages/admin" %>
+
+    <% if Dir.glob(Rails.root.join("app/assets/stylesheets/admin.*")).any? %>
+      <%= stylesheet_link_tag "admin" %>
+    <% end %>
+
+    <%= javascript_include_tag "pages/admin" %>
+    <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
+      <%= javascript_include_tag "admin" %>
+    <% end %>
+
+    <%= csrf_meta_tag %>
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, user-scalable=no">
+  </head>
+
+  <body class="<%= body_classes.join(" ") %>"
+        data-controller="<%= controller.class.to_s %>"
+        data-action="<%= controller.action_name %>"
+        data-locale="<%= @locale %>">
+
+    <div class="wrapper">
+
+      <%= render partial: "layouts/admin/header" %>
+
+      <div class="main-wrapper">
+        <main>
+          <% if @page_description || @content_tabs %>
+            <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
+              <% if @page_description_links -%>
+                <div class="links">
+                  <%= @page_description_links.html_safe %>
+                </div>
+              <% end %>
+              <h3>
+                <%= (@page_description || @page_title).html_safe %>
+              </h3>
+              <% if @content_tabs %>
+                <ul id="content-tabs">
+                  <% @content_tabs.map do |t| %>
+                    <li id="content-tab-link-<%= t[:key] %>" data-tab-name="<%= t[:key] %>">
+                      <% if t[:options][:disabled] == true %>
+                        <%= t[:name] %>
+                      <% else %>
+                        <%= link_to(t[:name], anchor: "#{t[:key]}") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+                </ul>
+              <% end %>
+            </div>
+          <% end %>
+
+          <%= yield %>
+        </main>
+
+        <% if content_for?(:sidebar) %>
+          <aside class="sidebar">
+            <%= content_for(:sidebar) %>
+          </aside>
+        <% end %>
+      </div>
+    </div>
+    <%= react_component "Modal", {} %>
+    <%= react_component "Toast", { notice: flash[:notice] } %>
+    <%= render partial: "layouts/admin/analytics" %>
+  </body>
+</html>

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

@@ -9,9 +9,7 @@
     var ga = document.createElement('script');
     ga.type = 'text/javascript';
     ga.async = true;
-    ga.src = (
-      'https:' == document.location.protocol ? 'https://ssl' : 'http://www'
-    ) + '.google-analytics.com/ga.js';
+    ga.src = 'https://ssl.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0];
     s.parentNode.insertBefore(ga, s);
   })();

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

@@ -1,4 +1,4 @@
-<div id="header">
+<header>
   <div id="logo">
     <%= link_to image_tag("pages/admin/icon.png"), '/admin' %>
   </div>
@@ -11,7 +11,7 @@
     <div class="user">
       Hello, <%= link_to(current_user.name, admin_user_url(current_user)) %>
       <%= link_separator %>
-      <%= logout_link "Log out", login_url: login_admin_users_path %>
+      <%= link_to("Log out", session_path, method: "delete") %>
     </div>
   <% end %>
   <div class="tabs">
@@ -22,7 +22,7 @@
       <%= header_tabs(:account) %>
     <% end -%>
   </div>
-</div>
+</header>
 
 <% if flash[:error] %>
   <div id="flash-error">
@@ -30,7 +30,7 @@
   </div>
 <% end %>
 
-<% if flash[:notice] %>
+<% if flash[:notice] && false %>
   <div id="flash-notice">
     <%= flash[:notice] %>
   </div>