trusty-cms 4.0.2 → 4.1.4

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

@@ -1,8 +1,4 @@
 - if current_user.admin?
-  %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/users/_form.html.haml

@@ -1,44 +1,41 @@
-= form_for [:admin, @user], :html => {class: "user_form"} do |f|
+= form_for [:admin, @user], :html => {class: 'user_form'} do |f|
   = render :partial => 'avatar' unless @user.new_record?
 
   = render_region :form_top, :locals => {:f => f}
 
   - render_region :form, :locals => {:f => f} do |form|
     - form.edit_first_name do
-      %p
-        = f.label :name, t('first_name')
-        = f.text_field :first_name, :class => "textbox", :size => 32, :maxlength => 100
+      = f.label :name, t('first_name')
+      = f.text_field :first_name, :class => 'textbox', :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.label :name, t('last_name')
+      = f.text_field :last_name, :class => 'textbox', :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 "password_fields", :f => f
+      = render 'password_fields', :f => f
 
     - form.edit_roles do
       - if current_user.admin?
-        %p
-          %label.multi_option= t('roles')
-          = f.check_box "admin", :class => "checkbox"
-          = f.label :admin, t('admin'), :class => "checkbox"
-          = f.check_box "designer", :class => "checkbox"
-          = f.label :designer, t('designer'), :class => "checkbox"
+        %fieldset.multi_option
+          %label= t('roles')
+          = f.check_box 'admin', :class => 'checkbox'
+          = f.label :admin, t('admin'), :class => 'checkbox'
+          = f.check_box 'designer', :class => 'checkbox'
+          = f.label :designer, t('designer'), :class => 'checkbox'
 
     - form.edit_notes do
-      %p
-        = f.label :notes, t('notes'), :class => "optional"
-        ~ f.text_area "notes", :size => "53x4", :class => "textarea"
+      %fieldset
+        = f.label :notes, t('notes'), :class => 'optional'
+        ~ f.text_area 'notes', :size => '53x4', :class => 'textarea'
 
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
-      .buttons
+      .page-actions
         = save_model_button(@user)
         = save_model_and_continue_editing_button(@user)
         = t('or')

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

@@ -1,18 +1,18 @@
-%p#display_password{:style=> (@user.new_record? or !@user.valid?) ? "display: none" : nil}
+%fieldset#display_password{:style=> (@user.new_record? or !@user.valid?) ? 'display: none' : nil}
   %label= t('password')
   %span.value
     •••••
-    %a.action{:href=>"#", :onclick=>"$('#display_password').hide(); $('#change_password').show()"}= t('change')
-.set#change_password{:style=> (!@user.new_record? && @user.valid?) ? "display: none" : nil}
+  %a.button{:href=>'#', :onclick=>"$('#display_password').hide(); $('#change_password').show()"}= t('change')
+%fieldset#change_password{:style=> (!@user.new_record? && @user.valid?) ? 'display: none' : nil}
   %p
     = f.label :password, t('new_password')
-    = f.password_field "password", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'new-password'
+    = f.password_field 'password', :value => '', :maxlength => 40, :autocomplete => 'new-password'
   %p
     = f.label :password_confirmation, t('password_confirmation')
-    = f.password_field "password_confirmation", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'new-password'
+    = f.password_field 'password_confirmation', :value => '', :maxlength => 40, :autocomplete => 'new-password'
     - unless @user.new_record?
       %span
         = t('or')
-        %a{:href=>"#", :class=>"warning", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel', class: 'alt')
+        %a{:href=>'#', :class=>'cancel-button', :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel', class: 'alt')
 
 

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

@@ -3,7 +3,7 @@
 = render_region :top
 
 .outset
-  %table.index#users
+  %table.index.tablesaw#users
     %thead
       %tr
         - render_region :thead do |thead|
@@ -12,23 +12,26 @@
           - thead.roles_header do
             %th.roles= t('roles')
           - thead.actions_header do
-            %th.actions{:style=>"width:9em"}= t('modify')
+            %th.actions{:style=>'width:9em'}= t('modify')
     %tbody
       - @users.each do |user|
         %tr[user]
           - render_region :tbody, :locals => {:user => user} do |tbody|
             - tbody.title_cell do
               %td.name
-                = link_to image_tag(gravatar_url(user.email, :size=>"32px"), :class=>"avatar avatar_32x32", :width=>32, :height=>32, :alt=>""), edit_admin_user_url(user)
                 = link_to user.name, edit_admin_user_url(user)
             - tbody.roles_cell do
               %td.roles= roles(user)
             - tbody.actions_cell do
               %td.actions
                 - if !current_user.admin?
-                  %span.action.disabled= image('minus_disabled') + ' ' + t('remove')
+                  %span.action.disabled
+                    %i.fas.fa-minus-circle
+                    = t('remove')
                 - else
-                  = link_to image('minus') + ' ' + t('remove'), remove_admin_user_url(user), :class => "action"
+                  = link_to remove_admin_user_url(user), :class => 'action' do
+                    %i.fas.fa-minus-circle
+                    = t('remove')
 
 - render_region :bottom do |bottom|
   - bottom.new_button do
@@ -36,4 +39,8 @@
       #actions
         = pagination_for(@users)
         %ul
-          %li= link_to image('plus') + " " + t('new_user'), new_admin_user_url, :class => 'action_button'
+          %li
+            = link_to new_admin_user_url, :class => 'action_button' do
+              %i.fas.fa-plus-circle
+              = t('new_user')
+

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

@@ -1,7 +1,7 @@
 %h1= t('remove_user')
 
-%p
-  = t('text.users.remove_warning')
+%h4
+  = t('text.users.remove_warning').html_safe
 
 %table.index#users
   %tbody
@@ -9,8 +9,8 @@
       %td.user
         %span.title= @user.name
 
-= form_for [:admin, @user], :html => { :method => :delete, 'data-onsubmit_status'=>"Removing user…" } do
+= form_for [:admin, @user], :html => { :method => :delete, 'data-onsubmit_status'=>'Removing user…' } do
   .buttons
-    %input.button{:type=>"submit", :value => t('delete_user')}/
+    %input.button{:type=>'submit', :value => t('delete_user')}/
     = t('or')
     = link_to t('cancel'), admin_users_path, class: 'alt'

data/app/views/admin/welcome/login.html.haml

@@ -1,18 +1,18 @@
-- body_classes << "single_form"
+- body_classes << 'single_form'
 
 #single_form
   %h1= t('please_login')
 
   = form_tag login_path do
     %p
-      %label{:for=>"username_or_email"}= t('username_or_email')
-      = text_field_tag "username_or_email", @username_or_email, :class => 'textbox', :maxlength => 40, :size => 40
+      %label{:for=>'username_or_email'}= t('username_or_email')
+      = text_field_tag 'username_or_email', @username_or_email, :class => 'textbox', :maxlength => 40, :size => 40
     %p
-      %label{:for=>"password"}= t('password')
-      = password_field_tag "password", '', :class => 'textbox password', :maxlength => 40, :size => 40
-    %p= link_to "Forgot password?", new_admin_password_reset_path
+      %label{:for=>'password'}= t('password')
+      = password_field_tag 'password', '', :class => 'textbox password', :maxlength => 40, :size => 40
+    %p= link_to 'Forgot password?', new_admin_password_reset_path
     %p.remember_me
       = check_box_tag :remember_me, 1, false, :class => 'checkbox'
-      %label.checkbox{:for=>"remember_me"}= t('remember_me_in_this_browser')
+      %label.checkbox{:for=>'remember_me'}= t('remember_me_in_this_browser')
     .buttons
-      %input.button{:type => "submit", :value => t('login')}
+      %input.button{:type => 'submit', :value => t('login')}

data/app/views/devise/passwords/edit.html.haml

@@ -7,17 +7,17 @@
     = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
       = f.hidden_field :reset_password_token
       .field
-        = f.label :password, "New password"
+        = f.label :password, 'New password'
         %br/
         - if @minimum_password_length
           %em
             (#{@minimum_password_length} characters minimum)
           %br/
-        = f.password_field :password, autofocus: true, autocomplete: "new-password"
+        = f.password_field :password, autofocus: true, autocomplete: 'new-password'
       .field
-        = f.label :password_confirmation, "Confirm new password"
+        = f.label :password_confirmation, 'Confirm new password'
         %br/
-        = f.password_field :password_confirmation, autocomplete: "new-password"
+        = f.password_field :password_confirmation, autocomplete: 'new-password'
       .actions
-        = f.submit "Change my password"
-    = render "devise/shared/links"
+        = f.submit 'Change my password'
+    = render 'devise/shared/links'

data/app/views/devise/passwords/new.html.haml

@@ -8,7 +8,7 @@
       .field
         = f.label :email
         %br/
-        = f.email_field :email, autofocus: true, autocomplete: "email", required: true
+        = f.email_field :email, autofocus: true, autocomplete: 'email', required: true
       .actions
-        = f.submit "Send me reset password instructions"
-    = render "devise/shared/links"
+        = f.submit 'Send me reset password instructions'
+    = render 'devise/shared/links'

data/app/views/devise/sessions/new.html.haml

@@ -7,19 +7,19 @@
     = form_for(resource, as: resource_name, url: authenticate_path) do |f|
       .field
         = f.label :email
-        %br/
-        = f.email_field :email, autofocus: true, autocomplete: "email"
+        = f.email_field :email, autofocus: true, autocomplete: 'email'
       .field
         = f.label :password
-        %br/
-        = f.password_field :password, autocomplete: "current-password"
+        = f.password_field :password, autocomplete: 'current-password'
       - if devise_mapping.rememberable?
         .field
-          = f.check_box :remember_me
-          = f.label :remember_me
+          = f.label :remember_me do
+            = f.check_box :remember_me
+            Remember Me
+      %br
       .actions
-        = f.submit "Log in"
+        = f.submit 'Log in'
         - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
-          = link_to "Forgot your password?", new_password_path(resource_name)
+          = link_to 'Forgot your password?', new_password_path(resource_name)
       - if flash.alert
         .error= flash.alert

data/app/views/devise/shared/_links.html.haml

@@ -1,8 +1,8 @@
 - if controller_name != 'sessions'
-  = link_to "Log in", new_session_path(resource_name)
+  = link_to 'Log in', new_session_path(resource_name)
   %br/
 - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
-  = link_to "Forgot your password?", new_password_path(resource_name)
+  = link_to 'Forgot your password?', new_password_path(resource_name)
   %br/
 - if devise_mapping.confirmable? && controller_name != 'confirmations'
   = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)

data/app/views/layouts/application.html.haml

@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 %html{html_attrs}
   %head
-    %meta{"http-equiv"=>"Content-type", :content=>"text/html;charset=utf-8"}/
+    %meta{"http-equiv"=>"Content-type", :content=>"text/html;charset=utf-8"}
+    %meta{name: "viewport", content: "width=device-width"}
     %title= @page_title || default_page_title
 
     - @stylesheets.uniq.each do |stylesheet|
@@ -29,8 +30,8 @@
     = csrf_meta_tags
 
   %body{:class=>body_classes.join(" ")}
-    #page
-      #header
+    #page.trusty-container
+      %header
         - if logged_in?
           = render_region :before_nav
           - render_region :navigation do |navigation|
@@ -38,26 +39,30 @@
               = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path} &nbsp; (#{link_to t('log_out'), destroy_user_session_path, method: :get})}.html_safe
               &nbsp;
               = link_to t('view_site'), root_path, :id=>"view_site"
-            %ul#navigation
-              - nav_tabs.each do |tab|
-                - if tab.visible?(current_user)
-                  %li{:class=>('current ' if current_tab?(tab)).to_s}
-                    = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
-            #toolbar
-              - if @current_tab and @current_tab.size > 1
-                %ul#secondary_navigation
-                  - @current_tab.each do |sub_item|
-                    - if sub_item.visible?(current_user)
-                      %li= link_to sub_item.name, sub_item.relative_url, :class=>('current' if current_item?(sub_item))
-              = yield :toolbar
-      #main
+      %nav
+        - if logged_in?
+          %ul.navigation
+            - nav_tabs.each do |tab|
+              - if tab.visible?(current_user)
+                = link_to (tab.first.relative_url if tab.first) do
+                  %li{class: ('current ' if current_tab?(tab)).to_s}
+                    = translate_with_default(tab.name)
+      - if @current_tab and @current_tab.size > 1
+        .toolbar
+          %ul.secondary_navigation
+            - @current_tab.each do |sub_item|
+              - if sub_item.visible?(current_user)
+                = link_to sub_item.relative_url, class: ('current' if current_item?(sub_item)) do
+                  %li= sub_item.name
+      %main
+        = yield :toolbar
         - if flash[:notice]
-          #notice
+          .notice
             %p= flash[:notice]
         - if flash[:error]
-          #error
+          .error
             %p= flash[:error]
-        #content
+        .content
           = find_and_preserve(yield)
 
       #popups

data/app/views/rad_social_mailer/social_mail_form.html.haml

@@ -1,40 +1,38 @@
 = stylesheet_link_tag('rad_social/rad_screen')
-= javascript_include_tag("https://www.google.com/recaptcha/api/js/recaptcha_ajax.js")
-= javascript_include_tag("rad_social/rad_email")
+= javascript_include_tag('rad_social/rad_email')
+= csrf_meta_tags
 
 .rad-dialog-titlebar
   %span.rad-dialog-title
     Email a Friend
 
-%form{:id=>'rad-social-email-form', :class=>"rad-email-form"}
+%form{:id=>'rad-social-email-form', :class=>'rad-email-form'}
   .rad-email-error
   %div.form-row
-    %label.form-label{:type=>"label", :for=>"from"}
+    %label.form-label{:type=>'label', :for=>'from'}
       From Email
     %div.form-fields
-      %input{:class => "input-textbox", :type => "text", :id => "rs-from", :name => "from", :size => 30, :maxlength => 35}
+      %input{:class => 'input-textbox', :type => 'text', :id => 'rs-from', :name => 'from', :size => 30, :maxlength => 35}
   %div.form-row
-    %label.form-label{:type=>"label", :for=>"from_name"}
+    %label.form-label{:type=>'label', :for=>'from_name'}
       From Name
     %div.form-fields
-      %input{:class => "input-textbox", :type => "text", :id => "rs-from_name", :name => "from_name", :size => 30, :maxlength => 35}
+      %input{:class => 'input-textbox', :type => 'text', :id => 'rs-from_name', :name => 'from_name', :size => 30, :maxlength => 35}
   %div.form-row
-    %label.form-label{:type=>"label", :for=>"to"}
+    %label.form-label{:type=>'label', :for=>'to'}
       To Email
     %div.form-fields
-      %input{:class => "input-textbox", :type => "text", :id => "rs-to", :name => "to", :size => 30, :maxlength => 35}
+      %input{:class => 'input-textbox', :type => 'text', :id => 'rs-to', :name => 'to', :size => 30, :maxlength => 35}
   %div.form-row
-    %label.form-label{:type=>"label", :for=>"message"}
+    %label.form-label{:type=>'label', :for=>'message'}
       Message
     %div.form-fields
-      %textarea{:class => "input-textbox", :id => "rs-message", :name => "message", :rows => 5, :cols => 40}
+      %textarea{:class => 'input-textbox', :id => 'rs-message', :name => 'message', :rows => 5, :cols => 40}
         = email_message
-  %input{:type=>"hidden", :name=>"subject", :value=> email_subject}
-  %input{:type=>"hidden", :id=>"rs-base-message", :value=> email_message}
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'
-  %input{:type=>"hidden", :name=>"submit_url", :value=> email_action_url}
-  %input.button.primary-button{:id => "rad_email_submit", :type=>:button ,:value=>"Submit"}
+  %input{:type=>'hidden', :name=>'subject', :value=> email_subject}
+  %input{:type=>'hidden', :id=>'rs-base-message', :value=> email_message}
+  %input{:type=>'hidden', :name=>'submit_url', :value=> email_action_url}
+  %input.button.primary-button{:id => 'rad_email_submit', :type=>:button ,:value=>'Submit'}
   .loader
 
 #rad-confirmation.hidden

data/app/views/widget/_email_form.html.haml

@@ -1,25 +1,20 @@
-- javascript("rad_social/captcha")
-
 = form_tag
-%form{:id=>'rad_social_email_form', :class=>"rad-email-form"}
-  %label{:for => "from"}
+%form{:id=>'rad_social_email_form', :class=>'rad-email-form'}
+  %label{:for => 'from'}
     Your Email:
-  %input{:class => "std_input", :type => "text", :id => "rs-from", :name => "from", :size => 40, :maxlength => 35}
-  %label{:for => "from_name"}
+  %input{:class => 'std_input', :type => 'text', :id => 'rs-from', :name => 'from', :size => 40, :maxlength => 35}
+  %label{:for => 'from_name'}
     Your Name:
-  %input{:class => "std_input", :type => "text", :id => "rs-from_name", :name => "from_name", :size => 40, :maxlength => 35}
-  %label{:for => "to"}
+  %input{:class => 'std_input', :type => 'text', :id => 'rs-from_name', :name => 'from_name', :size => 40, :maxlength => 35}
+  %label{:for => 'to'}
     To:
-  %input{:class => "std_input", :type => "text", :id => "rs-to", :name => "to", :size => 40, :maxlength => 35}
-  %label{:for => "subject"}
+  %input{:class => 'std_input', :type => 'text', :id => 'rs-to', :name => 'to', :size => 40, :maxlength => 35}
+  %label{:for => 'subject'}
     To:
-  %input{:class => "std_input", :type => "text", :id => "rs-subject", :name => "subject", :size => 40, :maxlength => 35}
-  %label{:for => "Message"}
+  %input{:class => 'std_input', :type => 'text', :id => 'rs-subject', :name => 'subject', :size => 40, :maxlength => 35}
+  %label{:for => 'Message'}
     Message:
-  %textarea{:id => "rs-message", :rows => 18, :cols => 40}
-  %input{:type=>"hidden", :name=>"submit_url", :value=>'contact/email'}
-  %input.button.primary-button{:id => "email_submit", :type=>:button ,:value=>"Submit"}
+  %textarea{:id => 'rs-message', :rows => 18, :cols => 40}
+  %input{:type=>'hidden', :name=>'submit_url', :value=>'contact/email'}
+  %input.button.primary-button{:id => 'email_submit', :type=>:button ,:value=>'Submit'}
   .loader
-
-  #recaptcha-container.captcha-container
-    = recaptcha_v3 action: 'emailSeats'

data/app/views/widget/_horizontal_widget.html.haml

@@ -1,5 +1,5 @@
 = stylesheet_link_tag('rad_social/rad_screen')
-= javascript_include_tag("rad_social/rad_widget", async: 'true')
+= javascript_include_tag('rad_social/rad_widget', async: 'true')
 - local_variables = defined?(locals) ? locals : local_assigns
 - url = local_variables[:url]
 - message = local_variables[:message]
@@ -9,10 +9,10 @@
 
 .rad-widget
   .rad-icon
-    %a{:class => "rad-popup-window rad-facebook", :href => "https://www.facebook.com/sharer/sharer.php?u=#{CGI::escape(url)}", :target=> "_blank"}
+    %a{:class => 'rad-popup-window rad-facebook', :href => "https://www.facebook.com/sharer/sharer.php?u=#{CGI::escape(url)}", :target=> '_blank'}
   .rad-icon
-    %a{:class => "rad-popup-window rad-twitter", :href => "https://twitter.com/intent/tweet?text=#{CGI::escape(message + " " + url)}", :target=> "_blank"}
+    %a{:class => 'rad-popup-window rad-twitter', :href => "https://twitter.com/intent/tweet?text=#{CGI::escape(message + " " + url)}", :target=> '_blank'}
   .rad-icon
-    %a{:class => "rad-popup-window rad-email", :href => rad_social_mail_form_url(:email_subject => email_subject, :email_message => email_message, :email_action_url => email_action_url)}
+    %a{:class => 'rad-popup-window rad-email', :href => rad_social_mail_form_url(:email_subject => email_subject, :email_message => email_message, :email_action_url => email_action_url)}
   .rad-icon
-    %a{:class => "rad-popup-window rad-gplus", :href => "https://plus.google.com/share?url=#{CGI::escape(url)}", :target=> "_blank"}
+    %a{:class => 'rad-popup-window rad-gplus', :href => "https://plus.google.com/share?url=#{CGI::escape(url)}", :target=> '_blank'}