trusty-cms 4.0.2 → 4.1.4

data/app/views/admin/configuration/show.html.haml

@@ -1,13 +1,9 @@
-- body_classes << "reversed"
-
 #preferences.box
   - render_region :user do |user|
     - user.preferences do
       %h3
-        .actions
-          = button_to t("edit_preferences"), edit_admin_user_path(current_user), :method => :get
         = t('personal_preferences')
-      = image_tag(gravatar_url(@user.email, :size=>"64px"), :class=>"avatar", :width=>64, :height=>64, :alt=>"")
+      = image_tag(gravatar_url(@user.email, :size=>'64px'), :class=>'avatar', :width=>64, :height=>64, :alt=>'')
       %p.ruled
         %label
           = t('name')
@@ -27,14 +23,13 @@
           = t('language')
         %span
           = current_user.locale
+      .actions
+        = button_to t("edit_preferences"), edit_admin_user_path(current_user), :method => :get
 
 #config.box
   - render_region :trusty_config do |config|
     - config.site do
       %h3
-        - if current_user.admin?
-          .actions
-            = button_to t("edit_configuration"), edit_admin_configuration_path, :method => :get
         Configuration
       - TrustyCms.config.site_settings.each do |site_setting|
         %p.ruled
@@ -51,3 +46,6 @@
       - TrustyCms.config.user_settings.each do |user_setting|
         %p.ruled
           = show_config user_setting
+  - if current_user.admin?
+    .actions
+      = button_to t("edit_configuration"), edit_admin_configuration_path, :method => :get

data/app/views/admin/layouts/_choose_site.html.haml

@@ -1,7 +1,6 @@
 - unless current_user.site
-  %p{:style => 'float: left; margin-right: 32px'}
-    %label{:for=>"layout_site_id", :Class => "admin_only"}
-      Site
+  %label{:for=>'layout_site_id', :class => 'admin_only'}
+    Site
     - sites = Site.all.map { |s| [s.name, s.id] }
     - selection = {:include_blank => Layout.is_shareable?}
     - selection[:selected] = current_site.id if @layout.new_record? && ! Layout.is_shareable?

data/app/views/admin/layouts/_form.html.haml

@@ -4,30 +4,31 @@
   .form_area
     - render_region :form, :locals => {:f => f} do |form|
       - form.edit_title do
-        %p.title
+        .title
           = f.label :name, t('name')
-          = f.text_field :name, :maxlength => 100, :class => "textbox", :required => true
+          = f.text_field :name, :maxlength => 100, :class => 'textbox', :required => true
       - form.edit_extended_metadata do
         .drawer
           .drawer_contents#attributes
             %table.fieldset
               %tr
                 %th.label= f.label :content_type, t('content_type').html_safe
-                %td.field= f.text_field :content_type, :maxlength => 40, :class => "textbox"
+                %td.field= f.text_field :content_type, :maxlength => 40, :class => 'textbox'
               = render_region :extended_metadata, :locals => {:f => f}
           .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_content do
-        %p.content
-          = f.label :content, "Body"
-          ~ f.text_area :content, :size => "40x20", :style => "width: 100%", :class => "textarea large"
+        .textarea_content
+          = f.label :content, 'Body'
+          ~ f.text_area :content
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.reference_links do
-      %p
-        %span.reference_links
-          Reference:
-          %span{:id => "tag_reference_link"}
-            = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
+      .reference_links
+        Reference:
+        %span{:id => 'tag_reference_link'}
+          = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
     - form_bottom.edit_buttons do
       .buttons
         = save_model_button @layout

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,6 +1,6 @@
 - if current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
-  %nav#site_chooser
-    %ul#nav
+  .site_chooser
+    %ul.nav
       %li
         = "Current Site: #{current_site.name}"
         %ul.expansion

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

@@ -10,7 +10,7 @@
             %th.name
               = t('layout')
           - thead.actions_header do
-            %th.actions{:style=>"width:9em"}
+            %th.actions{:style=>'width:9em'}
               = t('modify')
     %tbody
       - if @layouts.any?
@@ -19,10 +19,14 @@
             - render_region :tbody, :locals => {:layout => layout} do |tbody|
               - tbody.title_cell do
                 %td.name
-                  = link_to image('layout', :alt => '') + ' ' + layout.name, edit_admin_layout_url(layout)
+                  = link_to edit_admin_layout_url(layout) do
+                    %i.far.fa-sticky-note
+                    = layout.name
               - tbody.actions_cell do
                 %td.actions
-                  = link_to image('minus') + ' ' + t('remove'), remove_admin_layout_url(layout), :class => "action"
+                  = link_to remove_admin_layout_url(layout), :class => 'action' do
+                    %i.fas.fa-minus-circle
+                    =t('remove')
       - else
         %tr
           %td.empty{:colspan => admin.layout.index.tbody.length}= t('no_layouts')
@@ -32,4 +36,7 @@
     #actions
       = pagination_for(@layouts)
       %ul
-        %li= link_to image('plus') + " " + t('new_layout'), new_admin_layout_url, :class => 'action_button'
+        %li
+          = link_to new_admin_layout_url, class: 'action_button' do
+            %i.fas.fa-plus-circle
+            =t('new_layout')

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

@@ -1,16 +1,17 @@
+- body_classes << 'reversed'
+
 %h1= t('remove_layout')
 
-%p= t('text.layouts.remove_warning').html_safe
+%h4= t('text.layouts.remove_warning').html_safe
 
-%table.index#layouts
+%table.tablesaw.index#layouts
   %tbody
     %tr.node.level_1
       %td.layout
-        = image('layout', :alt => '')
         = h @layout.name
 
-= form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>"Removing layout&#8230;" } do
+= form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>'Removing layout&#8230;' } do
   .buttons
-    %input.button{:type => "submit", :value => t('delete_layout')  }/
+    %input.button{:type => 'submit', :value => t('delete_layout')  }/
     = t('or')
     = link_to t('cancel'), admin_layouts_path, class: 'alt'

data/app/views/admin/page_attachments/_attachment.html.haml

@@ -2,11 +2,11 @@
 
 - page = attachment.page
 - asset = attachment.asset
-- asset_type = asset.image? ? "image" : "link"
+- asset_type = asset.image? ? 'image' : 'link'
 - css_class = "#{asset_type} asset"
 - css_class += ' unsaved' if attachment.new_record?
 
-%li{:class => css_class, :id => "attachment_#{asset.uuid}", data: {toggle: "tooltip", placement: "left"}, title: "Asset ID: #{asset.id}"}
+%li{:class => css_class, :id => "attachment_#{asset.uuid}", data: {toggle: 'tooltip', placement: 'left'}, title: "Asset ID: #{asset.id}"}
   = fields_for :page, @page do |f|
     = f.fields_for :page_attachments, attachment, :child_index => asset.uuid do |paf|
       - if attachment.new_record?

data/app/views/admin/page_fields/_page_field.html.haml

@@ -3,11 +3,11 @@
     %label{:for=>"page_#{page_field.name}"}= page_field.name
   %td.field
     = hidden_field_tag "page[fields_attributes][#{page_field_counter}][id]", page_field.id, :id => "page_fields_attributes_#{page_field_counter}_id" unless page_field.new_record?
-    = hidden_field_tag "page[fields_attributes][#{page_field_counter}][name]", page_field.name, :id => "page_fields_attributes_#{page_field_counter}_name", :class => "page_field_name"
+    = hidden_field_tag "page[fields_attributes][#{page_field_counter}][name]", page_field.name, :id => "page_fields_attributes_#{page_field_counter}_name", :class => 'page_field_name'
     = hidden_field_tag "page[fields_attributes][#{page_field_counter}][_destroy]", page_field._destroy, :class => 'delete_input'
-    ~ text_field_tag "page[fields_attributes][#{page_field_counter}][content]", page_field.content, :id => "page_fields_attributes_#{page_field_counter}_content", :class => "textbox", :maxlength => 200
+    ~ text_field_tag "page[fields_attributes][#{page_field_counter}][content]", page_field.content, :id => "page_fields_attributes_#{page_field_counter}_content", :class => 'textbox', :maxlength => 200
   %td.actions
     = link_to '#add_field_popup', :class=>'popup', :alt => t('add_field') do
       = image 'plus_grey'
-    = link_to "#remove_field#{page_field_counter}", :class => "remove_field", :alt => "Remove Field" do
+    = link_to "#remove_field#{page_field_counter}", :class => 'remove_field', :alt => 'Remove Field' do
       = image 'minus_grey'

data/app/views/admin/page_parts/_page_part.html.haml

@@ -1,15 +1,14 @@
 .page{:id => "page_#{page_part.name.to_slug}", 'data-caption'=>h(page_part.name)}
   .part{:id => "part-#{page_part.name.to_slug}"}
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][name]", page_part.name, :id => "part_#{page_part.name.to_slug}_name"
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => "id_input" unless page_part.new_record?
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_destroy]", page_part._destroy, :class => "delete_input"
-    %p
-      %label
-        = "To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button."
+    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => 'id_input' unless page_part.new_record?
+    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_destroy]", page_part._destroy, :class => 'delete_input'
+    .content
+      %label To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button.
       %span.reference_links
         = t('reference')
         %span{:id => "tag_reference_link_#{page_part.name.to_slug}"}
           = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
       = render_region :part_controls, :locals => {:page_part => page_part}
     %div
-      = cktext_area :page_part, page_part.content || '', :name => "page[parts_attributes][#{page_part_counter}][content]", :value => page_part.content || '', :class => "textarea large", :style => "width: 100%", :id => "part_#{page_part.name.to_slug}_content"
+      = cktext_area :page_part, page_part.content || '', :name => "page[parts_attributes][#{page_part_counter}][content]", :value => page_part.content || '', :style => 'width: 100%', :id => "part_#{page_part.name.to_slug}_content"

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

@@ -1,37 +1,36 @@
 - render_region :asset_popups do |popups|
   - popups.upload_asset do
-    #upload_asset.popup.textured{:style => "display: none; width: 28em"}
-      #upload_asset_busy.busy{:style => "display: none"}= image('spinner.gif', :alt => "")
+    #upload_asset.popup{:style => 'display: none; width: 28em'}
+      #upload_asset_busy.busy{:style => 'display: none'}= image('spinner.gif', :alt => '')
       
       .popup_title= t('clipped_extension.upload_asset')
 
       = form_for([:admin, Asset.new], :html => {:method => 'post', :multipart => true, :class => 'upload_asset'}) do |f|
-        = hidden_field_tag "for_attachment", 1
-        = hidden_field_tag "page_id", @page.id
+        = hidden_field_tag 'for_attachment', 1
+        = hidden_field_tag 'page_id', @page.id
         #upload-controls
           %p
-            = f.label :asset, t("clipped_extension.choose_file")
-            = f.file_field :asset, :class => 'file', :multiple => true
-            #upload-status{:style => 'display: none;'}
-              %img{:src => "/assets/admin/spinner.gif"}
+            %label.custom-file-upload
+              = t('clipped_extension.choose_file')
+              = f.file_field :asset, :class => 'file', :multiple => true
+              #upload-status{:style => 'display: none;'}
+                %img{:src => '/assets/admin/spinner.gif'}
           %p
-            %a#attach-popup{:href=>"#attach_asset", :style => 'color: #666; font-size: .8em'}= t('clipped_extension.attach_existing')
+            %a#attach-popup{:href=>'#attach_asset', :style => 'color: #666; font-size: .8em'}= t('clipped_extension.attach_existing')
 
-      -#%a.close_popup{:href=>"#"}= 'Upload Complete. Click to Close.'
-    
   - popups.attach_asset do
-    #attach_asset.popup.textured{:style=>"display: none;"}
+    #attach_asset.popup{:style=>'display: none;'}
       
       .popup_title= t('clipped_extension.find_assets')
       
       .toolbar
         = render :partial => 'admin/assets/search'
       
-      #assets_table.assets.viewport{:style=>"height: 320px; width: 610px"}
+      #assets_table.assets.viewport
         - assets = Asset.all.paginate(:per_page => 20, page: params[:p])
         = render :partial => 'admin/assets/asset_table', :locals => {:assets => assets, :with_pagination => true}
     
-      .busy{:style => "display: none"}= image('spinner.gif', :alt => "")
+      .busy{:style => 'display: none'}= image('spinner.gif', :alt => '')
       .buttons
-        %a.cancel.close_popup{:href=>"#"}= t('close')
-        %a{:href=>"#upload_asset", :id=> "upload_asset_link", :style => 'color: #666; float: left'}= t('clipped_extension.upload_asset')
+        %a.cancel.close_popup{:href=>'#'}= t('close')
+        %a{:href=>'#upload_asset', :id=> 'upload_asset_link', :style => 'color: #666; float: left'}= t('clipped_extension.upload_asset')

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")