trusty-cms 4.0.2 → 4.1.4

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

@@ -1,9 +1,10 @@
 - pages = @page.children.count > 1 ? t('pages') : t('page')
+- body_classes << 'reversed'
 
 %h1
   = t('remove_pages', :pages => pages)
 
-%p
+%h4
   = t('text.pages.remove_warning', :pages => pages).html_safe
 
 .inset
@@ -12,8 +13,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&#8230;"} do
+= form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing pages&#8230;'} 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

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

@@ -3,4 +3,4 @@
     %h1 Edit Site
   - main.edit_form do
     = form_for @site, :url => admin_site_path(@site), :html => {:method => :put} do |f|
-      = render :partial => "form", :locals => {:f => f}
+      = render :partial => 'form', :locals => {:f => f}

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

@@ -2,7 +2,7 @@
 
 %h1 Sites
 
-%table{:class => "index", :cellspacing => "0"}
+%table.index.tablesaw
   %thead
     %tr
       - render_region :thead do |thead|
@@ -31,12 +31,16 @@
               = h(site.base_domain)
           - tbody.modify_cell do
             %td.remove
-              = link_to image("remove.png", :alt => "Remove"), admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')"
+              = link_to admin_site_path(site), :method => :delete, :onclick => "return confirm('Are you sure you want to permanently remove #{site.name}?')" do
+                %i.fas.fa-minus-circle
+                = t('remove')
           - tbody.order_cell do
             %td.order
               = order_links(site).html_safe
 
 - render_region :bottom do |bottom|
   - bottom.new_button do
-    %p
-      = link_to "New Site", new_admin_site_path
+    .page-actions
+      = link_to new_admin_site_path, class: 'action_button' do
+        %i.fas.fa-plus-circle
+        New Site

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

@@ -3,4 +3,4 @@
     %h1 New Site
   - main.edit_form do
     = form_for @site, :url => admin_sites_path do |f|
-      = render :partial => "form", :locals => {:f => f}
+      = render :partial => 'form', :locals => {:f => f}

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

@@ -1,6 +1,5 @@
 - unless current_user.site
-  %p{:style => 'float: left; margin-right: 32px'}
-    %label{:for=>"snippet_site_id", :Class => "admin_only"}
-      Site
-      - sites = Site.all.map { |s| [s.name, s.id] }
-      = select :snippet, :site_id, sites, :include_blank => Snippet.is_shareable?, :selected => @snippet.site_id || current_site.id
+  %label{:for=>'snippet_site_id', :Class => 'admin_only'}
+    Site
+    - sites = Site.all.map { |s| [s.name, s.id] }
+    = select :snippet, :site_id, sites, :include_blank => Snippet.is_shareable?, :selected => @snippet.site_id || current_site.id

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

@@ -4,23 +4,22 @@
   .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, :class => 'textbox activate', :maxlength => 100
       - form.edit_content do
-        %p.content
+        .textarea_content
           = f.label :content, t('body')
-          ~ f.text_area :content, :class => "textarea large", :style => "width: 100%"
+          ~ f.text_area :content
       - form.edit_filter do
         .set
-          %p
-            %span.reference_links
-              == #{t('reference')}:
-              %span{:id => "tag_reference_link"}
-                = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
+          %span.reference_links
+            == #{t('reference')}:
+            %span{:id => 'tag_reference_link'}
+              = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
-      .buttons{:style=>"clear: left"}
+      .buttons{:style=>'clear: left'}
         = save_model_button(@snippet)
         = save_model_and_continue_editing_button(@snippet)
         = t('or')

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

@@ -6,6 +6,6 @@
   - main.edit_form do
     = render :partial => 'form'
   - main.edit_popups do
-    = render :partial => "popups"
+    = render :partial => 'popups'
 
 - content_for 'page_scripts'

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

@@ -9,7 +9,7 @@
           - thead.title_header do
             %th.name= t('snippet')
           - thead.actions_header do
-            %th.actions{:style=>"width:9em"}= t('modify')
+            %th.actions{:style=>'width:9em'}= t('modify')
     %tbody
       - if @snippets.any?
         - @snippets.each do |snippet|
@@ -17,10 +17,14 @@
             - render_region :tbody, :locals => {:snippet => snippet} do |tbody|
               - tbody.title_cell do
                 %td.name
-                  = link_to image('snippet', :alt => '') + ' ' + snippet.name, edit_admin_snippet_url(snippet)
+                  = link_to edit_admin_snippet_url(snippet) do
+                    %i.far.fa-sticky-note
+                    = snippet.name
               - tbody.actions_cell do
                 %td.actions
-                  = link_to image('minus') + ' ' + t('remove'), remove_admin_snippet_url(snippet), :class => "action"
+                  = link_to remove_admin_snippet_url(snippet), :class => 'action' do
+                    %i.fas.fa-minus-circle
+                    = t('remove')
       - else
         %tr
           %td.empty{:colspan => admin.snippet.index.tbody.length}= t('no_snippets')
@@ -30,4 +34,7 @@
     #actions
       = pagination_for(@snippets)
       %ul
-        %li= link_to image('plus') + " " + t('new_snippet'), new_admin_snippet_url, :class => 'action_button'
+        %li
+          = link_to new_admin_snippet_url, class: 'action_button' do
+            %i.fas.fa-plus-circle
+            =t('new_snippet')

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

@@ -4,6 +4,6 @@
   - main.edit_form do
     = render :partial => 'form'
   - main.edit_popups do
-    = render :partial => "popups"
+    = render :partial => 'popups'
 
 - content_for 'page_scripts'

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

@@ -1,17 +1,18 @@
+- body_classes << 'reversed'
+
 %h1= t('remove_snippet')
 
-%p 
-  = t('text.snippets.remove_warning')
+%h4
+  = t('text.snippets.remove_warning').html_safe
 
-%table.index#snippets
+%table.tablesaw.index#snippets
   %tbody
     %tr.node.level_1
       %td.snippet
-        = image('snippet', :alt => "")
         %span.title= @snippet.name
 
-= form_for [:admin, @snippet], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing snippet&#8230;"} do
+= form_for [:admin, @snippet], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing snippet&#8230;'} do
   .buttons
-    %input.button{:type=>"submit", :value => t('delete_snippet')}/
+    %input.button{:type=>'submit', :value => t('delete_snippet')}/
     = t('or')
     = link_to t('cancel'), admin_snippets_url

data/app/views/admin/users/_avatar.html.haml

@@ -1,5 +1,5 @@
 #avatar
-  = image_tag(gravatar_url(@user.email, :size=>"96px"), :class=>"avatar", :width=>96, :height=>96, :alt=>"")
+  = image_tag(gravatar_url(@user.email, :size=>'96px'), :class=>'avatar', :width=>96, :height=>96, :alt=>'')
   %p.caption
     Avatar provided by
-    = link_to "gravatar.com", 'http://gravatar.com/site/signup/'
+    = link_to 'gravatar.com', 'http://gravatar.com/site/signup/'