effective_classifieds 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fc07e4c951edd63780e49029746786add1983892bc513e9c5e74dec61355fae
-  data.tar.gz: 985b7ff1866e71415cca8f4d46ca9fcca8dde0073ecc21ecd1293d6eb70ca9e1
+  metadata.gz: '09276ebf0a343cc31aaf14e9c5ce96c02da8a9f11de345f292abfc10a0df642b'
+  data.tar.gz: 47d861d8fedb6c9d69d02bbe7885da7202419696626c1d5fc3f9dd8329a6c5d8
 SHA512:
-  metadata.gz: d9e5eea7dd4e285be7a81026fae9ef9e5376db94f18f713f3aa824f1463bbddb0cedcd1ba34176e735976c9542e80b419858a9a673b327e56ff408a2de7ea7d1
-  data.tar.gz: b90ca02dc0cb7e60c007d111a0e3c135ca17005fa9220c4f8cf786c1de182f009bf2743779585629d42be457b94c3b228f8634ac2d1e5ae4a2455ec2c955a932
+  metadata.gz: d9c4ae1fd02205ae2070eedfa0413cb24b4623e88828bf66ce7cd97a2e7bb6c55e00b62a5f40fd1d26d3bb76b23654c20b094bd135087d494e38f6c8c10ddf64
+  data.tar.gz: 8451614768b018a315e00ccf08799e950f0e8f9f70e1dc2d7f7d21045c013ebe97371ac85d35616418e69b9fe18d9de66ba2c5829157fe7c8e070c0d1a4afeae

data/app/controllers/effective/classifieds_controller.rb

@@ -22,8 +22,8 @@ module Effective
       if EffectiveResources.authorized?(self, :admin, :effective_classifieds)
         flash.now[:warning] = [
           'Hi Admin!',
-          ('You are viewing a hidden posting.' unless @classified.published?),
-          ("<a href='#{effective_classifieds.edit_admin_classified_path(@classified)}' class='alert-link'>Click here to edit settings</a>.")
+          ("You are viewing a hidden #{view_context.classified_label.downcase}." unless @classified.published?),
+          ("<a href='#{effective_classifieds.edit_admin_classified_path(@classified)}' class='alert-link'>Edit this #{view_context.classified_label.downcase}</a>.")
         ].compact.join(' ')
       end
 

data/app/datatables/admin/effective_classified_wizards_datatable.rb

@@ -11,6 +11,7 @@ class Admin::EffectiveClassifiedWizardsDatatable < Effective::Datatable
 
     col :classified, search: :string
     col :owner
+    col :user, visible: false
 
     col :orders
 

data/app/helpers/effective_classifieds_helper.rb

@@ -5,12 +5,12 @@ module EffectiveClassifiedsHelper
     et('effective_classifieds.name')
   end
 
-  # Job Board Posting or Classified Posting
+  # Job or Classified
   def classified_label
     et(Effective::Classified)
   end
 
-  # Job Board Postings or Classified Postings
+  # Jobs or Classifieds
   def classifieds_label
     ets(Effective::Classified)
   end

data/app/models/concerns/effective_classifieds_classified_wizard.rb

@@ -28,7 +28,7 @@ module EffectiveClassifiedsClassifiedWizard
 
     acts_as_wizard(
       start: 'Start',
-      classified: 'Posting',
+      classified: I18n.t('activerecord.models.effective/classified') + ' Details',
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',

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

@@ -3,16 +3,21 @@
     = render 'admin/classifieds/form_classified', classified: classified
 
   - if classified.persisted?
+    - if classified.classified_wizard.present?
+      = tab(et(EffectiveClassifieds.ClassifiedWizard)) do
+        = card('Wizard') do
+          = render('effective/classified_wizards/summary', classified_wizard: classified.classified_wizard)
 
-    = tab 'Access' do
-      = render '/admin/classifieds/form_access', classified: classified
+        = render('effective/classified_wizards/classified_wizard', classified_wizard: classified.classified_wizard)
 
-    - if classified.classified_wizard.present?
       = tab 'Orders' do
         %h2 Orders
         - datatable = Admin::EffectiveOrdersDatatable.new(parent: classified.classified_wizard, owner: classified.owner, user: classified.owner, total: false)
         = render_datatable(datatable, simple: true)
 
+    = tab 'Access' do
+      = render '/admin/classifieds/form_access', classified: classified
+
     - if classified.class.respond_to?(:acts_as_trackable?)
       = tab 'Tracks' do
         - datatable = Admin::EffectiveTracksDatatable.new(owner: classified)

data/app/views/effective/classified_wizards/_dashboard.html.haml

@@ -26,4 +26,4 @@
     %p You don't have any #{classifieds_label.downcase}. When you do, we'll show them here.
 
   - if submission.blank?
-    %p= link_to "Submit New #{classified_label}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+    %p= link_to "Post a #{classified_label}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'

data/app/views/effective/classified_wizards/_summary.html.haml

@@ -9,7 +9,7 @@
         - if classified&.published?
           = link_to(classified, effective_classifieds.classified_path(classified), target: '_blank')
         - else
-          = classified.presence || 'Posting was deleted'
+          = classified.presence || "#{classified_label} was deleted"
 
     - if request.path.start_with?('/admin')
       %tr

data/app/views/effective/classified_wizards/billing.html.haml

@@ -10,6 +10,6 @@
       = f.fields_for(:owner, f.object.owner) do |fo|
         = effective_address_fields(fo, :billing)
 
-      %p.text-muted * Not all postings require a fee and we ask for a billing address for future use.
+      %p.text-muted * Not all #{classified_label} require a fee. We ask for your billing address for future use.
 
       = f.save 'Save and Continue'

data/app/views/effective/classified_wizards/summary.html.haml

@@ -5,4 +5,4 @@
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.submit "Submit #{classified_label}", class: 'btn btn-primary'
+    = f.submit "Save and Continue", class: 'btn btn-primary'

data/app/views/effective/classifieds/_classified.html.haml

@@ -1,8 +1,9 @@
 %tr
-  %td.col-date= classified.start_on&.strftime("%b %d, %Y")
-  %td.col-date.d-none.d-md-table-cell= classified.end_on&.strftime("%b %d, %Y")
+  %td.col-date.text-right= classified.start_on&.strftime("%b %e, %Y")
   %td
     %strong= link_to classified.title, effective_classifieds.classified_path(classified)
     .text-muted= classified.organization
+    .d-block.d-md-none= classified.location
 
   %td.d-none.d-md-table-cell= classified.location
+  -# %td.col-date.d-none.d-md-table-cell.text-right= classified.end_on&.strftime("%b %e, %Y")

data/app/views/effective/classifieds/_fields.html.haml

@@ -1,7 +1,7 @@
 = f.select :category, EffectiveClassifieds.categories, required: true, include_blank: false
-= f.text_field :title
-= f.text_field :organization, hint: 'Organization or company name'
-= f.text_field :location
+= f.text_field :title, label: "#{classified_label} title"
+= f.text_field :location, label: "#{classified_label} location"
+= f.text_field :organization
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
   - current_url = (effective_classifieds.classified_url(f.object) rescue nil)
@@ -12,26 +12,25 @@
 .row
   .col-lg-6
     - if f.object.new_record?
-      = f.date_field :start_on, label: "Start", hint: "The posting will be displayed starting after this date.", input_js: { minDate: minDate.strftime('%F') }
+      = f.date_field :start_on, label: "Start date", hint: "If approved, this #{classified_label.downcase} will be displayed on the #{classifieds_name_label.downcase} after this date.", input_js: { minDate: minDate.strftime('%F') }
     - else
-      = f.date_field :start_on, label: "Start", hint: 'The posting will be displayed starting after this date.'
+      = f.date_field :start_on, label: "Start date", hint: "The #{classified_label.downcase} will be displayed starting after this date."
 
   .col-lg-6
-    = f.date_field :end_on, label: "Expire", hint: "The posting will no longer be displayed after this date. Please enter a date within #{f.object.end_on_distance} of start date"
+    = f.date_field :end_on, label: "Close date", hint: "The #{classified_label.downcase} will no longer be displayed on the #{classifieds_name_label.downcase} after this date. Please enter a date within #{f.object.end_on_distance} of the start date."
 
-- if f.object.persisted? && !f.object.draft?
-  = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'
+-# - if f.object.persisted? && !f.object.draft?
+-#   = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'
 
 - if defined?(EffectiveArticleEditor)
-  = f.article_editor :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information.'
+  = f.article_editor :body, label: 'Description', hint: "The #{classified_label.downcase} description - be sure to include all relevant information!"
 - else
-  = f.rich_text_area :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information.'
+  = f.rich_text_area :body, label: 'Description', hint: "The #{classified_label.downcase} description. Be sure to include all relevant information."
 
-= f.file_field :file, hint: 'Optionally attach a PDF for this posting'
+= f.file_field :file, label: "Attach a PDF for download. Optional."
 
-%h2.mt-5.mb-0 Contact Information
-%p
-  %small.text-muted The following contact information is not displayed to the public and is only used by staff to provide support.
+%h3.mt-5 Contact Information
+%p.text-muted These details <strong>are not</strong> displayed on the #{classifieds_name_label}. They may be used by staff for administration and support. Please ensure the above #{classified_label.downcase} description includes relavent contact information.
 
 = f.text_field :contact_name
 = f.url_field :website

data/app/views/effective/classifieds/_layout.html.haml

@@ -1,2 +1,2 @@
-.effective-classifieds
+.effective-classifieds.mb-3
   = yield

data/app/views/effective/classifieds/index.html.haml

@@ -1,21 +1,24 @@
 = render 'layout' do
-  .resource-buttons
-    = link_to "Submit New #{et(Effective::Classified)}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+  .row
+    .col
+      %h1.effective-title.mb-4= @page_title
+
+    .col-auto.text-right
+      = link_to "Post a #{classified_label}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
 
   - if @classifieds.present?
     .table-responsive
-      %table.table.table-striped.table-hover
-        %tr
-          %th.col-date Published
-          %th.col-date.d-none.d-md-table-cell Closing
-          %th Title
-          %th.d-none.d-md-table-cell Location
-
-        = render @classifieds
+      %table.table.table-striped
+        %thead
+          %tr
+            %th.col-date.text-right Posted
+            %th Title
+            %th.d-none.d-md-table-cell Location
+            -# %th.col-date.d-none.d-md-table-cell.text-right Closing
 
-    .resource-buttons
-      = link_to "Submit New #{et(Effective::Classified)}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+        %tbody
+          = render @classifieds
 
   - else
-    = card class: 'mt-5' do
-      %p.text-center There are no active #{etsd(Effective::Classified)}. When there are, we'll show them here.
+    .alert.alert-warning.mb-3
+      There are no active #{classifieds_label.downcase}.

data/app/views/effective/classifieds/show.html.haml

@@ -1,46 +1,36 @@
 = render 'layout' do
   .effective-classified
     - unless @classified.published?
-      .alert.alert-warning.mb-4 This #{etd(@classified)} is not published.
+      .alert.alert-warning.mb-4 This #{classified_label} is not published.
 
+    %h1.effective-title.mb-4= @page_title
 
-    .resource-buttons
-      = link_to "Return to  #{classifieds_name_label}", effective_classifieds.classifieds_path, class: 'btn btn-secondary'
+    .row
+      .col-md
+        %table.table.table-striped.effective-table-summary
+          %tr
+            %th Company
+            %td= @classified.organization
 
-    = card do
-      .row
-        .col-md
-          %table.table.table-striped.table-hover.effective-table-summary
-            %tr
-              %th Position
-              %td= @classified.title
+            - if @classified.location.present?
+              %tr
+                %th Location
+                %td= @classified.location
 
-            %tr
-              %th Company
-              %td= @classified.organization
+          %tr
+            %th Posted
+            %td #{@classified.start_on&.strftime("%b %d, %Y")}
 
-              - if @classified.location.present?
-                %tr
-                  %th Location
-                  %td= @classified.location
+          %tr
+            %th Closing
+            %td #{@classified.end_on&.strftime("%b %d, %Y")}
 
-        .col-md
-          %table.table.table-striped.table-hover.effective-table-summary
+          - if @classified.file.attached?
             %tr
-              %th Published
-              %td #{@classified.start_on&.strftime("%b %d, %Y")}
-
-            %tr
-              %th Closing
-              %td #{@classified.end_on&.strftime("%b %d, %Y")}
-
-            - if @classified.file.attached?
-              %tr
-                %th Attachment
-                %td= link_to(@classified.file.filename, main_app.url_for(@classified.file), target: '_blank')
+              %th Attachment
+              %td= link_to(@classified.file.filename, main_app.url_for(@classified.file), target: '_blank')
 
     .body.mt-4
       = @classified.body.to_s
 
-    .resource-buttons.mt-5.mb-4
-      = link_to "Return to  #{classifieds_name_label}", effective_classifieds.classifieds_path, class: 'btn btn-secondary'
+    = link_to "← #{classifieds_name_label}".html_safe, effective_classifieds.classifieds_path, class: 'btn btn-secondary my-4'

data/app/views/effective/classifieds_mailer/classified_submitted.html.haml

@@ -1,20 +1,20 @@
 %p Hello Admin!
 
 - if @classified.published?
-  %p The following posting has been submitted and is published online:
+  %p The following has been submitted and is published online:
 - else
-  %p The following posting has been submitted and is awaiting your approval:
+  %p The following has been submitted and is awaiting your approval:
 
 %hr
 
 = render('effective/classifieds/classified', classified: @classified) do
-  %p= @classified.body
+  %div= @classified.body
 
 %hr
 
 - unless @classified.approved?
-  %p= link_to('Approve Posting', effective_classifieds.edit_admin_classified_path(@classified))
+  %p= link_to("Approve", effective_classifieds.edit_admin_classified_path(@classified))
 
-%p= link_to('View Posting', effective_classifieds.classified_path(@classified))
+%p= link_to("View", effective_classifieds.classified_path(@classified))
 
 %p Have a great day!

data/config/locales/effective_classifieds.en.yml

@@ -5,5 +5,5 @@ en:
   activerecord:
     models:
       # These ones might be app level
-      app/classified_wizard: 'Classified Posting Submission'
-      effective/classified: 'Classified Posting'
+      app/classified_wizard: 'Classified Submission'
+      effective/classified: 'Classified'

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails