pages_core 3.5.1 → 3.6.0

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@kord.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@kord.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/500.html.erb

@@ -2,18 +2,23 @@
   @page_title = "Oh dear..."
 %>
 <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.
+  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.
 </p>
 <p>
   Please include your email address if you'd like to hear back from us.
 </p>
 
-<form action="/errors/report" method="post">
+<%= form_tag report_errors_path, method: 'post' do %>
+  <%= hidden_field_tag :error_report, @report %>
   <p>
-    <input name="email" type="text" class="text" value="<%= @email %>" placeholder="Your email (optional)" />
+    <input name="email" type="text" class="text" value="<%= @email %>"
+           placeholder="Your email (optional)" />
   </p>
   <p>
-    <button type="submit" class="clean-gray">Report error</button>
+    <button type="submit" class="clean-gray">
+      Report error
+    </button>
   </p>
-</form>
+<% end %>

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

@@ -3,5 +3,5 @@
 %>
 <p>
   Something went terribly wrong. Of course, this shouldn't happen, and we'd really appreciate it if you
-  could notify us at <a href="mailto:support@kord.no">support@kord.no</a>.
+  could notify us at <a href="mailto:support@anyone.no">support@anyone.no</a>.
 </p>

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 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
@@ -19,7 +17,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,83 +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.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>
-    <%= 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

@@ -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">
@@ -30,7 +30,7 @@
   </div>
 <% end %>
 
-<% if flash[:notice] %>
+<% if flash[:notice] && false %>
   <div id="flash-notice">
     <%= flash[:notice] %>
   </div>

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

@@ -4,20 +4,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <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" %>
 </head>
 <body>
   <div id="content">
-    <% if @page_title -%>
+    <% if @page_title %>
       <h1><%= @page_title %></h1>
-    <% end -%>
-    <%= yield %>
-    <% if @error_id %>
-      <p class="error_id">
-        Error ID: <%= @error_id %>
-      </p>
     <% end %>
+    <%= yield %>
   </content>
 </body>
 </html>

data/config/locales/en.yml

@@ -1,4 +1,16 @@
 en:
+  date:
+    formats:
+      pages_full: "%e %b %Y"
+      pages_date: "%e %b"
+      pages_day: "%e"
+      pages_time: ""
+  time:
+    formats:
+      pages_full: "%e %b %Y %H:%M"
+      pages_date: "%e %b %H:%M"
+      pages_day: "%e %H:%M"
+      pages_time: "%H:%M"
   activerecord:
     attributes:
       user:

data/config/routes.rb

@@ -1,8 +1,13 @@
-# encoding: utf-8
-
 Rails.application.routes.draw do
   image_resources :images, path: "dynamic_images/:digest(/:size)"
 
+  # Attachment
+  resources :attachments, path: "attachments/:digest", only: %i[show] do
+    member do
+      get :download
+    end
+  end
+
   # Pages
   resources :pages, path: ":locale/pages" do
     collection do
@@ -10,26 +15,22 @@ Rails.application.routes.draw do
       post "search"
     end
     member do
-      post "add_comment"
       put "preview"
     end
     resources :files, controller: "page_files"
   end
 
-  get(
-    "/:locale/pages/:id/:page" => "pages#show",
-    constraints: { page: /\d+/ }, as: :paginated_page
-  )
+  get "/:locale/pages/:id/:page" => "pages#show",
+      constraints: { page: /\d+/ }, as: :paginated_page
 
   # Redirect hack for backwards compatibility
   get "pages/:locale" => redirect("/%{locale}/pages"), locale: /\w\w\w/
-  get(
-    "pages/:locale/*glob" => redirect("/%{locale}/pages/%{glob}"),
-    locale: /\w\w\w/
-  )
+
+  get "pages/:locale/*glob" => redirect("/%{locale}/pages/%{glob}"),
+      locale: /\w\w\w/
 
   # Authentication
-  resource :session, only: [:create, :destroy]
+  resource :session, only: %i[create destroy]
 
   # Sitemap
   resource :sitemap, only: [:show]
@@ -46,11 +47,14 @@ Rails.application.routes.draw do
     end
 
     # Password resets
-    resources :password_resets, only: [:create, :show, :update]
+    resources :password_resets, only: %i[create show update]
     controller :password_resets do
       get "/password_resets/:id/:token" => :show, as: :password_reset_with_token
     end
 
+    # Attachments
+    resources :attachments, only: %i[create update]
+
     # Images
     resources :images
 
@@ -72,7 +76,8 @@ Rails.application.routes.draw do
     scope ":locale" do
       resources :pages do
         collection do
-          get "news"
+          get "news(/:year(/:month)(/page/:page))", action: :news, as: :news
+          get "deleted"
           get "new_news" # TODO: Should be refactored
         end
 
@@ -82,36 +87,15 @@ Rails.application.routes.draw do
         end
 
         get "new/:parent", action: "new"
-
-        # Page Images
-        resources :images, controller: "page_images" do
-          collection do
-            put "reorder"
-          end
-        end
-
-        # Page Files
-        resources :files, controller: "page_files" do
-          collection do
-            post "reorder"
-          end
-        end
-
-        # Page Files
-        resources :comments, controller: "page_comments" do
-        end
       end
     end
   end
 
   # Default admin route
-  get(
-    "/admin" => redirect do |_env, _req|
-      "/admin/#{I18n.default_locale}/pages/news"
-    end,
-    as: "admin_default"
-  )
-  # get '/admin' => 'admin#redirect', as: 'admin_default'
+  get("/admin" => redirect do |_env, _req|
+                    "/admin/#{I18n.default_locale}/pages/news"
+                  end,
+      as: "admin_default")
 
   # Errors
   resources :errors do
@@ -121,24 +105,23 @@ Rails.application.routes.draw do
   end
 
   # Page path routing
-  get(
-    ":locale/*path/page/:page" => "pages#show",
-    constraints: PagesCore::PagePathConstraint.new
-  )
-  get(
-    ":locale/*path" => "pages#show",
-    constraints: PagesCore::PagePathConstraint.new
-  )
-  get(
-    "*path" => "pages#show",
-    constraints: PagesCore::PagePathConstraint.new,
-    defaults: { locale: I18n.default_locale.to_s }
-  )
+  get ":locale/*path/page/:page" => "pages#show",
+      constraints: PagesCore::PagePathConstraint.new
 
+  get ":locale/*path" => "pages#show",
+      constraints: PagesCore::PagePathConstraint.new
+
+  get "*path/page/:page" => "pages#show",
+      constraints: PagesCore::PagePathConstraint.new,
+      defaults: { locale: I18n.default_locale.to_s }
+
+  get "*path" => "pages#show",
+      constraints: PagesCore::PagePathConstraint.new,
+      defaults: { locale: I18n.default_locale.to_s }
+
+  get "/401", to: "errors#unauthorized"
+  get "/403", to: "errors#forbidden"
   get "/404", to: "errors#not_found"
   get "/422", to: "errors#unacceptable"
   get "/500", to: "errors#internal_error"
-
-  # Legacy routes
-  get "/comments/:action/:type/:id", controller: "comments"
 end