pages_core 3.4.3 → 3.5.1

data/app/views/admin/pages/_edit_metadata.html.erb

@@ -1,3 +1,25 @@
+<div class="field">
+  <% if f.object.pathable? %>
+    <%= labelled_field(f.text_field(:path_segment),
+                       "Path segment",
+                       description: "Only alpanumeric characters and dashes " \
+                         "are allowed.") %>
+  <% else %>
+    <div class="field">
+      <label>Path segment</label>
+      <p class="description">
+        Unable to add a path segment,
+        please add one to
+        <%= link_to("this page's parent",
+                    edit_admin_page_path(f.object.parent,
+                                         locale: f.object.locale,
+                                         anchor: "metadata")) %>
+        first.
+      </p>
+    </div>
+  <% end %>
+</div>
+
 <div class="field">
   <%= f.label_for :meta_image, "Image" %>
   <p class="description">

data/app/views/admin/pages/_edit_options.html.erb

@@ -1,7 +1,7 @@
-<%= labelled_field f.select(:status, Page.status_labels.invert), "Status",
-  errors: @page.errors[:status]
-%>
-<div class="published_date">
+<%= labelled_field(f.select(:status, Page.status_labels.invert),
+                   "Status",
+                   errors: @page.errors[:status]) %>
+<div class="published-date">
   <%= labelled_field (
       f.date_select(
         :published_at,
@@ -14,11 +14,13 @@
     "Date",
     errors: @page.errors[:published_at]
   %>
-  <p class="autopublish_notice">This page will publish later</p>
+  <p class="autopublish-notice">
+    This page will publish later
+  </p>
 </div>
 
 <%= labelled_field (
-    f.select(:user_id, @authors.map{|a| [a.name, a.id]})
+    f.select(:user_id, page_authors(@page).map{|a| [a.name, a.id]})
   ),
   "Author",
   errors: @page.errors[:user_id]
@@ -26,8 +28,11 @@
 
 <% if @page.parent && @page.parent.news_page? %>
   <div class="field">
-    <label>Pin to top</label>
-    <%= f.check_box(:pinned) %> Make post featured<br />
+    <label>
+      Pin to top
+    </label>
+    <%= f.check_box(:pinned) %>
+    Make post featured<br />
   </div>
 <% end %>
 
@@ -35,22 +40,24 @@
   <div class="field">
     <label>Categories</label>
     <% @categories.each do |category| %>
-      <%= check_box_tag "category[#{category.id}]", "1", (@page.categories.map{|c| c.id}.include?(category.id) ? true : false) %>
+      <%= check_box_tag("category[#{category.id}]",
+                        "1",
+                        @page.categories.map { |c| c.id }.include?(category.id)) %>
       <%= category.name %><br />
     <% end %>
   </div>
 <% end %>
 
-<%= labelled_field f.select( :template, available_templates_for_select ), "Template", errors: @page.errors[:template] %>
-
+<%= labelled_field(f.select(:template, available_templates_for_select),
+                   "Template",
+                   errors: @page.errors[:template]) %>
 
-<%= link_to "Advanced options", "#", class: "advanced_toggle" %>
+<%= link_to "Advanced options", "#", class: "advanced-toggle" %>
 
-<div class="advanced_options">
+<div class="advanced-options">
 
   <div class="field">
     <label>Subpages</label>
-    Sort <%= f.select(:content_order, [ ['manually','position'], ['with the newest first','published_at DESC'] ] ) %><br />
     <%= f.check_box(:feed_enabled) %> RSS feed enabled<br />
     <%= f.check_box(:news_page) %> Show in News<br />
   </div>
@@ -67,6 +74,7 @@
 <% if @page.id? && @page.name? %>
   <div class="field">
     <label>Page link</label>
-    <%= page_link @page %>
+    <%= link_to(page_path(@page.locale, @page),
+                page_path(@page.locale, @page)) %>
   </div>
 <% end %>

data/app/views/admin/pages/_pagelisting.html.erb

@@ -4,20 +4,20 @@
   else
     subpages = page.children.visible.in_locale(page.locale).order(page.content_order)
   end
-  page_classes = ['page', 'page_listing']
+  page_classes = ['page', 'page-listing']
   page_classes << 'hidden' unless page.published?
-  page_classes << 'page_without_locale' unless page.name?
+  page_classes << 'page-without-locale' unless page.name?
 -%>
 <li page_id="<%= page.id %>">
   <% if page.reorderable? %>
-    <div class="drag_handle">
+    <div class="drag-handle">
     </div>
   <% end %>
   <div class="<%= page_classes.join(' ') %>" id="pagelisting_<%= page.id %>">
     <% if page.published? %>
-      <%= link_to_if(policy(page).edit?, page_name(page), edit_admin_page_url(@locale, page), class: 'page_name') %>
+      <%= link_to_if(policy(page).edit?, page_name(page), edit_admin_page_url(@locale, page), class: 'page-name') %>
     <% else %>
-      <%= link_to_if(policy(page).edit?, page_name(page), edit_admin_page_url(@locale, page), class: 'page_name') %>
+      <%= link_to_if(policy(page).edit?, page_name(page), edit_admin_page_url(@locale, page), class: 'page-name') %>
       <small class="status">
         (<%= (page.autopublish?) ? "Will publish at "+page.published_at.to_formatted_s(:short)  : page.status_label %><% if page.draft? && page.author %> by <%= page.author.name %><% end %>)
       </small>
@@ -43,7 +43,7 @@
   </div>
   <% if page.news_page? %>
     <ul>
-      <li><div class="page_listing">
+      <li><div class="page-listing">
         <em>(<%= page.children.visible.count %> items)</em>
         <div class="actions">
           <% if policy(Page).new? %>

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

@@ -14,7 +14,7 @@
 <% content_for :sidebar do %>
   <%= form_for(@page,
                url: admin_page_url(@locale, @page),
-               html: {class: :edit_page, id: 'page-form-sidebar'}) do |f| %>
+               html: {class: "edit-page", id: 'page-form-sidebar'}) do |f| %>
     <%= render partial: 'edit_options', locals: {f: f} %>
   <% end %>
 <% end %>
@@ -26,7 +26,7 @@
 <%= form_for(@page,
              url: admin_page_url(@locale, @page),
              html: {
-               class: :edit_page,
+               class: "edit-page",
                id: 'page-form',
                method: :put,
                multipart: true
@@ -34,7 +34,7 @@
              builder: PagesCore::FormBuilder
 ) do |f| %>
 
-  <div class="hiddenOptions">
+  <div class="hidden-options">
     <%= render partial: 'edit_options', locals: {f: f} %>
   </div>
 
@@ -55,13 +55,16 @@
   <% if @page.template_config.value(:files) %>
     <%= content_tab "Files" do %>
       <% if @page.files.any? %>
-        <ul class="filelist" data-url="<%= reorder_admin_page_files_url(@locale, @page) %>">
+        <ul class="file-list" data-url="<%= reorder_admin_page_files_url(@locale, @page) %>">
           <% @page.files.each do |file| %>
             <li data-file-id="<%= file.id %>">
               <span class="actions">
+                <span class="embed-code">
+                  <%= file_embed_code(file) %>
+                </span>
                 <%= link_to "Delete", admin_page_file_path(@locale, @page, file), class: :delete, method: :delete, data: {confirm: 'Are you sure? There is no undo.'} %>
               </span>
-              <div class="drag_handle"></div>
+              <div class="drag-handle"></div>
               <strong><%= file.name %></strong> &ndash; <%= link_to file.filename, page_file_path(@locale, @page, file) %>
             </li>
           <% end %>
@@ -142,7 +145,9 @@
 <% if @page.template_config.value(:files) %>
   <div id="new-file" class="page_new_file">
     <h2>Upload new file</h2>
-    <%= form_for((@new_file = PageFile.new), url: admin_page_files_path(@locale, @page), html: {multipart: true}) do |f| %>
+    <%= form_for((@new_file = PageFile.new),
+                 url: admin_page_files_path(@locale, @page),
+                 html: {multipart: true}) do |f| %>
       <%= labelled_field f.text_field( :name, size: 48 ), "Name",
         errors: @new_file.errors[:name]
       %>

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

@@ -8,60 +8,19 @@
 %>
 
 <% content_for :sidebar do %>
-  <% if policy(Page).new? %>
-    <h2>New page</h2>
-    <p>
-      <%= form_tag new_admin_page_path, method: :get do %>
-        In <%= select_tag 'parent', options_from_collection_for_select(@root_pages, 'id', 'name') %>
-        <%= submit_tag "Go", name: nil %>
-      <% end %>
-    </p>
-    <p>
-      You can also <%= link_to "create a new root page", new_admin_page_path(@locale) %>.
-    </p>
-    <h2>Structure</h2>
-    <p>
-      <button id="reorder_link" type="button">Reorder the pages</button>
-    </p>
-    <!-- What shall with do with a drunken sailor?
-    <h2>Categories</h2>
-    <% if @categories && @categories.length > 0 %>
-      <ul>
-        <% @categories.each do |category| %>
-          <li><%= category.name %> (<%= link_to "Delete", admin_category_path(category), method: :delete, class: :delete, data: {confirm: "Are you sure? There is no undo."} %>)</li>
-        <% end %>
-      </ul>
-    <% end %>
-    <div id="new-category">
-      <%= form_for([:admin, Category.new]) do |f| %>
-        <p>
-          <label><strong>New category</strong></label>
-          <%= f.text_field :name %>
-          <%= submit_tag "Save" %>
-        </p>
-      <% end %>
-    </div>
-    <div id="new-category-button">
-      <p>
-        <button type="button" class="toggle-category">
-          Add a new category
-        </button>
-      </p>
-    </div>
-    -->
-  <% else %>
-    &nbsp;
-  <% end %>
 <% end %>
 
 <div class="content">
-  <% if @root_pages.length < 1 -%>
-    <p>No pages found</p>
-  <% else -%>
-    <ul class="pagelist reorderable">
-      <% @root_pages.each do |page| -%>
-        <%= render partial: "pagelisting", locals: { page: page } %>
-      <% end -%>
-    </ul>
-  <% end -%>
+  <%= react_component(
+    "PageTree", {
+      tree: {
+        name: "All Pages",
+        locale: @locale,
+        children: ActiveModel::ArraySerializer.new(
+          @root_pages,
+          each_serializer: PageTreeSerializer
+        )
+      }
+    }
+  ) %>
 </div>

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

@@ -14,7 +14,7 @@
 <% content_for :sidebar do %>
   <%= form_for(@page,
                url: admin_pages_url(@locale),
-               html: {class: :edit_page, id: 'page-form-sidebar'}) do |f| %>
+               html: {class: "edit-page", id: 'page-form-sidebar'}) do |f| %>
     <%= render partial: 'edit_options', locals: {f: f} %>
   <% end %>
 <% end %>
@@ -22,14 +22,14 @@
 <%= form_for(@page,
              url: admin_pages_url(@locale),
              html: {
-               class: :edit_page,
+               class: "edit-page",
                id: 'page-form',
                method: :post,
                multipart: true
              }
 ) do |f| %>
 
-  <div class="hiddenOptions">
+  <div class="hidden-options">
     <%= render partial: 'edit_options', locals: {f: f} %>
   </div>
 

data/app/views/admin/pages/news.html.erb

@@ -31,7 +31,7 @@
 <% end %>
 
 <% if @pages.any? %>
-  <table class="list news_item_list">
+  <table class="list news-item-list">
     <tr>
       <th>Name</th>
       <th>Published</th>

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@kord.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@kord.no (or simply by replying to this message).

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_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@manualdesign.no">support@manualdesign.no</a>.
+  could notify us at <a href="mailto:support@kord.no">support@kord.no</a>.
 </p>

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

@@ -31,49 +31,53 @@
     <%= csrf_meta_tag %>
   </head>
 
-  <body class="<%= body_classes %>"
+  <body class="<%= body_classes.join(" ") %>"
         data-controller="<%= controller.class.to_s %>"
         data-action="<%= controller.action_name %>"
         data-locale="<%= @locale %>">
 
-    <%= render partial: "layouts/admin/header" %>
+    <div class="wrapper">
 
-    <% if content_for?(:sidebar) %>
-      <div id="sidebar">
-        <%= content_for(:sidebar) %>
-      </div>
-    <% end %>
+      <%= render partial: "layouts/admin/header" %>
 
-    <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]}") %>
+      <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 %>
-                </li>
+                </ul>
               <% end %>
-            </ul>
+            </div>
           <% end %>
-        </div>
-      <% end %>
 
-      <%= yield %>
-    </div>
+          <%= yield %>
+        </main>
 
+        <% if content_for?(:sidebar) %>
+          <aside class="sidebar">
+            <%= content_for(:sidebar) %>
+          </aside>
+        <% end %>
+      </div>
+    </div>
     <%= render partial: "layouts/admin/analytics" %>
   </body>
 </html>

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>
@@ -22,7 +22,7 @@
       <%= header_tabs(:account) %>
     <% end -%>
   </div>
-</div>
+</header>
 
 <% if flash[:error] %>
   <div id="flash-error">

data/config/locales/en.yml

@@ -3,4 +3,41 @@ en:
     attributes:
       user:
         email: Email address
-        image: Profile picture
+        image: Profile picture
+  templates:
+    default:
+      blocks:
+        name:
+          name: Name
+          description: "This is the name of the page, and it will also be the
+            name of the link to this page."
+        body:
+          name: Body
+          description: ""
+        headline:
+          name: Headline
+          description: "Optional, use if the headline should differ from the
+            page name."
+        excerpt:
+          name: Standfirst
+          description: An introductory paragraph before the start of the body.
+        boxout:
+          name: Boxout
+          description: "Part of the page, usually background info or facts
+            related to the article."
+        meta_title:
+          name: Title
+          description: "Document title. Will fall back to the page name if
+            empty. Recommended length: Up to 56 characters."
+        meta_description:
+          name: Description
+          description: "Description for search engines. Will fall back to
+            Standfirst if empty. Recommended length: Up to 156 characters."
+        open_graph_title:
+          name: Open Graph Title
+          description: "Page title for Facebook sharing. Will fall back to the
+            document title."
+        open_graph_description:
+          name: Open Graph Description
+          description: "Description for Facebook sharing. Will fall back to
+            Description or Standfirst if empty."