trusty-cms 4.0.2 → 4.1.0

data/app/views/admin/pages/_assets.html.haml

@@ -1,13 +1,14 @@
 = stylesheet_link_tag 'admin/assets'
 = javascript_include_tag 'admin/assets_admin'
-#content.fieldset
+
+%fieldset.asset_attachment
   #attachment_list.assets
     %ul#attachment_fields{:class => @page.page_attachments.empty? ? 'empty' : ''}
       = render :partial => 'admin/page_attachments/attachment', :collection => @page.page_attachments
-  %p.note
-    = link_to "path/to/page.html" '#attach_asset', :class => 'button', :id => 'attach_assets' do
-      %i.fa.fa-image
-      = t('clipped_extension.assets')
-    %span.message
+  .attach-assets
+    .message
       - if @page.page_attachments.empty?
-        = t('clipped_extension.no_attached_assets')
+        = t('clipped_extension.no_attached_assets')
+    = link_to 'path/to/page.html' '#attach_asset', :class => 'button', :id => 'attach_assets' do
+      %i.far.fa-image
+      = t('clipped_extension.assets')

data/app/views/admin/pages/_fields.html.haml

@@ -7,23 +7,25 @@
 - render_region :form, :locals => {:f => fields} do |form|
   - form.edit_title do
     %p.title
-      %label{:for=>"page_title"}= t('page_title')
-      = fields.text_field :title, :class => 'textbox', :maxlength => 255, :required => true
+      %label{:for=>'page_title'}= t('page_title')
+      = fields.text_field :title, :class => 'textbox', :required => true
   - form.edit_extended_metadata do
     .drawer
       .drawer_contents#attributes
         %table.fieldset
-          = render :partial => "meta_row", :collection => @meta, :locals => {:f => fields}
+          = render :partial => 'meta_row', :collection => @meta, :locals => {:f => fields}
           = render :partial => 'admin/page_fields/page_field', :collection => @page.fields
           = render_region :extended_metadata, :locals => {:f => fields}
       .drawer_handle
-        %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label
+        %a.toggle{:href=>'#attributes', :rel=>'toggle[attributes]', :class=>"#{(meta_errors? ? 'less' : 'more')}"}
+          = meta_label
+          %i.fas.fa-angle-down
   - form.edit_page_parts do
     #tab_control
       #tabs.tabs
         #tab_toolbar
           %a.popup{:href=> '#add_part_popup', :title=>t('add_part')}
-            = image('add_tab', :alt=>t('add_part'), :title=>"")
+            %i.fas.fa-plus-circle
       #pages.pages
         = render :partial => 'admin/page_parts/page_part', :collection => @page.parts
     = render_region :parts_bottom, :locals => {:f => fields}
@@ -31,35 +33,36 @@
 .set
   - render_region :layout, :locals => {:f => fields} do |layout|
     - layout.edit_layout do
-      %p
+      .layout
         = fields.label :layout_id, t('layout')
         = fields.select :layout_id, [[t('select.inherit') , '']] + Layout.all.map { |s| [s.name, s.id] }
     - layout.edit_type do
-      %p
+      .page-type
         = fields.label :class_name, t('page_type')
         = fields.select :class_name, [[t('select.normal'), '']] + Page.descendants.map { |p| [p.display_name, p.name] }.sort_by { |p| p.first }
     - layout.edit_status do
-      %p
+      .status
         = fields.label :status_id, t('status')
         = fields.select :status_id, status_to_display
     - layout.edit_published_at do
-      %p#published_at{:class => (@page.published? ? nil : 'hidden')}
-        = fields.label :published_at, t('published_on')
-        = fields.text_field :published_at, :class=> "date", :type=>"date", :value => (@page.published_at? ? I18n.localize(@page.published_at.to_date, :format =>:default) : nil)
+      .published-date
+        #published_at{:class => (@page.published? ? nil : 'hidden')}
+          = fields.label :published_at, t('published_on')
+          = fields.text_field :published_at, :class=> 'date', :type=>'date', :value => (@page.published_at? ? I18n.localize(@page.published_at.to_date, :format =>:default) : nil)
     = render_region :layout_row, :locals => {:f => fields}
 
 - render_region :form_bottom, :locals => {:f => fields} do |form_bottom|
   - form_bottom.edit_buttons do
     - @buttons_partials.each do |partial|
       = render :partial => partial, :locals => {:f => fields}
-    .buttons{:style=>"clear: left"}
+    .page-actions
       = save_model_button(@page)
       = save_model_and_continue_editing_button(@page)
       = submit_tag(t('preview', :default => 'Preview'), :class => 'button', :id => 'show-preview')
       = t('or')
       = link_to t('cancel'), admin_pages_url, class: 'alt'
     #preview_panel.fullcover.grey_out{:style => 'display: none;'}
-      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
+      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => 'auto'}
       .preview_tools
         =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
         =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')

data/app/views/admin/pages/_node.html.haml

@@ -1,13 +1,13 @@
-%tr.page{:class =>"branch", :data => { :tt_branch => branch.to_s,  :tt_id => page.id, :tt_parent_id => parent_index, :tt_page_id => page.id}, :id => "page_#{page.id}"}
+%tr.page{:class =>'branch', :data => { :tt_branch => branch.to_s,  :tt_id => page.id, :tt_parent_id => parent_index, :tt_page_id => page.id}, :id => "page_#{page.id}"}
   - render_region :node, :locals => {:page => page, :level => level, :simple => simple} do |node|
     - node.title_column do
       %td.name
         %span.w1
           - if simple
-            = icon
             = node_title
           - else
-            = (link_to("#{icon} #{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
+            %i.far.fa-file
+            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
             = page_type
             = spinner
     - node.status_column do

data/app/views/admin/pages/_popups.html.haml

@@ -3,30 +3,30 @@
     .outer
       .content
 
-  #add_part_popup.popup{:style => "display: none"}
-    #add_part_busy.busy{:style => "display: none"}= image('spinner.gif', :alt => "")
+  #add_part_popup.popup{:style => 'display: none'}
+    #add_part_busy.busy{:style => 'display: none'}= image('spinner.gif', :alt => '')
     .popup_title= t('add_part')
     = form_for [:admin, PagePart.new] do |f|
       %p
         %label{:for => 'part_name_field'}= t('name')
-        = f.text_field :name, :id => 'part_name_field', :maxlength => 100, :style => "width: 15em", :class => "textbox big"
+        = f.text_field :name, :id => 'part_name_field', :maxlength => 100, :style => 'width: 15em', :class => 'textbox big'
         = hidden_field_tag 'index', 0, :id => 'page_part_index_field'
       .buttons
-        = submit_tag t('add_part'), :id => 'add_part_button', :class => "button"
+        = submit_tag t('add_part'), :id => 'add_part_button', :class => 'button'
         = t('or')
-        = link_to "Cancel", '#', onclick: "Popup.close(); return false", class: "cancel"
-  #add_field_popup.popup{:style=>"display: none"}
-    #add_field_busy.busy{:style=>"display: none"}= image('spinner.gif', :alt => "")
+        = link_to 'Cancel', '#', onclick: 'Popup.close(); return false', class: 'cancel'
+  #add_field_popup.popup{:style=>'display: none'}
+    #add_field_busy.busy{:style=>'display: none'}= image('spinner.gif', :alt => '')
     .popup_title= t('add_field')
-    = form_for [:admin, PageField.new], :html => { :onsubmit => "event.stop(); addField(this)" } do |f|
+    = form_for [:admin, PageField.new], :html => { :onsubmit => 'event.stop(); addField(this)' } do |f|
       %p
-        %label{:for=>"page_field_name"}= t('name')
-        = f.text_field :name, :maxlength=>100, :class=>'textbox big', :style=>"width: 15em"
+        %label{:for=>'page_field_name'}= t('name')
+        = f.text_field :name, :maxlength=>100, :class=>'textbox big', :style=>'width: 15em'
         = hidden_field_tag 'index', 2, :id=>'page_field_index_field'
         = hidden_field_tag 'page_field_counter', @page.fields.size
         = f.hidden_field :page_id, value: @page.id
       .buttons
         = submit_tag t('add_field'), :class=>'button', :id=>'add_page_field_button'
         = t('or')
-        = link_to "Cancel", '#', onclick: "Popup.close(); return false", class: "cancel"
+        = link_to 'Cancel', '#', onclick: 'Popup.close(); return false', class: 'cancel'
   = render_region :popups

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

@@ -5,6 +5,6 @@
     %h1= ''
   - main.edit_form do
     = form_for @page, :as => :page, :url => admin_page_path(@page), :html => {:method => :put, :multipart => true, :id => 'edit_page', 'data-onsubmit_status'=>t('saving_changes')} do |fields|
-      = render :partial => "fields", :object => fields
+      = render :partial => 'fields', :object => fields
   - main.edit_popups do
-    = render :partial => "popups"
+    = render :partial => 'popups'

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

@@ -2,7 +2,7 @@
 
 .outset
   = render_region :top
-  %table.index#pages{:summary=>t('page_hierarchy')}
+  %table.index.tablesaw#pages{:summary=>t('page_hierarchy')}
     %thead
       %tr
         - render_region :sitemap_head do |sitemap_head|
@@ -23,4 +23,7 @@
 - unless @homepage
   #actions
     %ul
-      %li= link_to image('plus') + ' ' + t("new_homepage"), new_admin_page_path, :class => 'action_button'
+      %li
+        = link_to new_admin_page_path, :class => 'action_button' do
+          %i.fas.fa-plus-circle
+          = t("new_homepage")

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

@@ -2,7 +2,7 @@
   - main.edit_header do
     %h1= t('new_page')
   - main.edit_form do
-    = form_for @page, :as => :page, :url => admin_pages_path, :html => {:id => 'new_page', :multipart => true, 'data-onsubmit_status'=>"Creating page…"} do |f|
-      = render :partial => "fields", :object => f
+    = form_for @page, :as => :page, :url => admin_pages_path, :html => {:id => 'new_page', :multipart => true, 'data-onsubmit_status'=>'Creating page…'} do |f|
+      = render :partial => 'fields', :object => f
   - main.edit_popups do
-    = render :partial => "popups"
+    = render :partial => 'popups'

data/app/views/admin/pages/remove.html.haml

@@ -12,8 +12,8 @@
       - render_nodes @page, @page.id, nil, true
       = @rendered_html.html_safe
 
-= form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do
+= form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing pages…'} do
   .buttons
-    %input.button{:type=>"submit", :value => t('delete_pages', :pages => pages) }/
+    %input.button{:type=>'submit', :value => t('delete_pages', :pages => pages) }/
     = t('or')
     = link_to t('cancel'), admin_pages_path, class: 'alt'

data/app/views/admin/preferences/edit.html.haml

@@ -16,20 +16,20 @@
           - form.edit_first_name do
             %p
               = f.label :name, t("first_name")
-              = f.text_field :first_name, :class => "textbox", :size => 32, :maxlength => 100
+              = f.text_field :first_name, :class => 'textbox', :size => 32, :maxlength => 100
 
           - form.edit_last_name do
             %p
               = f.label :name, t("last_name")
-              = f.text_field :last_name, :class => "textbox", :size => 32, :maxlength => 100    
+              = f.text_field :last_name, :class => 'textbox', :size => 32, :maxlength => 100
 
           - form.edit_email do
             %p
-              = f.label :email,  t("email_address"), :class => "optional"
-              = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
+              = f.label :email,  t("email_address"), :class => 'optional'
+              = f.text_field 'email', :class => 'textbox', :maxlength => 255
 
           - form.edit_password do
-            = render "admin/users/password_fields", :f => f
+            = render 'admin/users/password_fields', :f => f
 
         - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
           - form_bottom.edit_buttons do

data/app/views/admin/references/filters.haml

@@ -3,4 +3,4 @@
     = _display_name
     Reference
   .reference=filter_reference
-  %p.close_link=link_to_function "Close Help", "$(this).closePopup();"
+  %p.close_link=link_to_function 'Close Help', '$(this).closePopup();'

data/app/views/admin/references/tags.haml

@@ -2,10 +2,10 @@
   .popup_title
     =t('available_tags_for', :name =>  _display_name)
   %p
-    %fieldset{:id => "live-search"}
+    %fieldset{:id => 'live-search'}
       %label.inline{:for => "search_#{class_of_page.name.underscore}_tag_reference"} Filter Tags
-      %input{:id => "filter", :type => "text", :name => "search_tag_reference", :value => ""}/
-      %span{:id => "filter-count"}
+      %input{:id => 'filter', :type => 'text', :name => 'search_tag_reference', :value => ''}/
+      %span{:id => 'filter-count'}
   .reference= tag_reference.html_safe
   %p.close_link
     %a.close_tags{href:'#'}

data/app/views/admin/removed/_assets_bucket.html.haml

@@ -1,8 +1,8 @@
-#asset-bucket{ :style => "display: none" }
-  = render :partial => "/admin/assets/assets_container"
+#asset-bucket{ :style => 'display: none' }
+  = render :partial => '/admin/assets/assets_container'
   
   %p.note
     = automatic_size_descriptions
     = t('clipped_extension.images_automatically_created')
   #close-link     
-    = link_to t("close"), "#"
+    = link_to t('close'), '#'

data/app/views/admin/removed/_assets_container.html.haml

@@ -6,21 +6,21 @@
     - render_region :asset_tabs do |asset_tabs|
       - if @page && !@page.new_record? 
         - asset_tabs.attachment_tab do
-          %a.asset-tab{ :href => "#page-attachments", :id => "tab_page-attachments" }
-            = t("clipped_extension.attached_assets")
+          %a.asset-tab{ :href => '#page-attachments', :id => 'tab_page-attachments' }
+            = t('clipped_extension.attached_assets')
         - asset_tabs.upload_tab do
-          %a.asset-tab{ :href => "#upload_assets", :id => "tab_upload_assets" }
-            = t("clipped_extension.upload")
+          %a.asset-tab{ :href => '#upload_assets', :id => 'tab_upload_assets' }
+            = t('clipped_extension.upload')
         - asset_tabs.bucket_tab do
-          %a.asset-tab{ :href => "#bucket", :id => "tab_bucket" }
-            = t("clipped_extension.bucket")
+          %a.asset-tab{ :href => '#bucket', :id => 'tab_bucket' }
+            = t('clipped_extension.bucket')
         - asset_tabs.search_tab do  
-          %a.asset-tab{ :href => "#search-assets" }
-            = t("clipped_extension.search")
+          %a.asset-tab{ :href => '#search-assets' }
+            = t('clipped_extension.search')
       - else
         - asset_tabs.bucket_tab do
-          %a.asset-tab.here{ :href => "#" }
-            = t("clipped_extension.bucket")
+          %a.asset-tab.here{ :href => '#' }
+            = t('clipped_extension.bucket')
     - if @page && !@page.new_record? 
       - render_region :asset_panes do |asset_panes|
 
@@ -28,27 +28,27 @@
           #page-attachments.pane
             %p
               %span.note 
-                != t("clipped_extension.asset_note")
+                != t('clipped_extension.asset_note')
             %ul#attachments
-              = render :partial => "admin/assets/page_assets" 
+              = render :partial => 'admin/assets/page_assets'
             .clear
       
         - asset_panes.upload do
           #upload_assets.pane
             %p
               %span.note
-                != t("clipped_extension.asset_page_upload_note")
-            = render :partial => "admin/assets/upload_to_page"
+                != t('clipped_extension.asset_page_upload_note')
+            = render :partial => 'admin/assets/upload_to_page'
             .clear
         - asset_panes.search do
           #search-assets.pane
             - form_tag do
               %p
                 %label.note{ :for => 'search' }
-                  = t("clipped_extension.search_assets")
-                %input{ :type => "hidden", :name => "search", :value => @page.id }
-                %input{ :type => "search", :id => "search", :name => "search" }
-                = submit_tag t("clipped_extension.search")
+                  = t('clipped_extension.search_assets')
+                %input{ :type => 'hidden', :name => 'search', :value => @page.id }
+                %input{ :type => 'search', :id => 'search', :name => 'search' }
+                = submit_tag t('clipped_extension.search')
             #search-results
             .clear
             = observe_field 'search',  :frequency => 1, :update => 'search-results', :url =>  admin_assets_path(:asset_page => @page), :method => 'get', :with => "'search=' + escape(value)"

data/app/views/admin/removed/_bucket.html.haml

@@ -5,7 +5,7 @@
   - else
     %li
       %p.note
-        = t("clipped_extension.empty_bucket")
+        = t('clipped_extension.empty_bucket')
       
  
 

data/app/views/admin/removed/_bucket_asset.html.haml

@@ -1,9 +1,9 @@
 %li
 
   %div{ :class => "#{asset_type} asset", :id =>  "bucket_#{asset_id}" }
-    = link_to image_tag(asset_thumbnail), asset_url, :title => asset_title, :class => "bucket_link"
+    = link_to image_tag(asset_thumbnail), asset_url, :title => asset_title, :class => 'bucket_link'
 
   .info{ :id => "#{asset_id}_info" }
-    = link_to image('assets/edit'), edit_admin_asset_url(asset_id), :class => "edit_asset", :title => t("clipped_extension.edit_asset", :asset => asset_title)
+    = link_to image('assets/edit'), edit_admin_asset_url(asset_id), :class => 'edit_asset', :title => t('clipped_extension.edit_asset', :asset => asset_title)
     - if page && !page.new_record?
-      = link_to image('assets/add'), attach_page_asset_url(:asset => asset_id, :page => page.id), :class => "add_asset", :title => t("clipped_extension.attach_to_page")
+      = link_to image('assets/add'), attach_page_asset_url(:asset => asset_id, :page => page.id), :class => 'add_asset', :title => t('clipped_extension.attach_to_page')

data/app/views/admin/removed/_show_bucket_link.html.haml

@@ -1,4 +1,4 @@
 - unless @page.nil? || @page.new_record?
   %span#show-bucket
     = t('clipped_extension.bucket')
-    = link_to t("clipped_extension.show_assets_bucket"), "#"
+    = link_to t('clipped_extension.show_assets_bucket'), '#'

data/app/views/admin/removed/_upload_to_page.html.haml

@@ -1,12 +1,12 @@
 #upload-form
-  - form_for :asset, :url => admin_assets_path(:page => @page, :format => 'js'), :html => { :id => 'asset-upload', :method => "post", :multipart => true, :target => 'ulframe' } do |form|
+  - form_for :asset, :url => admin_assets_path(:page => @page, :format => 'js'), :html => { :id => 'asset-upload', :method => 'post', :multipart => true, :target => 'ulframe' } do |form|
     %div.file
       %label.upload
-        = t("clipped_extension.choose_upload")
-      = form.file_field :asset, :class => "", :style => "width: 100%"
+        = t('clipped_extension.choose_upload')
+      = form.file_field :asset, :class => '', :style => 'width: 100%'
 
     .upload-buttons
-      = form.submit t("clipped_extension.save_and_upload"), :class => "button"
+      = form.submit t('clipped_extension.save_and_upload'), :class => 'button'
       %div.spinner
         
-  %iframe{:id => 'ulframe', :name => "ulframe", :src => "about:blank"}
+  %iframe{:id => 'ulframe', :name => 'ulframe', :src => 'about:blank'}

data/app/views/admin/sites/_form.haml

@@ -4,35 +4,35 @@
 
     - form.edit_name do
       %fieldset.title
-        %h1
-          %i.fa.fa-sitemap
+        %h4
+          %i.fas.fa-sitemap
           Site Information
-        %label{:for => "site_name"} Site title
-        = f.text_field :name, :class => "textbox", :size => 50
+        %label{:for => 'site_name'} Site title
+        = f.text_field :name, :class => 'textbox', :size => 50
         %br
-        %label{:for => "site_subtitle"} and subtitle
-        = f.text_field :subtitle, :class => "textbox"
+        %label{:for => 'site_subtitle'} and subtitle
+        = f.text_field :subtitle, :class => 'textbox'
 
     - form.edit_domain do
       %fieldset.domain
-        %h1
-          %i.fa.fa-lightbulb-o
+        %h4
+          %i.fas.fa-lightbulb
           Domain Information
-        %label{:for => "site_domain"}
+        %label{:for => 'site_domain'}
           Domain pattern
-        = f.text_field :domain, :class => "textbox", :size => 50
+        = f.text_field :domain, :class => 'textbox', :size => 50
         %br
-        %label{:for => "site_base_domain"}
+        %label{:for => 'site_base_domain'}
           Base domain name
-        = f.text_field :base_domain, :class => "textbox", :size => 50
+        = f.text_field :base_domain, :class => 'textbox', :size => 50
 
     - form.edit_homepage do
       %fieldset.homepage
-        %h1
-          %i.fa.fa-home
+        %h4
+          %i.fas.fa-home
           Homepage ID
-        %label{:for => "site_homepage_id"} Homepage ID
-        = f.text_field :homepage_id, :class => "textbox"
+        %label{:for => 'site_homepage_id'} Homepage ID
+        = f.text_field :homepage_id, :class => 'textbox'
 
   %p.formnote
     - if f.object.new_record?
@@ -44,7 +44,7 @@
     - form_bottom.edit_timestamp do
       = updated_stamp @site  
       - form_bottom.edit_buttons do
-        %p.buttons
+        .buttons
           = save_model_button(@site)
           or
-          = link_to "cancel", admin_sites_path
+          = link_to 'cancel', admin_sites_path