cdx 0.0.3 → 0.0.4

data/app/models/cdx/user.rb

@@ -10,9 +10,8 @@ module Cdx
     devise :database_authenticatable, :registerable,
            :recoverable, :rememberable, :trackable, :validatable
 
-    # Associations
-    has_one :avatar, -> { where(name: :avatar) }, class_name: 'Asset::User::Avatar', as: :record, dependent: :destroy
-    accepts_nested_attributes_for :avatar, allow_destroy: true
+    # Assets
+    has_one_attached :avatar, 'Asset::User::Avatar'
 
     # Settings
     store_accessor :settings, :theme
@@ -37,12 +36,14 @@ module Cdx
       "#{first_name} #{last_name}".strip
     end
 
-    def admin?
-      has_role?(:admin)
-    end
-
     def has_role?(role)
       roles.include? role.to_s
     end
+
+    Cdx.user_available_roles.each do |role|
+      define_method("is_#{role}?") do
+        has_role?(role)
+      end
+    end
   end
 end

data/app/models/concerns/cdx/attachment_macros.rb

@@ -0,0 +1,14 @@
+# Mimic ActiveStorage DSL, but works with nested attributes
+module Cdx
+  module AttachmentMacros
+    def has_one_attached(name, class_name)
+      has_one name.to_sym, -> { where(name: name) }, class_name: class_name, as: :record, dependent: :destroy
+      accepts_nested_attributes_for name.to_sym, allow_destroy: true
+    end
+
+    def has_many_attached(name, class_name)
+      has_many name.to_sym, -> { where(name: name) }, class_name: class_name, as: :record, dependent: :destroy
+      accepts_nested_attributes_for name.to_sym, allow_destroy: true, reject_if: :all_blank
+    end
+  end
+end

data/app/models/concerns/cdx/seo_support.rb

@@ -0,0 +1,20 @@
+module Cdx
+  module SeoSupport
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :seo, as: :record, dependent: :destroy
+      accepts_nested_attributes_for :seo, reject_if: :all_blank
+
+      delegate :meta_title,
+               :meta_description,
+               :meta_keywords,
+               :meta_canonical,
+               :og_title, :og_description,
+               :og_keywords,
+               :og_video,
+               :og_image,
+               to: :seo, allow_nil: true
+    end
+  end
+end

data/app/views/cdx/admin/devise/mailer/reset_password_instructions.html.erb

@@ -1,8 +1,8 @@
 <p>Hello <%= @resource.email %>!</p>
 
 <p>Someone has requested a link to change your password. You can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+<%= byebug %>
+<p><%= link_to 'Change my password', edit_admin_user_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/cdx/admin/devise/passwords/edit.html.erb

@@ -1,6 +1,6 @@
 <h2>Change your password</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+<%= form_for(resource, as: resource_name, url: admin_user_password_path, html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 

data/app/views/cdx/admin/devise/passwords/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Forgot your password?</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+<%= form_for(resource, as: resource_name, url: admin_user_password_path, html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">

data/app/views/cdx/admin/devise/sessions/new.html.erb

@@ -2,7 +2,7 @@
   Sign in to start your session
 </p>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= form_for(resource, as: resource_name, url: admin_user_session_path) do |f| %>
     <div class="form-group has-feedback">
       <%= f.email_field :email, autofocus: true, class: %w(form-control), placeholder: 'Email' %>
       <span class="glyphicon glyphicon-envelope form-control-feedback"></span>

data/app/views/cdx/admin/devise/shared/_links.html.erb

@@ -1,21 +1,7 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br />
+  <%= link_to "Log in", new_admin_user_session_path %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
-  <% end -%>
-<% end -%>
+  <%= link_to "Forgot your password?", new_admin_user_password_path %><br />
+<% end -%>

data/app/views/cdx/admin/pages/_form.html.erb

@@ -3,6 +3,9 @@
       <% translated_field f, :title %>
       <% translated_field(f, :slug, disabled: true) if f.object.persisted? %>
       <% translated_field f, :content, as: :wysiwyg %>
+      <%= f.input :template, collection: Cdx.page_available_templates, input_html: { class: %w(select2-simple) } %>
+
+      <%= render partial: 'cdx/admin/shared/seo_form', locals: { f: f } %>
     </div>
 
     <div class="box-footer">

data/app/views/cdx/admin/settings/_form.html.erb

@@ -1,9 +1,12 @@
 <% if defined?(f) %>
     <div class="box-body">
       <%= f.input :acronym %>
-      <%= f.input :default_theme %>
+      <%= f.input :default_theme, collection: Cdx::Setting::AVAILABLE_THEMES, input_html: { class: 'select2-simple theme-selector' }, include_blank: false %>
       <%= f.input :default_locale, collection: locales_options_tags, input_html: { class: 'select2-simple-search' }, include_hidden: false %>
       <%= f.input :available_locales, collection: locales_options_tags, input_html: { class: 'select2-multiple', multiple: true }, include_hidden: false %>
+
+      <%= render partial: 'cdx/admin/shared/seo_form', locals: { f: f } %>
+
     </div>
     <div class="box-footer">
       <%= f.button :submit %>

data/app/views/cdx/admin/shared/_header.html.erb

@@ -27,7 +27,7 @@
               <% end %>
             </li>
             <li>
-              <%= link_to destroy_admin_user_session_path, data: { method: :delete } do %>
+              <%= link_to destroy_admin_user_session_path do %>
                   <%= fa_icon 'sign-out' %>
                   <%= t('admin.signout') %>
               <% end %>

data/app/views/cdx/admin/shared/_main_sidebar_menu.html.erb

@@ -4,10 +4,10 @@
 <%= main_sidebar_menu_simple_item(current_main_tree, :home, :dashboard, admin_root_path, t('admin.main_sidebar.menu.title.dashboard')) %>
 
 <li class="header"><%= t('admin.main_sidebar.menu.title.contents') %></li>
-<%= main_sidebar_menu_simple_item(current_main_tree, :users, :user, admin_users_path, t('activerecord.models.cdx/user.other')) %>
-<%= main_sidebar_menu_simple_item(current_main_tree, :pages, :file, admin_pages_path, t('activerecord.models.cdx/page.other')) %>
-<%= main_sidebar_menu_simple_item(current_main_tree, [:taxonomies, :taxons], :tags, admin_taxonomies_path, t('activerecord.models.cdx/taxonomy.other')) %>
+<%= main_sidebar_menu_simple_item(current_main_tree, :users, :user, admin_users_path, t('activerecord.models.cdx/user.other')) if can?(:index, Cdx::User) %>
+<%= main_sidebar_menu_simple_item(current_main_tree, :pages, :file, admin_pages_path, t('activerecord.models.cdx/page.other')) if can?(:index, Cdx::Page) %>
+<%= main_sidebar_menu_simple_item(current_main_tree, [:taxonomies, :taxons], :tags, admin_taxonomies_path, t('activerecord.models.cdx/taxonomy.other')) if can?(:index, Cdx::Taxonomy) %>
 
 <li class="header"><%= t('admin.main_sidebar.menu.title.parameters') %></li>
-<%= main_sidebar_menu_simple_item(current_main_tree, :sites, :sitemap, admin_sites_path, t('activerecord.models.cdx/site.other')) %>
-<%= main_sidebar_menu_simple_item(current_main_tree, :settings, :wrench, edit_admin_setting_path, t('activerecord.models.cdx/setting.other')) %>
+<%= main_sidebar_menu_simple_item(current_main_tree, :sites, :sitemap, admin_sites_path, t('activerecord.models.cdx/site.other')) if can?(:index, Cdx::Site) %>
+<%= main_sidebar_menu_simple_item(current_main_tree, :settings, :wrench, edit_admin_setting_path, t('activerecord.models.cdx/setting.other')) if can?(:edit, Cdx::Setting) %>

data/app/views/cdx/admin/shared/_seo_form.html.erb

@@ -0,0 +1,34 @@
+<% if can? :edit, Cdx::Seo %>
+    <div class="panel box box-primary">
+      <div class="box-header">
+        <h4 class="box-title">
+          <%= link_to t('admin.seo'), '#seo_module', data: { toggle: 'collapse' }, class: %w(collapsed), aria: { expended: false } %>
+        </h4>
+      </div>
+      <div id="seo_module" class="panel-collapse collapse" aria-expanded="false" style="height:0px">
+        <div class="box-body">
+          <%= f.fields_for :seo, (f.object.seo ? f.object.seo : f.object.build_seo), wrapper: :horizontal_form do |seo_form| %>
+              <%= seo_form.input :meta_title %>
+              <%= seo_form.input :meta_description, as: :text %>
+              <%= seo_form.input :meta_keywords %>
+              <%= seo_form.input :meta_canonical %>
+              <%= seo_form.input :og_title %>
+              <%= seo_form.input :og_description, as: :text %>
+              <%= seo_form.input :og_keywords %>
+              <%= seo_form.input :og_video %>
+              <%= seo_form.fields_for :og_image, (seo_form.object.og_image ? seo_form.object.og_image : seo_form.object.build_og_image) do |image_form| %>
+                  <div class="form-group">
+                    <div class="col-sm-2 control-label string optional">
+                      <%= image_form.label :og_image, t('activerecord.attributes.cdx/seo.og_image') %>
+                    </div>
+                    <div class="col-sm-10">
+                      <%= render partial: 'cdx/admin/shared/file_input', locals: { f: image_form, multiple: '', style: 'info', attachment: 'attachment' } %>
+                      <%= tag.p image_form.object.attachment_file_name %>
+                    </div>
+                  </div>
+              <% end %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+<% end %>

data/app/views/cdx/admin/users/_form.html.erb

@@ -5,7 +5,7 @@
       <%= f.input :first_name %>
       <%= f.input :last_name %>
       <%= f.input :roles, collection: Cdx::User::AVAILABLE_ROLES, input_html: { class: 'select2-multiple', multiple: true }, include_hidden: false %>
-      <%= f.input :theme if current_admin_user == f.object %>
+      <%= f.input :theme, collection: Cdx::Setting::AVAILABLE_THEMES, input_html: { class: 'select2-simple theme-selector' }, include_blank: false if current_admin_user == f.object %>
       <hr>
       <h4><%= t('admin.avatar') %></h4>
       <%= f.fields_for :avatar do |avatar_form| %>

data/app/views/cdx/static/show.html.erb

@@ -0,0 +1 @@
+<%= @object.content %>

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

@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Cdx</title>
+  <title><%= meta_title %></title>
   <%= stylesheet_link_tag 'cdx/admin', media: 'all' %>
   <%= javascript_include_tag 'cdx/admin' %>
   <%= csrf_meta_tags %>
 
+  <%== seo_data_tags %>
+
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+
   <%= render partial: 'cdx/admin/shared/head' %>
 </head>
 <body id="<%= context_tag %>" class="<%= theme_class %> sidebar-mini">

data/app/views/layouts/cdx/admin_login.html.erb

@@ -6,6 +6,10 @@
   <%= javascript_include_tag 'cdx/admin' %>
   <%= csrf_meta_tags %>
 
+  <%== seo_data_tags %>
+
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+
   <%= render partial: 'cdx/admin/shared/head' %>
 </head>
 <body id="<%= context_tag %>" class="hold-transition login-page">

data/config/initializers/devise.rb

@@ -4,8 +4,6 @@ Devise.setup do |config|
 
   config.scoped_views = true
 
-  config.router_name = :cdx
-
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
@@ -23,7 +21,7 @@ Devise.setup do |config|
   # config.mailer = 'Devise::Mailer'
 
   # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
+  config.parent_mailer = 'Cdx::ApplicationMailer'
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -250,7 +248,7 @@ Devise.setup do |config|
   # config.navigational_formats = ['*/*', :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
@@ -274,7 +272,7 @@ Devise.setup do |config|
   #     mount MyEngine, at: '/my_engine'
   #
   # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
+  config.router_name = :cdx
   #
   # When using OmniAuth, Devise cannot automatically set OmniAuth path,
   # so you need to do it manually. For the users scope, it would be:

data/config/initializers/simple_form_bootstrap.rb

@@ -103,9 +103,9 @@ SimpleForm.setup do |config|
     b.use :html5
     b.optional :readonly
 
-    b.use :label, class: 'col-sm-3 control-label'
+    b.use :label, class: 'col-sm-2 control-label'
 
-    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+    b.wrapper tag: 'div', class: 'col-sm-10' do |ba|
       ba.use :input
       ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
       ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }

data/config/locales/en.activerecord.yml

@@ -4,26 +4,24 @@ en:
       cdx/user:
         one: User
         other: Users
-
       cdx/site:
         one: Site
         other: Sites
-
       cdx/page:
         one: Page
         other: Pages
-
       cdx/taxonomy:
         one: Taxonomy
         other: Taxonomies
-
       cdx/taxon:
         one: Taxon
         other: Taxons
-
       cdx/setting:
         one: Setting
         other: Settings
+      cdx/seo:
+        one: Seo
+        other: Seo
 
     attributes:
       cdx/user:
@@ -33,25 +31,61 @@ en:
         last_name: Last name
         full_name: Full name
         theme: Theme
-
+        roles: Roles
+        password_confirmation: Password confirmation
       cdx/site:
         name: Name
         code: Code
         domain: Domain
-        default : Default ?
-
+        default: Default ?
       cdx/page:
         title: Title
         content: Page content
         state: State
         published_on: Published on
         slug: Slug
-
+        template: Template
       cdx/taxonomy:
         name: Name
         description: Description
-
+        available_codes: Available codes
       cdx/taxon:
         name: Name
         description: Description
         parent: Parent
+      cdx/seo:
+        meta_title: Meta title
+        meta_description: Meta description
+        meta_keywords: Meta keywords
+        meta_canonical: Canonical url
+        og_title: OpenGraph title
+        og_description: OpenGraph description
+        og_keywords: OpenGraph keywords
+        og_video: OpenGraph video url
+        og_image: OpenGraph image
+      cdx/setting:
+        acronym: Acronym
+        default_theme: Default theme
+        default_locale: Default locale
+        available_locales: Available locales
+
+  helpers:
+    submit:
+      user:
+        create: Create user
+        update: Update user
+      page:
+        create: Create page
+        update: Update page
+      taxonomy:
+        create: Create taxonomy
+        update: Update taxonomy
+      taxon:
+        create: Create taxon
+        update: Update taxon
+      site:
+        create: Create site
+        update: Update site
+      setting:
+        create: Create setting
+        update: Update setting

data/config/locales/en.admin.yml

@@ -1,47 +1,48 @@
 en:
   admin:
     generic_states:
-      published: "Published"
-      draft: "Draft"
+      published: Published
+      draft: Draft
     content_header:
       page_title:
-        home_index: "Dashboard"
+        home_index: Dashboard
         actions:
-          edit: "Edit"
-          update: "Edit"
-          new: "New"
-          create: "New"
-          index: "Index"
-        settings: "Settings"
+          edit: Edit
+          update: Edit
+          new: New
+          create: New
+          index: Index
+        settings: Settings
       breadcrumb:
-        home_index: "Dashboard"
+        home_index: Dashboard
+
     main_sidebar:
       menu:
         title:
-          parameters: "Parameters"
-          contents: "Contents"
-          dashboard: "Dashboard"
+          parameters: Parameters
+          contents: Contents
+          dashboard: Dashboard
+
     actions:
-      new: "New"
-      return: "Return"
-      all: "Actions"
-      publish: "Publish"
-      draft: "Draft"
-      unpublish: "Unpublish"
-      upload: "Upload a file"
-    general: "General"
-    alert: "Alert"
-    password: "Password"
-    avatar: "Avatar"
-    online: "Online"
-    signout: "Sign out"
-    profile: "Profile"
+      new: New
+      return: Return
+      all: Actions
+      publish: Publish
+      draft: Draft
+      unpublish: Unpublish
+      upload: Upload a file
+    general: General
+    alert: Alert
+    password: Password
+    avatar: Avatar
+    online: Online
+    signout: Sign out
+    profile: Profile
     custom_validators:
-      must_have_one_default_site: "One default site is required"
+      must_have_one_default_site: One default site is required
     ujs_confirm:
-      delete: "Are you sure you want to delete : %{o} ?"
-      default: "Are you sure ?"
-
+      delete: 'Are you sure you want to delete : %{o} ?'
+      default: Are you sure ?
     flash:
       default:
         create:
@@ -62,19 +63,23 @@ en:
 
       settings:
         update:
-          success: "Settings successfully updated"
-          error: "Settings cannot be created"
+          success: Settings successfully updated
+          error: Settings cannot be created
         clear_cache:
-          success: "Cache successfully cleared"
+          success: Cache successfully cleared
+
       sessions:
-        not_admin: "User isn't admin"
-    settings:
-      clear_cache: "Clear cache"
-      cache: "Cache"
-      clear_cache_alert: "Clear cache may affect global performances."
+        not_admin: User isn't admin
 
+    settings:
+      clear_cache: Clear cache
+      cache: Cache
+      clear_cache_alert: Clear cache may affect global performances.
     taxonomies:
       available_codes:
         users: Users
         pages: Pages
-      available_codes_message: If this field is empty, all taxonomisable models are considered as availables.
+      available_codes_message: If this field is empty, all taxonomisable models are
+        considered as availables.
+
+    seo: SEO