updates for app form

diff --git a/config/settings1.php b/config/settings1.php
index f2afda6..2d9ff05 100644 (file)
--- a/config/settings1.php
+++ b/config/settings1.php
@@ -72,8 +72,8 @@ $email = [
 $over_18 = [
     'type'  => 'radio',
     'name'  => 'over_18',
-    'label' => 'Are you 18 years or older?',
-    'grid' => 4,
+    'label' => 'Are you over the age of 18?',
+    'grid' => 5,
     'req'   => true,
     'opts'  => [[
         'name' => 'over_18_yes',
@@ -84,26 +84,11 @@ $over_18 = [
         'label' => 'No',
         'value' => 0]]
 ];
-$us_citizen = [
-    'type'  => 'radio',
-    'name'  => 'us_citizen',
-    'label' => 'Are you an U.S. citizen?',
-    'grid' => 4,
-    'req'   => true,
-    'opts'  => [[
-        'name' => 'us_citizen_yes',
-        'label' => 'Yes',
-        'value' => 1
-    ],[
-        'name' => 'us_citizen_no',
-        'label' => 'No',
-        'value' => 0]]
-];
 $us_auth = [
     'type'  => 'radio',
     'name'  => 'us_auth',
-    'label' => 'Are you authorized to work in the United States?',
-    'grid' => 4,
+    'label' => 'Can you prove that you are legal to work in the U.S.?',
+    'grid' => 7,
     'req'   => true,
     'opts'  => [[
         'name' => 'us_auth_yes',
@@ -117,7 +102,7 @@ $us_auth = [
 $employed_before = [
     'type'  => 'radio',
     'name'  => 'employed_before',
-    'label' => 'Have you been previously employed here?',
+    'label' => 'Have you ever worked for Stafford\'s?',
     'grid' => 6,
     'req'   => true,
     'opts'  => [[
@@ -129,49 +114,10 @@ $employed_before = [
         'label' => 'No',
         'value' => 0]]
 ];
-$employed_before_dates = [
-    'type'  => 'text',
-    'name'  => 'employed_before_dates',
-    'label' => 'If yes, date(s)',
-    'grid' => 6
-];
-$supervisor = [
-    'type'  => 'text',
-    'name'  => 'supervisor',
-    'label' => 'Supervisor Name(s)',
-    'grid' => 12
-];
-$applied_before = [
-    'type'  => 'radio',
-    'name'  => 'applied_before',
-    'label' => 'Have you ever applied to this Company before?',
-    'grid' => 6,
-    'req'   => true,
-    'opts'  => [[
-        'name' => 'applied_before_yes',
-        'label' => 'Yes',
-        'value' => 1
-    ],[
-        'name' => 'applied_before_no',
-        'label' => 'No',
-        'value' => 0]]
-];
-$applied_before_dates = [
-    'type'  => 'text',
-    'name'  => 'applied_before_dates',
-    'label' => 'Where?',
-    'grid' => 6
-];
-$applied_before_under_what_name = [
-    'type'  => 'text',
-    'name'  => 'applied_before_under_what_name',
-    'label' => 'Under what name?',
-    'grid' => 6
-];
-$applied_before_when = [
+$employed_which_property = [
     'type'  => 'text',
-    'name'  => 'applied_before_when',
-    'label' => 'When?',
+    'name'  => 'employed_which_property',
+    'label' => 'Which property?',
     'grid' => 6
 ];
 $list_any_friends = [
@@ -366,11 +312,8 @@ $form = [
     [$fname, $lname, $mname],
     [$street, $city, $state, $zip],
     [$phone, $altPhone, $email],
-    [$over_18, $us_citizen, $us_auth],
-    [$employed_before, $employed_before_dates],
-    [$supervisor],
-    [$applied_before, $applied_before_dates],
-    [$applied_before_under_what_name, $applied_before_when],
+    [$over_18, $us_auth],
+    [$employed_before, $employed_which_property],
     [$list_any_friends],
     [$have_drivers_license, $means_of_travel],
     [$drivers_license, $license_state],

diff --git a/controllers/admin.php b/controllers/admin.php
index ad9e9ca..a2f35e9 100644 (file)
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -7,7 +7,7 @@ defined('ABSPATH') or die();
  *
  * Controller for all of the admin functionality
  */
-class glm_employment_admin
+class staffords_employment_admin
 {
     /**
      * Plugin Directory Name
@@ -27,7 +27,7 @@ class glm_employment_admin
     {
         $this->pluginDirName = $path;
         $this->wpdb = $wpdb;
-        $jobs = new glm_employment_job($path);
+        $jobs = new staffords_employment_job($path);
         add_action('admin_menu', array($this, 'add_job_menus'));
     }
 

diff --git a/controllers/front.php b/controllers/front.php
index 2c11aaf..053e820 100644 (file)
--- a/controllers/front.php
+++ b/controllers/front.php
@@ -7,7 +7,7 @@ defined('ABSPATH') or die();
  *
  * Controller for all of the admin functionality
  */
-class glm_employment_front
+class staffords_employment_front
 {
     // class properties
     public $pluginDirName;
@@ -47,7 +47,7 @@ class glm_employment_front
         $this->pluginDirName = $path;
         $this->wpdb          = $wpdb;
         add_shortcode('glmjobs', array($this, 'staffords_jobs_shortcode'));
-        $jobs = new glm_employment_job($path);
+        $jobs = new staffords_employment_job($path);
         $this->set_form_state();
         $this->formTable = $wpdb->prefix . STAFFORDS_EMP_FORM_TABLE;
         $this->appTable  = $wpdb->prefix . STAFFORDS_EMP_APPLICATION_TABLE;

diff --git a/glm-employment.php b/glm-employment.php
index 36550d6..781860f 100644 (file)
--- a/glm-employment.php
+++ b/glm-employment.php
@@ -42,22 +42,22 @@ require_once 'models/database.php';
 /**
  * The Database class
  */
-$glm_member_db = new glm_employment_models_database($GLOBALS['wpdb']);
+$glm_member_db = new staffords_employment_models_database($GLOBALS['wpdb']);
 
 /**
  * Setup class to call in the Controllers
  */
-class glm_employment_setup
+class staffords_employment_setup
 {
     public function __construct()
     {
         if (is_admin()) {
-            $adminController = new glm_employment_admin(
+            $adminController = new staffords_employment_admin(
                 plugin_dir_path(__FILE__),
                 $GLOBALS['wpdb']
             );
         } else {
-            $frontController = new glm_employment_front(
+            $frontController = new staffords_employment_front(
                 plugin_dir_path(__FILE__),
                 $GLOBALS['wpdb']
             );
@@ -66,7 +66,7 @@ class glm_employment_setup
     }
 }
 
-$employmentApp = new glm_employment_setup();
+$employmentApp = new staffords_employment_setup();
 
 /**
  * Load style sheet for displaying the view and print for the application forms

diff --git a/models/database.php b/models/database.php
index 7cb4951..0bd8cee 100644 (file)
--- a/models/database.php
+++ b/models/database.php
@@ -27,7 +27,7 @@
  * @release   Release: (0.1)
  * @link      <>
  */
-class glm_employment_models_database
+class staffords_employment_models_database
 {
     public $wpdb;
     public $applicationTable;

diff --git a/models/job.php b/models/job.php
index f9f08da..9672593 100644 (file)
--- a/models/job.php
+++ b/models/job.php
@@ -4,7 +4,7 @@
  * Sets up the job post type and its taxonomies. Handles also the new fields in
  * the metaboxes.
  */
-class glm_employment_job
+class staffords_employment_job
 {
 
     public $pluginDirName;
@@ -207,7 +207,7 @@ class glm_employment_job
      */
     public function metaDates()
     {
-        add_meta_box('glm_employment_meta', 'Position Information',
+        add_meta_box('staffords_employment_meta', 'Position Information',
                      array($this, 'editJobMeta'), STAFFORDS_EMP_POST_TYPE);
     }