effective_classifieds 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aea0ae02dabe99cdca9471c23c158cdf007f31d7ae2fee4522103c2c3d678d7
-  data.tar.gz: 0f4272176f66730441f1fa4b46e6858dd784ae3b5c95ccd23ef001415f206dfd
+  metadata.gz: 7791ff5277633953b3d9d43f9cdf8521954411ef5eb00ece46e14386cff7b0f4
+  data.tar.gz: '083ed5e9866481fc5513262496053f5ba4f5ea3b597d7d5a7218035dd75ecda5'
 SHA512:
-  metadata.gz: f62c3c700c9701fe44c1a2fc9be24f458c2aff875c0f32509d26f367ed8ad30e78b52e7cfb735bb34c5a8fb22908f6c88e81b0858fd3c51c9cda5de8e2242305
-  data.tar.gz: 2eece6889e8473c8acbc3c23a74b924894e89db234845ba0574784da9f0b3f6748ffb6e51596ee877c4f0c44a0a624c6fbfc16c423d901c95e182d73a4ee75e3
+  metadata.gz: fe6fc5ad68ad34f5c34915a997b08cb8550d8245e254d25b8c2e0f121e88e58b7d9af2918e0f4207e98746ad0040e00268fb88772956453121a82d0eaec63c9b
+  data.tar.gz: d8503e3830fdedbf1b7ac6d01df2050c134ce23dd7fc5151462218572620fd02df1b8f754e9bc1b4e200c7640278a4a93ff1f3de1a599faa647a9c6a4ebf607c

data/app/controllers/effective/classifieds_controller.rb

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

data/app/datatables/effective_classifieds_datatable.rb

@@ -4,16 +4,15 @@ class EffectiveClassifiedsDatatable < Effective::Datatable
     length :all
     order :start_on
 
-    col :start_on, as: :date, label: 'Posted'
+    col :start_on, as: :date, label: 'Published'
+    col :end_on, as: :date, label: 'Closing'
 
     col :title do |classified|
       link_to classified, effective_classifieds.classified_path(classified)
     end
 
-    col :end_on, as: :date, label: 'Expires', visible: false
-
-    col :organization, visible: false
-    col :location, visible: false
+    col :organization
+    col :location
 
     col :body, visible: false
     col :website, visible: false

data/app/models/concerns/effective_classifieds_classified_wizard.rb

@@ -28,7 +28,7 @@ module EffectiveClassifiedsClassifiedWizard
 
     acts_as_wizard(
       start: 'Start',
-      classified: 'Classified',
+      classified: 'Posting',
       summary: 'Review',
       billing: 'Billing Address',
       checkout: 'Checkout',
@@ -107,7 +107,7 @@ module EffectiveClassifiedsClassifiedWizard
 
   # Instance Methods
   def to_s
-    'classified ad submission'
+    'posting submission'
   end
 
   def in_progress?

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

@@ -1,5 +1,5 @@
 = tabs do
-  = tab 'Classified' do
+  = tab 'Posting' do
     = render 'admin/classifieds/form_classified', classified: classified
 
   - if classified.persisted?

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

@@ -1,10 +1,10 @@
 = effective_form_with(model: classified, url: classified.persisted? ? effective_classifieds.admin_classified_path(classified.id) : effective_classifieds.admin_classifieds_path) do |f|
-  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this classified', hint: 'Sign up is required to register for any classified'
+  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view', hint: 'Sign up is required to register for any classified'
 
   - if EffectiveClassifieds.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object)
 
   %p.text-hint
-    * leave blank for a regular public classified that anyone can view
+    * Do not select a role to allow anyone with an account to view
 
   = f.submit

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

@@ -7,4 +7,4 @@
         = link_to('Edit', wizard_path(:classified)) if edit_effective_wizard?
 
     - classified = classified_wizard.classified
-    = render 'effective/classifieds/classified', classified: classified
+    = render 'effective/classifieds/summary', classified: classified

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

@@ -5,10 +5,9 @@
   - datatable = EffectiveResources.best('EffectiveClassifiedWizardsDatatable').new(self, namespace: :effective)
 
   - if submission.present?
-    %h2 In-progress Classified Ads
+    %h2 In-progress Postings
 
-    %p
-      Your submission for #{submission.classified.presence || 'a classified'} is incomplete.
+    %p Your posting submission is incomplete:
 
     %p
       Please
@@ -19,12 +18,12 @@
 
     %hr
 
-  %h2 Classified Ads
+  %h2= EffectiveClassifieds.classifieds_label
 
   - if datatable.present?
     = render_simple_datatable(datatable)
   - else
-    %p You don't have any classified ads. When you do, we'll show them here.
+    %p You don't have any postings. When you do, we'll show them here.
 
   - if submission.blank?
-    %p= link_to 'Submit New Classified Ad', effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+    %p= link_to "Submit New #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'

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

@@ -1,3 +1,3 @@
 .row
   .col-lg-3.mb-3= render_wizard_sidebar(resource)
-  .col-lg-9= yield
+  .col-lg-9.pb-3= yield

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

@@ -1,30 +1,29 @@
-= card('Classified Ad') do
-  - classified = classified_wizard.classified
+- classified = classified_wizard.classified
 
-  %table.table.table-sm
-    %tbody
-      %tr
-        %th.border-0 Classified
-        %td.border-0
+%table.table.table-sm
+  %tbody
+    %tr
+      %th.border-0 Posting
+      %td.border-0
 
-          - if classified&.published?
-            = link_to(classified, effective_classifieds.classified_path(classified), target: '_blank')
-          - else
-            = classified.presence || 'Classified was deleted'
+        - if classified&.published?
+          = link_to(classified, effective_classifieds.classified_path(classified), target: '_blank')
+        - else
+          = classified.presence || 'Posting was deleted'
 
-      - if request.path.start_with?('/admin')
-        %tr
-          %th Owner
-          %td
-            - url = (polymorphic_admin_path(classified_wizard.owner) rescue "/admin/users/#{classified_wizard.owner.to_param}/edit")
-            = link_to(classified_wizard.owner, url)
-      - else
-        %tr
-          %th Owner
-          %td= classified_wizard.owner
+    - if request.path.start_with?('/admin')
+      %tr
+        %th Owner
+        %td
+          - url = (polymorphic_admin_path(classified_wizard.owner) rescue "/admin/users/#{classified_wizard.owner.to_param}/edit")
+          = link_to(classified_wizard.owner, url)
+    - else
+      %tr
+        %th Owner
+        %td= classified_wizard.owner
 
-      - if classified&.was_submitted?
-        %tr
-          %th Status
-          %td
-            %span.badge.badge-secondary= classified.status
+    - if classified&.was_submitted?
+      %tr
+        %th Status
+        %td
+          %span.badge.badge-secondary= classified.status

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 classifieds require a fee and we ask for a billing address for future use
+      %p.text-muted * Not all postings require a fee and we ask for a billing address for future use.
 
       = f.save 'Save and Continue'

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

@@ -3,13 +3,12 @@
 
   .card
     .card-body
-      %p
-        Welcome #{current_user}!
+      %p Welcome #{current_user}!
 
       %p
-        You can use this wizard to post a new classified ad.
+        You can use this wizard to submit a new #{EffectiveClassifieds.classifieds_label} posting.
         Your progress will be saved as you move through the wizard.
-        Once the ad published you will be able to come back and edit/change the details.
+        Once your posting is published you are able to come back and edit the details.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id

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

@@ -10,11 +10,11 @@
     - raise('expected a purchased classified submit_order') unless resource.submit_order&.purchased?
 
   .alert.alert-warning.mb-4
-    This classified was submitted on #{classified.submitted_at.strftime('%F')}.
+    This posting was submitted on #{classified.submitted_at.strftime('%F')}.
 
   - unless classified.approved?
-    = card do
-      %p Your classified must still be approved before it will be displayed.
+    .alert.alert-danger.mb-4
+      Your posting must still be approved before it will be displayed.
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 

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 Ad', class: 'btn btn-primary'
+    = f.submit "Submit #{EffectiveClassifieds.classifieds_label} Posting", class: 'btn btn-primary'

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

@@ -1,51 +1,49 @@
-.card
-  .card-body
-    %table.table.effective-classified-table
-      %tbody
-        %tr
-          %th Category
-          %td= classified.category
-
-        %tr
-          %th Title
-          %td= classified.title
-
-        %tr
-          %th Available
-          %td
-            #{classified.start_on&.strftime('%F')}
-            to
-            #{classified.end_on&.strftime('%F')}
-
-        - if classified.location.present?
-          %tr
-            %th Location
-            %td= classified.location
-
-        %tr
-          %th Description
-          %td= classified.body.to_s
-
-        - if classified.file.attached?
-          %tr
-            %th Attachment
-            %td= link_to(classified.file.filename, main_app.url_for(classified.file), target: '_blank')
-
-        %tr
-          %th Company
-          %td= classified.organization
-
-        - if classified.website.present?
-          %tr
-            %th Website
-            %td= link_to(classified.website, classified.website, target: '_blank')
-
-        - if classified.email.present?
-          %tr
-            %th Email
-            %td= mail_to(classified.email)
-
-        - if classified.phone.present?
-          %tr
-            %th Phone
-            %td= classified.phone
+%table.table.effective-classified-table
+  %tbody
+    %tr
+      %th Category
+      %td= classified.category
+
+    %tr
+      %th Title
+      %td= classified.title
+
+    %tr
+      %th Available
+      %td
+        #{classified.start_on&.strftime('%F')}
+        to
+        #{classified.end_on&.strftime('%F')}
+
+    - if classified.location.present?
+      %tr
+        %th Location
+        %td= classified.location
+
+    %tr
+      %th Description
+      %td= classified.body.to_s
+
+    - if classified.file.attached?
+      %tr
+        %th Attachment
+        %td= link_to(classified.file.filename, main_app.url_for(classified.file), target: '_blank')
+
+    %tr
+      %th Company
+      %td= classified.organization
+
+    - if classified.website.present?
+      %tr
+        %th Website
+        %td= link_to(classified.website, classified.website, target: '_blank')
+
+    - if classified.email.present?
+      %tr
+        %th Email
+        %td= mail_to(classified.email)
+
+    - if classified.phone.present?
+      %tr
+        %th Phone
+        %td= classified.phone

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

@@ -1,4 +1,4 @@
-%h2 Classifieds
+%h2= EffectiveClassifieds.classifieds_label
 
 - published = Effective::Classified.classifieds(user: current_user).count
 
@@ -6,6 +6,6 @@
   - datatable = EffectiveClassifiedsDatatable.new(self, namespace: :effective)
   = render_datatable(datatable, simple: true)
 - else
-  %p There are no active classified ads. When there are, we'll show them here.
+  %p There are no active postings. When there are, we'll show them here.
 
-%p= link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'
+%p= link_to 'View All', effective_classifieds.classifieds_path, class: 'btn btn-primary'

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

@@ -1,5 +1,5 @@
 = f.select :category, EffectiveClassifieds.categories, required: true
-= f.text_field :title
+= f.text_field :title, label: "#{EffectiveClassifieds.classifieds_label} Posting Title"
 = f.text_field :location
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
@@ -11,20 +11,20 @@
 .row
   .col-lg-6
     = f.date_field :start_on, label: "Start",
-      hint: 'The classified ad will be displayed starting after this date.',
+      hint: 'The posting will be displayed starting after this date.',
       input_js: { minDate: minDate.strftime('%F') }
 
   .col-lg-6
     = f.date_field :end_on, label: "Expire",
-      hint: 'The classified ad will no longer be displayed after this date.'
+      hint: 'The posting will no longer be displayed after this date.'
 
 - if f.object.persisted? && !f.object.draft?
-  = f.check_box :archived, label: 'Yes, this classified is archived and will not be displayed'
+  = f.check_box :archived, label: 'Yes, this posting is archived. It will not be displayed.'
 
 - if defined?(EffectiveArticleEditor)
-  = f.article_editor :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+  = f.article_editor :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information!'
 - else
-  = f.rich_text_area :body, label: 'Body content', hint: 'The main body content of your classified ad. Be sure to include all relevant information!'
+  = f.rich_text_area :body, label: 'Description', hint: 'The content of your posting. Be sure to include all relevant information!'
 
 = f.file_field :file, label: 'Attach PDF'
 

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

@@ -0,0 +1,2 @@
+.effective-classifieds
+  = yield

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

@@ -0,0 +1,49 @@
+%table.table.effective-classified-table
+  %tbody
+    %tr
+      %th Category
+      %td= classified.category
+
+    %tr
+      %th Title
+      %td= classified.title
+
+    %tr
+      %th Available
+      %td
+        #{classified.start_on&.strftime('%F')}
+        to
+        #{classified.end_on&.strftime('%F')}
+
+    - if classified.location.present?
+      %tr
+        %th Location
+        %td= classified.location
+
+    %tr
+      %th Description
+      %td= classified.body.to_s
+
+    - if classified.file.attached?
+      %tr
+        %th Attachment
+        %td= link_to(classified.file.filename, main_app.url_for(classified.file), target: '_blank')
+
+    %tr
+      %th Company
+      %td= classified.organization
+
+    - if classified.website.present?
+      %tr
+        %th Website
+        %td= link_to(classified.website, classified.website, target: '_blank')
+
+    - if classified.email.present?
+      %tr
+        %th Email
+        %td= mail_to(classified.email)
+
+    - if classified.phone.present?
+      %tr
+        %th Phone
+        %td= classified.phone

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

@@ -1,8 +1,9 @@
-.resource-buttons
-  = link_to 'Submit New Classified Ad', effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+= render 'layout' do
+  .resource-buttons
+    = link_to "Submit New #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
 
-= card do
-  - if @datatable.present?(self)
-    = render_datatable(@datatable, simple: true)
-  - else
-    %p There are no active classified ads. When there are, we'll show them here.
+  = card do
+    - if @datatable.present?(self)
+      = render_datatable(@datatable, simple: true)
+    - else
+      %p There are no active postings. When there are, we'll show them here.

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

@@ -1,8 +1,8 @@
 .effective-classified
   - unless @classified.published?
-    .alert.alert-warning.mb-4 This classified is currently unavailable.
+    .alert.alert-warning.mb-4 This posting is currently unavailable.
 
   = render 'effective/classifieds/classified', classified: @classified
 
   .resource-buttons.text-left
-    = link_to 'View All Classifieds', effective_classifieds.classifieds_path, class: 'btn btn-primary'
+    = link_to 'View All', effective_classifieds.classifieds_path, class: 'btn btn-primary'

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

@@ -1,9 +1,9 @@
 %p Hello Admin!
 
 - if @classified.published?
-  %p The following classified ad has been submitted and is published online:
+  %p The following posting has been submitted and is published online:
 - else
-  %p The following classified ad has been submitted and is awaiting your approval:
+  %p The following posting has been submitted and is awaiting your approval:
 
 %hr
 
@@ -13,8 +13,8 @@
 %hr
 
 - unless @classified.approved?
-  %p= link_to('Approve Classified Ad', effective_classifieds.edit_admin_classified_path(@classified))
+  %p= link_to('Approve Posting', effective_classifieds.edit_admin_classified_path(@classified))
 
-%p= link_to('View Classified Ad', effective_classifieds.classified_path(@classified))
+%p= link_to('View Posting', effective_classifieds.classified_path(@classified))
 
 %p Have a great day!

data/config/effective_classifieds.rb

@@ -12,6 +12,9 @@ EffectiveClassifieds.setup do |config|
   # Classified Settings
   # config.classified_wizard_class_name = 'Effective::ClassifiedWizard'
 
+  # Page title like Classifieds or Job Board
+  config.classifieds_label = 'Classifieds'
+
   # Pagination length on the Classified#index page
   config.per_page = :all
 

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/effective_classifieds.rb

@@ -10,7 +10,7 @@ module EffectiveClassifieds
       :classifieds_table_name, :classified_wizards_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :categories, :per_page, :use_effective_roles, :max_duration, :auto_approve,
-      :classified_wizard_class_name
+      :classified_wizard_class_name, :classifieds_label
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -227,6 +227,8 @@ files:
 - app/views/effective/classifieds/_dashboard.html.haml
 - app/views/effective/classifieds/_fields.html.haml
 - app/views/effective/classifieds/_form.html.haml
+- app/views/effective/classifieds/_layout.html.haml
+- app/views/effective/classifieds/_summary.html.haml
 - app/views/effective/classifieds/edit.html.haml
 - app/views/effective/classifieds/index.html.haml
 - app/views/effective/classifieds/show.html.haml
@@ -260,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Users submit classified ads for job openings and equipment sales