RubyGems - pages_core - Versions diffs - 3.4.3 → 3.7.0 - Mend

pages_core 3.4.3 → 3.7.0

Files changed (375) hide show

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

@@ -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/app/views/sitemaps/show.xml.builder CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 xml.instruct!
 xml.urlset xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do |urlset|
   @entries.each do |entry|

data/config/locales/en.yml CHANGED Viewed

@@ -1,6 +1,55 @@
 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:
         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."

data/config/routes.rb CHANGED Viewed

@@ -1,37 +1,40 @@
-# encoding: utf-8
+# frozen_string_literal: true
 Rails.application.routes.draw do
+  Healthcheck.routes(self)
   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
-  scope path: PagesCore.config.pages_path_scope do
-    resources :pages, path: ":locale/pages" do
-      collection do
-        get "search"
-        post "search"
-      end
-      member do
-        post "add_comment"
-        put "preview"
-      end
-      resources :files, controller: "page_files"
+  resources :pages, path: ":locale/pages" do
+    collection do
+      get "search"
+      post "search"
+    end
+    member do
+      put "preview"
     end
+    resources :files, controller: "page_files"
+  end
-    get(
-      "/:locale/pages/:id/:page" => "pages#show",
+  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/
+  # Redirect hack for backwards compatibility
+  get "pages/:locale" => redirect("/%{locale}/pages"), locale: /\w\w\w/
-    get "(/:locale)" => "pages#index" if PagesCore.config.pages_path_scope?
-  end
+  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]
@@ -48,11 +51,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
@@ -74,54 +80,47 @@ 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
-          get "reorder_pages"
         end
         member do
-          delete "delete_meta_image"
+          put "move"
         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
-    collection do
-      post "report"
-    end
-  end
+  resources :errors
+  # 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/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 }
-  # Legacy routes
-  get "/comments/:action/:type/:id", controller: "comments"
+  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"
 end

data/db/migrate/20111219033112_create_pages_tables.rb CHANGED Viewed

@@ -1,281 +1,196 @@
-# encoding: utf-8
+# frozen_string_literal: true
-class CreatePagesTables < ActiveRecord::Migration
+class CreatePagesTables < ActiveRecord::Migration[5.0]
   def change
-    create_table "accounts" do |t|
-      t.string "name"
-      t.string "plan"
-      t.string "key"
-      t.text "billing_address"
-      t.integer "account_holder_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.datetime "last_billed_at"
-      t.boolean "is_activated", default: true, null: false
-      t.string "domain"
+    create_table :attachments do |t|
+      t.string :filename, null: false
+      t.string :content_type, null: false
+      t.integer :content_length, null: false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.string :content_hash, null: false
+      t.integer :user_id
+    end
+    create_table :categories do |t|
+      t.string :name
+      t.string :slug
+      t.integer :position
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index :slug
+    end
+    create_table :delayed_jobs do |t|
+      t.integer :priority, default: 0
+      t.integer :attempts, default: 0
+      t.text :handler
+      t.text :last_error
+      t.datetime :run_at
+      t.datetime :locked_at
+      t.datetime :failed_at
+      t.string :locked_by
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.string :queue
+    end
+    create_table :images do |t|
+      t.string :filename, null: false
+      t.string :content_type, null: false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.string :content_hash, null: false
+      t.integer :content_length, null: false
+      t.string :colorspace, null: false
+      t.integer :real_width, null: false
+      t.integer :real_height, null: false
+      t.integer :crop_width
+      t.integer :crop_height
+      t.integer :crop_start_x
+      t.integer :crop_start_y
+      t.integer :crop_gravity_x
+      t.integer :crop_gravity_y
+    end
+    create_table :invite_roles do |t|
+      t.integer :invite_id
+      t.string :name
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+    create_table :invites do |t|
+      t.integer :user_id
+      t.string :email
+      t.string :token
+      t.datetime :sent_at
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+    create_table :localizations do |t|
+      t.integer :localizable_id
+      t.string :localizable_type
+      t.string :name
+      t.string :locale
+      t.text :value
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.index %i[localizable_id localizable_type name locale],
+              name: :index_textbits_on_locale,
+              unique: true
+      t.index %i[localizable_id localizable_type]
+    end
+    create_table :page_categories do |t|
+      t.integer :page_id
+      t.integer :category_id
+      t.index :category_id
+      t.index :page_id
+    end
+    create_table :page_files, force: :cascade do |t|
+      t.bigint :page_id
+      t.bigint :attachment_id
+      t.integer :position
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index :attachment_id
+      t.index :page_id
+    end
+    create_table :page_images do |t|
+      t.integer :page_id
+      t.integer :image_id
+      t.integer :position
+      t.boolean :primary, default: false, null: false
+      t.index %i[page_id primary]
+      t.index :page_id
+    end
+    create_table :page_paths do |t|
+      t.integer :page_id
+      t.string :locale
+      t.string :path
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index %i[locale path], unique: true
+    end
+    create_table :pages do |t|
+      t.integer :parent_page_id
+      t.integer :position
+      t.string :byline
+      t.string :template
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.integer :user_id
+      t.integer :status, default: 0, null: false
+      t.boolean :feed_enabled, default: false, null: false
+      t.datetime :published_at
+      t.string :redirect_to
+      t.integer :image_id
+      t.string :image_link
+      t.boolean :news_page, default: false, null: false
+      t.boolean :autopublish, default: false, null: false
+      t.string :unique_name
+      t.datetime :last_comment_at
+      t.boolean :pinned, default: false, null: false
+      t.integer :meta_image_id
+      t.datetime :starts_at
+      t.datetime :ends_at
+      t.boolean :all_day, default: false, null: false
+      t.index :ends_at
+      t.index :parent_page_id
+      t.index :position
+      t.index :starts_at
+      t.index %i[status parent_page_id position]
+      t.index :status
+      t.index :user_id
+    end
+    create_table :password_reset_tokens do |t|
+      t.integer :user_id
+      t.string :token
+      t.datetime :expires_at
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+    create_table :roles do |t|
+      t.integer :user_id
+      t.string :name
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.index :user_id
+    end
+    create_table :taggings do |t|
+      t.integer :tag_id
+      t.integer :taggable_id
+      t.string :taggable_type
+      t.index :tag_id
+      t.index %i[taggable_type taggable_id]
+    end
+    create_table :tags do |t|
+      t.string :name
+      t.boolean :pinned, default: false, null: false
+      t.index :name
+    end
+    create_table :users do |t|
+      t.string :username
+      t.string :hashed_password
+      t.string :name
+      t.string :email
+      t.datetime :last_login_at
+      t.integer :created_by
+      t.datetime :created_at
+      t.text :persistent_data
+      t.boolean :activated, default: false, null: false
+      t.integer :image_id
     end
-    create_table "binaries" do |t|
-      t.string "sha1_hash"
-    end
-    create_table "categories" do |t|
-      t.string "name"
-      t.string "slug"
-      t.integer "position"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-    add_index "categories", ["slug"], name: "index_categories_on_slug"
-    create_table "delayed_jobs" do |t|
-      t.integer "priority",   default: 0
-      t.integer "attempts",   default: 0
-      t.text "handler"
-      t.string "last_error"
-      t.datetime "run_at"
-      t.datetime "locked_at"
-      t.datetime "failed_at"
-      t.string "locked_by"
-      t.datetime "created_at", null: false
-      t.datetime "updated_at", null: false
-    end
-    create_table "feed_items" do |t|
-      t.integer "feed_id"
-      t.string "guid"
-      t.string "title"
-      t.string "link"
-      t.text "description"
-      t.datetime "pubdate"
-      t.string "author"
-    end
-    add_index "feed_items", ["feed_id"], name: "index_feed_items_on_feed_id"
-    create_table "feeds" do |t|
-      t.string "url"
-      t.string "link"
-      t.string "title"
-      t.text "description"
-      t.datetime "refreshed_at"
-    end
-    add_index "feeds", ["url"], name: "index_feeds_on_url"
-    create_table "images" do |t|
-      t.string "name"
-      t.string "byline"
-      t.text "description"
-      t.string "filename"
-      t.string "content_type"
-      t.integer "folder"
-      t.integer "user_id"
-      t.datetime "created_at"
-      t.text "filters"
-      t.string "original_size"
-      t.string "hotspot"
-      t.integer "binary_id"
-      t.string "url"
-      t.boolean "cropped", default: false, null: false
-      t.string "crop_start"
-      t.string "crop_size"
-      t.integer "original_binary_id"
-      t.datetime "updated_at"
-    end
-    create_table "images_imagesets" do |t|
-      t.integer "relation_id"
-      t.integer "imageset_id"
-      t.integer "image_id"
-      t.integer "position"
-    end
-    create_table "imagesets" do |t|
-      t.string "name"
-      t.text "description"
-      t.datetime "created_at"
-      t.integer "user_id"
-    end
-    create_table "mail_subscribers" do |t|
-      t.string "email"
-      t.datetime "created_at"
-      t.string "group", default: "Default"
-    end
-    create_table "mailings" do |t|
-      t.string "recipients"
-      t.string "sender"
-      t.string "subject"
-      t.text "body"
-      t.datetime "created_at"
-      t.boolean "failed", default: false
-      t.string "content_type"
-      t.boolean "in_progress", default: false, null: false
-    end
-    create_table "mailouts" do |t|
-      t.string "subject"
-      t.string "sender"
-      t.string "template"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer "image_id"
-      t.text "groups"
-      t.string "host"
-    end
-    create_table "page_comments" do |t|
-      t.integer "page_id"
-      t.string "remote_ip"
-      t.string "name"
-      t.string "email"
-      t.string "url"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-    create_table "page_files" do |t|
-      t.integer "page_id"
-      t.integer "position"
-      t.string "name"
-      t.string "filename"
-      t.string "content_type"
-      t.integer "filesize"
-      t.integer "binary_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-    create_table "page_images" do |t|
-      t.integer "page_id"
-      t.integer "image_id"
-      t.integer "position"
-      t.boolean "primary",  default: false, null: false
-    end
-    add_index "page_images", %w(page_id primary), name: "index_page_images_on_page_id_and_primary"
-    add_index "page_images", ["page_id"], name: "index_page_images_on_page_id"
-    create_table "pages" do |t|
-      t.integer "parent_page_id"
-      t.integer "position"
-      t.string "byline"
-      t.string "template"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer "user_id"
-      t.integer "status", default: 0,     null: false
-      t.string "content_order"
-      t.boolean "feed_enabled", default: false, null: false
-      t.datetime "published_at"
-      t.text "redirect_to"
-      t.integer "image_id"
-      t.boolean "comments_allowed", default: true,  null: false
-      t.string "image_link"
-      t.boolean "news_page", default: false, null: false
-      t.boolean "autopublish", default: false, null: false
-      t.boolean "delta", default: false, null: false
-      t.string "unique_name"
-      t.integer "comments_count", default: 0,     null: false
-      t.datetime "last_comment_at"
-      t.boolean "pinned", default: false, null: false
-    end
-    add_index "pages", ["delta"], name: "delta_index"
-    add_index "pages", ["parent_page_id"], name: "index_pages_on_parent_page_id"
-    add_index "pages", ["position"], name: "index_pages_on_position"
-    add_index "pages", %w(status parent_page_id position), name: "for_find_page"
-    add_index "pages", ["status"], name: "index_pages_on_status"
-    add_index "pages", ["user_id"], name: "index_pages_on_user_id"
-    create_table "pages_categories", id: false do |t|
-      t.integer "page_id"
-      t.integer "category_id"
-    end
-    add_index "pages_categories", ["category_id"], name: "index_pages_categories_on_category_id"
-    add_index "pages_categories", ["page_id"], name: "index_pages_categories_on_page_id"
-    create_table "partials" do |t|
-      t.string "name"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-    create_table "sessions" do |t|
-      t.string "session_id"
-      t.text "data"
-      t.datetime "updated_at"
-    end
-    add_index "sessions", ["session_id"], name: "index_sessions_on_session_id"
-    add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at"
-    create_table "sms_subscribers" do |t|
-      t.string "msisdn"
-      t.string "group", default: "Default"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-    create_table "taggings" do |t|
-      t.integer "tag_id"
-      t.integer "taggable_id"
-      t.string "taggable_type"
-    end
-    add_index "taggings", ["tag_id"], name: "by_tag_id"
-    add_index "taggings", %w(taggable_type taggable_id), name: "by_taggable"
-    create_table "tags" do |t|
-      t.string "name"
-    end
-    add_index "tags", ["name"], name: "index_tags_on_name"
-    create_table "textbits" do |t|
-      t.integer "textable_id"
-      t.string "textable_type"
-      t.string "name"
-      t.string "language"
-      t.string "filter"
-      t.text "body"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-    add_index "textbits", %w(textable_id textable_type name language), name: "by_foreign_key", unique: true
-    add_index "textbits", %w(textable_id textable_type), name: "by_association"
-    create_table "users" do |t|
-      t.string "username"
-      t.string "hashed_password"
-      t.string "realname"
-      t.string "email"
-      t.datetime "last_login_at"
-      t.integer "created_by"
-      t.datetime "created_at"
-      t.boolean "is_admin"
-      t.text "persistent_data"
-      t.boolean "sms_sender"
-      t.boolean "is_activated", default: false, null: false
-      t.boolean "is_deleted", default: false, null: false
-      t.string "token"
-      t.date "born_on"
-      t.string "mobile"
-      t.string "web_link"
-      t.integer "image_id"
-      t.boolean "is_reviewer", default: false, null: false
-      t.boolean "is_super_admin", default: false, null: false
-      t.boolean "delta", default: false, null: false
-      t.string "openid_url"
-    end
-    add_index "users", ["delta"], name: "delta_index"
   end
 end