effective_classifieds 0.4.12 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a688220a935a6980554c621e35be675cc20e766ed739757817462e782d542d
-  data.tar.gz: b1cf7e9621ff79365d006f27102045466ad086362a925f45ea9772ebe9699690
+  metadata.gz: 0e0ef9d80b727dd2010987510e92ba800401209d898f2797d82ab2bd16054aa2
+  data.tar.gz: c19d09c1d221d9c48869b25cbb643bf4d5f59cc7ee7de3b04c3a4e51d6019ca9
 SHA512:
-  metadata.gz: ffbf9be19f33ccc8065cdbe50d0f3d06e85f545195501f623e3e90e44322f0901f989e0433654721a85ba0fe0104566cc4d6b04f8cfdbef38201d72424dd0e00
-  data.tar.gz: e71a5b0407e3a35599cbc42f618bf7111ae372139f7a942b349c2577b5120984b0b97c496e8e96e402bd5e21c19f0e77a75cf4c62f36a315d8faa15ff995166b
+  metadata.gz: d151d6779e798212ad62143da7ece3d75da8ebcdfcf8ad48a1946f841847028bd88e4e57d5486426aecbcb8a81606bd7c75d1063a53db13cafd2d81e87d3b986
+  data.tar.gz: 4b2fe777a078b329dc464dea6fa556887568d2a1db578499510fe6653e8176552c0198b5581949a2a052bb6ecfbff39364cd3e2e94a822d6f04d0fb801c513d5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/admin/classifieds_controller.rb

@@ -5,9 +5,6 @@ module Admin
 
     include Effective::CrudController
 
-    page_title(only: :index) { EffectiveClassifieds.classifieds_label }
-    page_title(only: :new) { "New #{EffectiveClassifieds.classifieds_label} Posting" }
-
     submit :save, 'Save'
     submit :save, 'Save and View', redirect: -> { effective_classifieds.classified_path(resource) }
     submit :approve, 'Approve'

data/app/controllers/effective/classifieds_controller.rb

@@ -2,7 +2,7 @@ module Effective
   class ClassifiedsController < ApplicationController
     include Effective::CrudController
 
-    page_title(only: :index) { EffectiveClassifieds.classifieds_label }
+    page_title(only: :index) { view_context.classifieds_name_label }
 
     def show
       @classified = resource_scope.find(params[:id])

data/app/datatables/admin/effective_classifieds_datatable.rb

@@ -49,7 +49,7 @@ module Admin
       col :purchased_order, visible: false
 
       actions_col do |classified|
-        dropdown_link_to('View Classified', effective_classifieds.classified_path(classified), target: '_blank')
+        dropdown_link_to("View #{classified_label}", effective_classifieds.classified_path(classified), target: '_blank')
       end
     end
 

data/app/datatables/effective_classified_wizards_datatable.rb

@@ -21,11 +21,16 @@ class EffectiveClassifiedWizardsDatatable < Effective::Datatable
     actions_col(actions: []) do |wizard|
       if wizard.draft?
         dropdown_link_to('Continue', effective_classifieds.classified_wizard_build_path(wizard, wizard.next_step), 'data-turbolinks' => false)
-      else
+      elsif wizard.classified.present?
+        dropdown_link_to('Show', effective_classifieds.classified_path(wizard.classified))
         dropdown_link_to('Edit', effective_classifieds.edit_classified_path(wizard.classified))
+        dropdown_link_to('Show Wizard', effective_classifieds.classified_wizard_path(wizard), 'data-turbolinks' => false)
+      end
+
+      if EffectiveResources.authorized?(self, :destroy, wizard)
+        dropdown_link_to('Delete', effective_classifieds.classified_wizard_path(wizard), 'data-confirm': "Really delete #{wizard}?", 'data-method': :delete)
       end
 
-      dropdown_link_to('Delete', effective_classifieds.classified_wizard_path(wizard), 'data-confirm': "Really delete #{wizard}?", 'data-method': :delete)
     end
   end
 

data/app/helpers/effective_classifieds_helper.rb

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

data/app/models/concerns/effective_classifieds_classified_wizard.rb

@@ -107,7 +107,7 @@ module EffectiveClassifiedsClassifiedWizard
 
   # Instance Methods
   def to_s
-    'posting submission'
+    model_name.human
   end
 
   def in_progress?

data/app/models/effective/classified.rb

@@ -147,7 +147,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'New Classified'
+      title.presence || model_name.human
     end
 
     def purchasable_name

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

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

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

@@ -5,25 +5,25 @@
   - datatable = EffectiveResources.best('EffectiveClassifiedWizardsDatatable').new(self, namespace: :effective)
 
   - if submission.present?
-    %h2 In-progress Postings
+    %h2 In-progress #{classifieds_label}
 
-    %p Your posting submission is incomplete:
+    %p Your submission is incomplete:
 
     %p
       Please
-      = link_to("Continue submission for #{submission.classified.presence || 'a classified'}", effective_classifieds.classified_wizard_build_path(submission, submission.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      = link_to("Continue submission", effective_classifieds.classified_wizard_build_path(submission, submission.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
       or you can
       = link_to('Abandon submission', effective_classifieds.classified_wizard_path(submission), 'data-confirm': "Really delete #{submission}?", 'data-method': :delete, class: 'btn btn-danger')
       to submit another.
 
     %hr
 
-  %h2= EffectiveClassifieds.classifieds_label
+  %h2= classifieds_label
 
   - if datatable.present?
     = render_simple_datatable(datatable)
   - else
-    %p You don't have any postings. When you do, we'll show them here.
+    %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 #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+    %p= link_to "Submit New #{classified_label}", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'

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

@@ -3,7 +3,7 @@
 %table.table.table-sm
   %tbody
     %tr
-      %th.border-0 Posting
+      %th.border-0= classified_label
       %td.border-0
 
         - if classified&.published?
@@ -13,13 +13,13 @@
 
     - if request.path.start_with?('/admin')
       %tr
-        %th Owner
+        %th Submitted by
         %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
+        %th Submitted by
         %td= classified_wizard.owner
 
     - if classified&.was_submitted?

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

@@ -6,7 +6,7 @@
       %p Welcome #{current_user}!
 
       %p
-        You can use this wizard to submit a new #{EffectiveClassifieds.classifieds_label} posting.
+        You can use this wizard to submit a new #{classified_label.downcase} for display on the #{classifieds_name_label}.
         Your progress will be saved as you move through the wizard.
         Once your posting is published you are able to come back and edit the details.
 

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

@@ -10,15 +10,17 @@
     - raise('expected a purchased classified submit_order') unless resource.submit_order&.purchased?
 
   .alert.alert-warning.mb-4
-    This posting was submitted on #{classified.submitted_at.strftime('%F')}.
+    This #{classified_label.downcase} was submitted on #{classified.submitted_at.strftime('%F')}.
 
   - unless classified.approved?
     .alert.alert-danger.mb-4
-      Your posting must still be approved before it will be displayed.
+      Your #{classified_label.downcase} must still be approved before it will be displayed.
 
-  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+  .mb-4= link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+
+  = card do
+    = render 'effective/classified_wizards/summary', classified_wizard: resource
 
-  = render 'effective/classified_wizards/summary', classified_wizard: resource
   = render 'effective/classified_wizards/classified_wizard', classified_wizard: resource
 
   - if resource.orders.present?

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

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

@@ -1,4 +1,4 @@
-%h2= EffectiveClassifieds.classifieds_label
+%h2= classifieds_name_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 postings. When there are, we'll show them here.
+  %p There are no active #{classifieds_label.downcase}. When there are, we'll show them here.
 
 %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, label: "#{EffectiveClassifieds.classifieds_label} Posting Title"
+= f.text_field :title
 = f.text_field :location
 
 - if f.object.persisted? || f.object.errors.include?(:slug)
@@ -11,7 +11,7 @@
 .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", hint: "The posting will be displayed starting 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.'
 
@@ -26,13 +26,13 @@
 - else
   = 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'
+= f.file_field :file, hint: 'Please attach a PDF'
 
 %h2.mt-5.mb-0 Contact Information
 %p
-  %small.text-muted Contact information will be displayed on the classified ad.
+  %small.text-muted Contact information will be displayed on the #{classifieds_name_label} ad.
 
-= f.text_field :organization, label: 'Company or Organization'
+= f.text_field :organization, hint: 'Organization or company name'
 = f.url_field :website
 = f.email_field :email
 = f.tel_field :phone

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

@@ -1,49 +1,2 @@
-%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
+= effective_table_with(classified, except: :slug) do |f|
+  = render('effective/classifieds/fields', f: f)

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

@@ -1,9 +1,9 @@
 = render 'layout' do
   .resource-buttons
-    = link_to "Submit New #{EffectiveClassifieds.classifieds_label} Posting", effective_classifieds.new_classified_wizard_path, class: 'btn btn-primary'
+    = link_to "Submit New #{et(Effective::Classified)}", 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 postings. When there are, we'll show them here.
+      %p There are no active #{etsd(Effective::Classified)}. When there are, we'll show them here.

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

@@ -1,7 +1,7 @@
 = render 'layout' do
   .effective-classified
     - unless @classified.published?
-      .alert.alert-warning.mb-4 This posting is not published.
+      .alert.alert-warning.mb-4 This #{etd(@classified)} is not published.
 
     .row
       .col-md-4

data/config/effective_classifieds.rb

@@ -12,9 +12,6 @@ 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/config/locales/effective_classifieds.en.yml

@@ -1,10 +1,9 @@
 en:
   effective_classifieds:
-    name: 'Effective Classifieds'
-    acronym: 'Classifieds'
+    name: 'Classifieds'
 
   activerecord:
     models:
       # These ones might be app level
-      app/classified_wizard: 'Classified Wizard'
-      effective/classified: 'Classified'
+      app/classified_wizard: 'Classified Posting Submission'
+      effective/classified: 'Classified Posting'

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.4.12'.freeze
+  VERSION = '0.5.0'.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, :classifieds_label
+      :classified_wizard_class_name
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Users submit classified ads for job openings and equipment sales
 email:
 - info@codeandeffect.com
@@ -263,7 +277,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