trusty-cms 4.0.2 → 4.1.0

data/app/helpers/application_helper.rb

@@ -83,10 +83,10 @@ module ApplicationHelper
       name = updated_by ? updated_by.name : nil
       time = (model.updated_at || model.created_at)
       if name or time
-        html = %{<p class="updated_line">#{t('timestamp.last_updated')} }
+        html = %{<div class="updated_line">#{t('timestamp.last_updated')} }
         html << %{#{t('timestamp.by')} <strong>#{name}</strong> } if name
         html << %{#{t('timestamp.at')} #{timestamp(time)}} if time
-        html << %{</p>}
+        html << %{</div>}
         html.html_safe
       end
     end

data/app/models/menu_renderer.rb

@@ -68,7 +68,7 @@ module MenuRenderer
   end
 
   def remove_link
-    view.link_to view.image('minus') + ' ' + I18n.t('remove'), view.remove_admin_page_url(self), :class => "action"
+    view.link_to( '<i class="fas fa-minus-circle"></i> '.html_safe + I18n.t('remove'), view.remove_admin_page_url(self), :class => "action")
   end
 
   def remove_option
@@ -84,11 +84,11 @@ module MenuRenderer
   end
 
   def add_child_link
-    view.link_to((view.image('plus') + ' Add Child'), view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
+    view.link_to( '<i class="fas fa-plus-circle"></i> Add Child'.html_safe, view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
   end
 
   def add_child_link_with_menu_hook
-    view.link_to((view.image('plus') + ' Add Child'), "#allowed_children_#{id}", :class => "action dropdown")
+    view.link_to('<i class="fas fa-plus-circle"></i> Add Child'.html_safe, "#allowed_children_#{id}", :class => "action dropdown")
   end
 
   def add_child_menu

data/app/users/_choose_site.html.haml

@@ -1,8 +1,4 @@
 - unless current_user.site
-  %tr
-    %th.label
-      %label{:for=>"user_admin"} Can edit site
-    %td.field{:style => 'text-align: left;'}
-      = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
-    %td.help
-      A user with no site is able to act (to whatever extent their status allows) on any site.
+    %label{:for=>"user_admin"} Can edit site
+    = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
+    .caption A user with no site is able to act (to whatever extent their status allows) on any site.

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

@@ -1,7 +1,7 @@
 = render_region :form_top
 - render_region :form do |form|
   - form.edit_title do
-    %fieldset.title
+    .title
   - form.edit_metadata do
     .drawer
       .drawer_contents#attributes
@@ -16,3 +16,4 @@
       .drawer_handle
         %a.toggle.more{:href=>'#attributes', :rel=>"toggle[attributes]"}
           = t('more')
+          %i.fas.fa-angle-down

data/app/views/admin/assets/_search.html.haml

@@ -9,7 +9,8 @@
     - AssetType.all.each do |type|
       - unless type.name == :other
         = link_to t("asset_types.#{type.plural}"), admin_assets_url(:filter => type.name), :rel => type.name.to_s, :class => params[:filter] == type.name.to_s ? "selective pressed" : "selective"
-  .right
+  .asset_search
+    %i.fas.fa-search
     %input{:type=>"search", :id => 'filesearchforminput', :class=>"search", :name=>"search", :value=>h(params[:search]), :placeholder=>"Search", :results=>0, :size=>30}
   
   #type_boxes{:style => "display: none"}

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

@@ -21,9 +21,9 @@
           = updated_stamp @asset
         
         %fieldset.upload
-          %label.upload
+          %label.custom-file-upload.upload
             = t("clipped_extension.replace_file")
-          = f.file_field :asset, :class => "", :style => "width: 100%"
+            = f.file_field :asset, :class => "", :style => "width: 100%"
         
         .buttons
           = save_model_button(@asset)
@@ -33,8 +33,9 @@
   
   - main.edit_regenerate do
     - if current_user.admin? or current_user.designer?
-      %fieldset= t("clipped_extension.regenerate_thumbnails")
-      
-      - form_tag refresh_admin_asset_path(@asset), :method => :put do
-        %p.asset_buttons
-          %input.button{ :type => "submit", :value => t("clipped_extension.regenerate") }
+      %fieldset
+        = form_tag refresh_admin_asset_path(@asset), :method => :put do
+          %label= t("clipped_extension.regenerate_thumbnails")
+          %br
+          .asset_buttons
+            %input.button{ :type => "submit", :value => t("clipped_extension.regenerate") }

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

@@ -1,5 +1,6 @@
 = stylesheet_link_tag 'admin/assets'
 = javascript_include_tag 'admin/assets_admin'
+- body_classes << 'reversed'
 
 - content_for :toolbar do
   = render 'search'
@@ -11,5 +12,6 @@
   
 - render_region :bottom do |bottom|
   #actions
-    %ul
-      %li= link_to((image('upload') + ' ' + t('clipped_extension.upload_asset')), new_admin_asset_path)
+    = link_to new_admin_asset_path, class: 'button' do
+      %i.fas.fa-upload
+      = t('clipped_extension.upload_asset')

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

@@ -1,5 +1,5 @@
 = stylesheet_link_tag 'admin/assets'
-= render_region :top 
+= render_region :top
 
 - render_region :main do |main|
   - main.edit_header do
@@ -7,12 +7,11 @@
 
     - main.edit_form do
       - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
-
         = render :partial => "form", :locals => { :f => f }
-
         %fieldset
-          %label= t("clipped_extension.choose_file")
-          = f.file_field :asset, :style => "width: 100%", :multiple => true
+          %label.custom-file-upload
+            = t("clipped_extension.choose_file")
+            = f.file_field :asset, :style => "width: 100%", :multiple => true
 
         .buttons
           = save_model_button(@asset)

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

@@ -1,3 +1,4 @@
+- body_classes << "reversed"
 = stylesheet_link_tag 'admin/assets'
 
 %h1= t("clipped_extension.remove_asset")

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

@@ -1,4 +1,4 @@
-- body_classes << "reversed"
+- body_classes << 'reversed'
 - @selected = :general
 
 - render_region :main do |main|
@@ -6,26 +6,26 @@
     %h1 Configuration
 
   - main.edit_form do
-    = form_for :trusty_config, :url => admin_configuration_path, :html => {"data-onsubmit_status"=>"Saving changes&#8230;", :method => :put} do |f|
+    = form_for :trusty_config, :url => admin_configuration_path, :html => {'data-onsubmit_status'=>'Saving changes&#8230;', :method => :put} do |f|
       = render_region :form_top
       - render_region :form do |form|
         - form.edit_site do
           %fieldset
-            %h3 Site
+            %h4 Site
             - TrustyCms.config.site_settings.each do |site_setting|
               %p
                 = edit_config site_setting
 
         - form.edit_defaults do
           %fieldset
-            %h3 Defaults
+            %h4 Defaults
             - TrustyCms.config.default_settings.each do |default_setting|
               %p
                 = edit_config default_setting
 
         - form.edit_users do
           %fieldset
-            %h3 Passwords
+            %h4 Passwords
             - TrustyCms.config.user_settings.each do |user_setting|
               %p
                 = edit_config user_setting
@@ -33,6 +33,6 @@
       - render_region :form_bottom do |form_bottom|
         - form_bottom.edit_buttons do
           .buttons
-            %input.button{:type=>"submit", :value=>"Save Changes"}/
+            %input.button{:type=>'submit', :value=>'Save Changes'}/
             or
-            = link_to "Cancel", admin_configuration_path, class: 'alt'
+            = link_to 'Cancel', admin_configuration_path, class: 'alt'

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

@@ -9,8 +9,8 @@
         = image('layout', :alt => '')
         = h @layout.name
 
-= form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>"Removing layout…" } do
+= form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>'Removing layout…' } 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"
+    = 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."
+      %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')