tweak lead forms

sinfin · Nov 19, 2018 · ec2988b · ec2988b
1 parent 4de5e21
commit ec2988b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2018-11-19
+### Changed
+- Changed `Lead` - `skip_email_validation?` to public
+
 ## 2018-11-11
 ### Added
 - Added image `alt` and document `title` fields.

diff --git a/app/assets/stylesheets/folio/_loader.sass b/app/assets/stylesheets/folio/_loader.sass
@@ -1,6 +1,9 @@
 $folio-loader-background: rgba(255, 255, 255, 0.8) !default
 $folio-loader-foreground: black !default
 
+$folio-loader-inverse-background: rgba(0, 0, 0, 0.8) !default
+$folio-loader-inverse-foreground: white !default
+
 @keyframes load8
   0%
     transform: rotate(0deg)
@@ -48,3 +51,10 @@ $folio-loader-foreground: black !default
 
   &.folio-loader-transparent
     background-color: transparent
+
+  .folio-inversed-loader &
+    background: $folio-loader-inverse-background
+
+    &:before
+      border-color: rgba($folio-loader-inverse-foreground, 0.2)
+      border-left-color: $folio-loader-inverse-foreground
diff --git a/app/cells/folio/lead_form/show.slim b/app/cells/folio/lead_form/show.slim
@@ -14,17 +14,16 @@
           = f.input :name, label: t('.name')
 
     .row.folio-lead-form__email-phone-row
-      .col-sm
+      .col-sm.folio-lead-form__email-col
         = f.input :email, as: :email, label: t('.email')
 
-      .col-sm
+      .col-sm.folio-lead-form__phone-col
         = f.input :phone, label: t('.phone')
 
     .row.folio-lead-form__note-row
       .col-sm
         = f.input :note, label: note_label, \
-                         placeholder: t('.note_placeholder'), \
-                         input_html: { value: note, rows: 3 }
+                         input_html: { value: note, rows: note_rows }
 
     == options[:above_submit_content] if options[:above_submit_content].present?
 

diff --git a/app/cells/folio/lead_form_cell.rb b/app/cells/folio/lead_form_cell.rb
@@ -38,6 +38,11 @@ def message
       t('.message')
     end
 
+    def note_rows
+      return options[:note_rows] if options[:note_rows]
+      3
+    end
+
     def remember_option_keys
       LeadsController::REMEMBER_OPTION_KEYS
     end

diff --git a/app/controllers/folio/leads_controller.rb b/app/controllers/folio/leads_controller.rb
@@ -7,6 +7,7 @@ class LeadsController < ApplicationController
       :message,
       :name,
       :note_label,
+      :note_rows,
       :above_submit_content,
     ]
 

diff --git a/app/models/folio/lead.rb b/app/models/folio/lead.rb
@@ -61,11 +61,11 @@ def csv_attributes
       end
     end
 
-    private
+    def skip_email_validation?
+      false
+    end
 
-      def skip_email_validation?
-        false
-      end
+    private
 
       def skip_note_validation?
         false

diff --git a/app/views/folio/console/leads/show.slim b/app/views/folio/console/leads/show.slim
@@ -29,7 +29,10 @@ table.table
       td = Folio::Lead.human_attribute_name(:email)
       td
         - if @lead.email.present?
-          = mail_to(@lead.email, @lead.email)
+          - if @lead.skip_email_validation?
+            = @lead.email
+          - else
+            = mail_to(@lead.email, @lead.email)
         - else
           = t('.blank')
 

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -57,7 +57,6 @@ cs:
       phone: Telefon
       submit: Odeslat
       note: Zpráva
-      note_placeholder: ''
       message: Děkujeme za zaslání Vaší zprávy!
       failure: Zprávu se nepodařilo odeslat. Zkuste to prosíme později.