From 1c5e0314feb6e80b85976b8a19d99f165f77ea2f Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 21:27:29 +0200 Subject: [PATCH 1/7] moved *.js into js folder --- {modules => js}/activity/validator.js | 0 {modules => js}/calendar/Calendar.js | 0 {modules => js}/calendar/CalendarUI.js | 0 {modules => js}/calendar/validator.js | 0 {modules => js}/candidates/activityvalidator.js | 0 {modules => js}/candidates/quickAction-candidates.js | 0 {modules => js}/candidates/validator.js | 0 {modules => js}/companies/validator.js | 0 {modules => js}/contacts/validator.js | 0 {modules => js}/import/import.js | 0 {modules => js}/joborders/validator.js | 0 {modules => js}/login/validator.js | 0 {modules => js}/settings/Settings.js | 0 {modules => js}/settings/validator.js | 0 {modules => js}/tests/validator.js | 0 {modules => js}/toolbar/toolbarlibForLegacy.js | 0 {modules => js}/wizard/wizard.js | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename {modules => js}/activity/validator.js (100%) rename {modules => js}/calendar/Calendar.js (100%) rename {modules => js}/calendar/CalendarUI.js (100%) rename {modules => js}/calendar/validator.js (100%) rename {modules => js}/candidates/activityvalidator.js (100%) rename {modules => js}/candidates/quickAction-candidates.js (100%) rename {modules => js}/candidates/validator.js (100%) rename {modules => js}/companies/validator.js (100%) rename {modules => js}/contacts/validator.js (100%) rename {modules => js}/import/import.js (100%) rename {modules => js}/joborders/validator.js (100%) rename {modules => js}/login/validator.js (100%) rename {modules => js}/settings/Settings.js (100%) rename {modules => js}/settings/validator.js (100%) rename {modules => js}/tests/validator.js (100%) rename {modules => js}/toolbar/toolbarlibForLegacy.js (100%) rename {modules => js}/wizard/wizard.js (100%) diff --git a/modules/activity/validator.js b/js/activity/validator.js similarity index 100% rename from modules/activity/validator.js rename to js/activity/validator.js diff --git a/modules/calendar/Calendar.js b/js/calendar/Calendar.js similarity index 100% rename from modules/calendar/Calendar.js rename to js/calendar/Calendar.js diff --git a/modules/calendar/CalendarUI.js b/js/calendar/CalendarUI.js similarity index 100% rename from modules/calendar/CalendarUI.js rename to js/calendar/CalendarUI.js diff --git a/modules/calendar/validator.js b/js/calendar/validator.js similarity index 100% rename from modules/calendar/validator.js rename to js/calendar/validator.js diff --git a/modules/candidates/activityvalidator.js b/js/candidates/activityvalidator.js similarity index 100% rename from modules/candidates/activityvalidator.js rename to js/candidates/activityvalidator.js diff --git a/modules/candidates/quickAction-candidates.js b/js/candidates/quickAction-candidates.js similarity index 100% rename from modules/candidates/quickAction-candidates.js rename to js/candidates/quickAction-candidates.js diff --git a/modules/candidates/validator.js b/js/candidates/validator.js similarity index 100% rename from modules/candidates/validator.js rename to js/candidates/validator.js diff --git a/modules/companies/validator.js b/js/companies/validator.js similarity index 100% rename from modules/companies/validator.js rename to js/companies/validator.js diff --git a/modules/contacts/validator.js b/js/contacts/validator.js similarity index 100% rename from modules/contacts/validator.js rename to js/contacts/validator.js diff --git a/modules/import/import.js b/js/import/import.js similarity index 100% rename from modules/import/import.js rename to js/import/import.js diff --git a/modules/joborders/validator.js b/js/joborders/validator.js similarity index 100% rename from modules/joborders/validator.js rename to js/joborders/validator.js diff --git a/modules/login/validator.js b/js/login/validator.js similarity index 100% rename from modules/login/validator.js rename to js/login/validator.js diff --git a/modules/settings/Settings.js b/js/settings/Settings.js similarity index 100% rename from modules/settings/Settings.js rename to js/settings/Settings.js diff --git a/modules/settings/validator.js b/js/settings/validator.js similarity index 100% rename from modules/settings/validator.js rename to js/settings/validator.js diff --git a/modules/tests/validator.js b/js/tests/validator.js similarity index 100% rename from modules/tests/validator.js rename to js/tests/validator.js diff --git a/modules/toolbar/toolbarlibForLegacy.js b/js/toolbar/toolbarlibForLegacy.js similarity index 100% rename from modules/toolbar/toolbarlibForLegacy.js rename to js/toolbar/toolbarlibForLegacy.js diff --git a/modules/wizard/wizard.js b/js/wizard/wizard.js similarity index 100% rename from modules/wizard/wizard.js rename to js/wizard/wizard.js From e110ea360b081af4ce5e3994bacc281a6db6467a Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 21:44:24 +0200 Subject: [PATCH 2/7] corrected imports of js files --- modules/activity/Search.tpl | 2 +- modules/calendar/Calendar.tpl | 2 +- modules/candidates/Add.tpl | 4 ++-- modules/candidates/AddActivityChangeStatusModal.tpl | 6 +++--- modules/candidates/CreateAttachmentModal.tpl | 2 +- modules/candidates/CreateImageAttachmentModal.tpl | 2 +- modules/candidates/Edit.tpl | 2 +- modules/candidates/Search.tpl | 2 +- modules/candidates/SendEmail.tpl | 2 +- modules/candidates/Show.tpl | 4 ++-- modules/companies/Add.tpl | 2 +- modules/companies/CreateAttachmentModal.tpl | 2 +- modules/companies/Edit.tpl | 2 +- modules/companies/Search.tpl | 2 +- modules/contacts/Add.tpl | 2 +- modules/contacts/AddActivityScheduleEventModal.tpl | 4 ++-- modules/contacts/Edit.tpl | 2 +- modules/contacts/Search.tpl | 2 +- modules/import/Import.tpl | 2 +- modules/import/Import1.tpl | 2 +- modules/import/Import2.tpl | 2 +- modules/import/ImportCommits.tpl | 2 +- modules/import/ImportRecent.tpl | 2 +- modules/import/ImportResumesBulk.tpl | 2 +- modules/joborders/Add.tpl | 2 +- modules/joborders/AddModalPopup.tpl | 2 +- modules/joborders/CreateAttachmentModal.tpl | 2 +- modules/joborders/Edit.tpl | 2 +- modules/joborders/Search.tpl | 2 +- modules/login/ForgotPassword.tpl | 2 +- modules/login/Login.tpl | 2 +- modules/reports/EEOReport.tpl | 2 +- modules/reports/JobOrderReport.tpl | 2 +- modules/settings/AddUser.tpl | 2 +- modules/settings/Administration.tpl | 2 +- modules/settings/CareerPortalSettings.tpl | 2 +- modules/settings/CareerPortalTemplateEdit.tpl | 2 +- modules/settings/ChangePassword.tpl | 2 +- modules/settings/CustomizeCalendar.tpl | 2 +- modules/settings/CustomizeExtraFields.tpl | 2 +- modules/settings/CustomizeReports.tpl | 2 +- modules/settings/EEOEOCSettings.tpl | 2 +- modules/settings/EmailSettings.tpl | 2 +- modules/settings/ItemHistory.tpl | 2 +- modules/settings/Localization.tpl | 2 +- modules/settings/MyProfile.tpl | 2 +- modules/settings/NewInstallWizard.tpl | 2 +- modules/settings/NewVersionCheck.tpl | 2 +- modules/settings/Passwords.tpl | 2 +- modules/settings/SiteName.tpl | 2 +- modules/settings/SystemInformation.tpl | 2 +- modules/settings/getFirefoxModal.tpl | 2 +- modules/settings/tags.tpl | 2 +- modules/tests/Tests.tpl | 2 +- modules/toolbar/ToolbarUI.php | 2 +- modules/wizard/Show.tpl | 2 +- 56 files changed, 61 insertions(+), 61 deletions(-) diff --git a/modules/activity/Search.tpl b/modules/activity/Search.tpl index 00cdc2aad..77688aa50 100755 --- a/modules/activity/Search.tpl +++ b/modules/activity/Search.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/calendar/Calendar.tpl b/modules/calendar/Calendar.tpl index b382162d2..1b4b6f797 100755 --- a/modules/calendar/Calendar.tpl +++ b/modules/calendar/Calendar.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/candidates/Add.tpl b/modules/candidates/Add.tpl index c190cbf69..c2c22c91f 100755 --- a/modules/candidates/Add.tpl +++ b/modules/candidates/Add.tpl @@ -1,8 +1,8 @@ isModal): ?> - + - + active, $this->subActive); ?> diff --git a/modules/candidates/AddActivityChangeStatusModal.tpl b/modules/candidates/AddActivityChangeStatusModal.tpl index 804d55d20..1dd4a9776 100755 --- a/modules/candidates/AddActivityChangeStatusModal.tpl +++ b/modules/candidates/AddActivityChangeStatusModal.tpl @@ -1,10 +1,10 @@ isJobOrdersMode): ?> - + onlyScheduleEvent): ?> - + - + isFinishedMode): ?> diff --git a/modules/candidates/CreateAttachmentModal.tpl b/modules/candidates/CreateAttachmentModal.tpl index 0ea1c49ac..4b01e84d7 100755 --- a/modules/candidates/CreateAttachmentModal.tpl +++ b/modules/candidates/CreateAttachmentModal.tpl @@ -1,5 +1,5 @@ - + isFinishedMode){ ?>
diff --git a/modules/candidates/CreateImageAttachmentModal.tpl b/modules/candidates/CreateImageAttachmentModal.tpl index 9f2deb326..1ec76a7a9 100755 --- a/modules/candidates/CreateImageAttachmentModal.tpl +++ b/modules/candidates/CreateImageAttachmentModal.tpl @@ -1,5 +1,5 @@ - +

Edit Profile Image

isFinishedMode): ?> diff --git a/modules/candidates/Edit.tpl b/modules/candidates/Edit.tpl index e71fbae8a..baf3eb380 100755 --- a/modules/candidates/Edit.tpl +++ b/modules/candidates/Edit.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/candidates/Search.tpl b/modules/candidates/Search.tpl index 0efbc6e58..522012575 100755 --- a/modules/candidates/Search.tpl +++ b/modules/candidates/Search.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/candidates/SendEmail.tpl b/modules/candidates/SendEmail.tpl index ab72431fc..b97b2164f 100755 --- a/modules/candidates/SendEmail.tpl +++ b/modules/candidates/SendEmail.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/candidates/Show.tpl b/modules/candidates/Show.tpl index 590382de5..be6db6cbd 100755 --- a/modules/candidates/Show.tpl +++ b/modules/candidates/Show.tpl @@ -3,9 +3,9 @@ include_once('./vendor/autoload.php'); use OpenCATS\UI\CandidateQuickActionMenu; ?> isPopup): ?> - data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'modules/candidates/quickAction-candidates.js')); ?> + data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction-candidates.js')); ?> - data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'modules/candidates/quickAction-candidates.js')); ?> + data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction-candidates.js')); ?> active); ?> diff --git a/modules/companies/Add.tpl b/modules/companies/Add.tpl index 9487743af..689a8f283 100755 --- a/modules/companies/Add.tpl +++ b/modules/companies/Add.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/companies/CreateAttachmentModal.tpl b/modules/companies/CreateAttachmentModal.tpl index 12683b2df..1c71d750f 100755 --- a/modules/companies/CreateAttachmentModal.tpl +++ b/modules/companies/CreateAttachmentModal.tpl @@ -1,5 +1,5 @@ - + isFinishedMode): ?> diff --git a/modules/companies/Edit.tpl b/modules/companies/Edit.tpl index 8ca6aba16..16e5f5d69 100755 --- a/modules/companies/Edit.tpl +++ b/modules/companies/Edit.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/companies/Search.tpl b/modules/companies/Search.tpl index fe2af598c..f00695053 100755 --- a/modules/companies/Search.tpl +++ b/modules/companies/Search.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/contacts/Add.tpl b/modules/contacts/Add.tpl index 6ca978ded..93cafef6c 100755 --- a/modules/contacts/Add.tpl +++ b/modules/contacts/Add.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl index c30144410..0ce8c29dd 100755 --- a/modules/contacts/AddActivityScheduleEventModal.tpl +++ b/modules/contacts/AddActivityScheduleEventModal.tpl @@ -1,9 +1,9 @@ onlyScheduleEvent): ?> - + - + isFinishedMode): ?> diff --git a/modules/contacts/Edit.tpl b/modules/contacts/Edit.tpl index 4e3963571..a05b46a7f 100755 --- a/modules/contacts/Edit.tpl +++ b/modules/contacts/Edit.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/contacts/Search.tpl b/modules/contacts/Search.tpl index 07500ea88..b2f29b9af 100755 --- a/modules/contacts/Search.tpl +++ b/modules/contacts/Search.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/import/Import.tpl b/modules/import/Import.tpl index 2f11668e1..116e1614b 100755 --- a/modules/import/Import.tpl +++ b/modules/import/Import.tpl @@ -1,5 +1,5 @@ - + active, '', 'settings'); ?>
diff --git a/modules/import/Import1.tpl b/modules/import/Import1.tpl index 5bd55c7fc..87b20f710 100755 --- a/modules/import/Import1.tpl +++ b/modules/import/Import1.tpl @@ -1,5 +1,5 @@ - + active, '', 'settings'); ?>
diff --git a/modules/import/Import2.tpl b/modules/import/Import2.tpl index ec3203cd8..ed431aaba 100755 --- a/modules/import/Import2.tpl +++ b/modules/import/Import2.tpl @@ -1,5 +1,5 @@ - + active, '', 'settings'); ?>
diff --git a/modules/import/ImportCommits.tpl b/modules/import/ImportCommits.tpl index a3121dda9..9fc17545d 100755 --- a/modules/import/ImportCommits.tpl +++ b/modules/import/ImportCommits.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/import/ImportRecent.tpl b/modules/import/ImportRecent.tpl index 24b1ab345..ae3548310 100755 --- a/modules/import/ImportRecent.tpl +++ b/modules/import/ImportRecent.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/import/ImportResumesBulk.tpl b/modules/import/ImportResumesBulk.tpl index 516069edf..258b26d35 100755 --- a/modules/import/ImportResumesBulk.tpl +++ b/modules/import/ImportResumesBulk.tpl @@ -1,5 +1,5 @@ - + active, ''); ?>
diff --git a/modules/joborders/Add.tpl b/modules/joborders/Add.tpl index 4eba9a657..bf72c09b4 100755 --- a/modules/joborders/Add.tpl +++ b/modules/joborders/Add.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/joborders/AddModalPopup.tpl b/modules/joborders/AddModalPopup.tpl index 01cb43877..940cc97e0 100755 --- a/modules/joborders/AddModalPopup.tpl +++ b/modules/joborders/AddModalPopup.tpl @@ -1,5 +1,5 @@ - +
diff --git a/modules/joborders/CreateAttachmentModal.tpl b/modules/joborders/CreateAttachmentModal.tpl index 553274868..7328565ca 100755 --- a/modules/joborders/CreateAttachmentModal.tpl +++ b/modules/joborders/CreateAttachmentModal.tpl @@ -1,5 +1,5 @@ - + isFinishedMode): ?> diff --git a/modules/joborders/Edit.tpl b/modules/joborders/Edit.tpl index ec9f8d060..6b3b8ef36 100755 --- a/modules/joborders/Edit.tpl +++ b/modules/joborders/Edit.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/joborders/Search.tpl b/modules/joborders/Search.tpl index 1af97de07..b33c2583b 100755 --- a/modules/joborders/Search.tpl +++ b/modules/joborders/Search.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/login/ForgotPassword.tpl b/modules/login/ForgotPassword.tpl index 72ab65706..eced7badd 100755 --- a/modules/login/ForgotPassword.tpl +++ b/modules/login/ForgotPassword.tpl @@ -7,7 +7,7 @@ - + diff --git a/modules/login/Login.tpl b/modules/login/Login.tpl index 072312f17..cda7d68c4 100755 --- a/modules/login/Login.tpl +++ b/modules/login/Login.tpl @@ -7,7 +7,7 @@ - + diff --git a/modules/reports/EEOReport.tpl b/modules/reports/EEOReport.tpl index 4391920bd..a90bb84b2 100755 --- a/modules/reports/EEOReport.tpl +++ b/modules/reports/EEOReport.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/reports/JobOrderReport.tpl b/modules/reports/JobOrderReport.tpl index ffe46e52e..6b4c2cbc1 100755 --- a/modules/reports/JobOrderReport.tpl +++ b/modules/reports/JobOrderReport.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/AddUser.tpl b/modules/settings/AddUser.tpl index 4c5bdd474..0fe7b7a60 100755 --- a/modules/settings/AddUser.tpl +++ b/modules/settings/AddUser.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/Administration.tpl b/modules/settings/Administration.tpl index 8b8058d59..c7e4625b0 100755 --- a/modules/settings/Administration.tpl +++ b/modules/settings/Administration.tpl @@ -1,5 +1,5 @@ - + - + diff --git a/modules/settings/NewVersionCheck.tpl b/modules/settings/NewVersionCheck.tpl index 8f850db08..dbe85b369 100755 --- a/modules/settings/NewVersionCheck.tpl +++ b/modules/settings/NewVersionCheck.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/Passwords.tpl b/modules/settings/Passwords.tpl index ad8b8e535..e877bca99 100755 --- a/modules/settings/Passwords.tpl +++ b/modules/settings/Passwords.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/SiteName.tpl b/modules/settings/SiteName.tpl index c595693a5..23b1ce080 100755 --- a/modules/settings/SiteName.tpl +++ b/modules/settings/SiteName.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/SystemInformation.tpl b/modules/settings/SystemInformation.tpl index 8c18a6f9a..d08d68fc8 100755 --- a/modules/settings/SystemInformation.tpl +++ b/modules/settings/SystemInformation.tpl @@ -1,5 +1,5 @@ - + active, $this->subActive); ?>
diff --git a/modules/settings/getFirefoxModal.tpl b/modules/settings/getFirefoxModal.tpl index b2c8ff4aa..56469293b 100755 --- a/modules/settings/getFirefoxModal.tpl +++ b/modules/settings/getFirefoxModal.tpl @@ -1,5 +1,5 @@ - + diff --git a/modules/settings/tags.tpl b/modules/settings/tags.tpl index 6712d83f7..07e971184 100644 --- a/modules/settings/tags.tpl +++ b/modules/settings/tags.tpl @@ -1,7 +1,7 @@ - +active, $this->subActive); ?>
diff --git a/modules/tests/Tests.tpl b/modules/tests/Tests.tpl index 289ae14b9..1735d5b2c 100755 --- a/modules/tests/Tests.tpl +++ b/modules/tests/Tests.tpl @@ -1,5 +1,5 @@ -reporter->printHeader(array('modules/tests/validator.js')); ?> +reporter->printHeader(array('js/tests/validator.js')); ?> reporter->printHeaderBlock(); ?>
diff --git a/modules/toolbar/ToolbarUI.php b/modules/toolbar/ToolbarUI.php index b3983e8dc..0dc8fea85 100755 --- a/modules/toolbar/ToolbarUI.php +++ b/modules/toolbar/ToolbarUI.php @@ -151,7 +151,7 @@ private function getJavaScriptLibLegacy() // FIXME: Send a JS library that just makes a button indicating that their version // is out of date. - $toolbarLibrary = @file_get_contents('./modules/toolbar/toolbarlibForLegacy.js'); + $toolbarLibrary = @file_get_contents('./js/toolbar/toolbarlibForLegacy.js'); echo $toolbarLibrary; return; } diff --git a/modules/wizard/Show.tpl b/modules/wizard/Show.tpl index 068521df5..6fc945928 100755 --- a/modules/wizard/Show.tpl +++ b/modules/wizard/Show.tpl @@ -7,7 +7,7 @@ - + jsInclude != ''): ?> From d0f71399d957c04d9d8e8f4681cac998348daad4 Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 21:47:13 +0200 Subject: [PATCH 3/7] renamed quickaction-candidates.js --- js/candidates/{quickAction-candidates.js => quickAction.js} | 0 modules/candidates/Show.tpl | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename js/candidates/{quickAction-candidates.js => quickAction.js} (100%) diff --git a/js/candidates/quickAction-candidates.js b/js/candidates/quickAction.js similarity index 100% rename from js/candidates/quickAction-candidates.js rename to js/candidates/quickAction.js diff --git a/modules/candidates/Show.tpl b/modules/candidates/Show.tpl index be6db6cbd..1dd34de8f 100755 --- a/modules/candidates/Show.tpl +++ b/modules/candidates/Show.tpl @@ -3,9 +3,9 @@ include_once('./vendor/autoload.php'); use OpenCATS\UI\CandidateQuickActionMenu; ?> isPopup): ?> - data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction-candidates.js')); ?> + data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction.js')); ?> - data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction-candidates.js')); ?> + data['firstName'].' '.$this->data['lastName'], array( 'js/activity.js', 'js/sorttable.js', 'js/match.js', 'js/lib.js', 'js/pipeline.js', 'js/attachment.js', 'js/candidates/quickAction.js')); ?> active); ?> From 95644bcbc86798096e259f326547b5deb9721f3f Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 21:54:31 +0200 Subject: [PATCH 4/7] wrongly changed import of css --- modules/calendar/Calendar.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/calendar/Calendar.tpl b/modules/calendar/Calendar.tpl index 1b4b6f797..26db49b17 100755 --- a/modules/calendar/Calendar.tpl +++ b/modules/calendar/Calendar.tpl @@ -1,5 +1,5 @@ - + active); ?>
From ceaea2a670f7fc277cee565d93af1249015c936f Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 22:59:04 +0200 Subject: [PATCH 5/7] modules css moved to css dir --- {modules => css}/calendar/Calendar.css | 0 {modules => css}/import/MassImport.css | 0 {modules => css}/install/install.css | 0 {modules => css}/login/login.css | 0 {modules => css}/settings/downloads.css | 16 ++++++++-------- {modules => css}/tests/tests.css | 0 {modules => css}/wizard/style.css | 0 installwizard.php | 2 +- modules/calendar/Calendar.tpl | 2 +- modules/import/MassImport.tpl | 2 +- modules/import/MassImportEdit.tpl | 2 +- modules/install/notinstalled.php | 2 +- modules/install/phpVersion.php | 2 +- modules/login/ForgotPassword.tpl | 2 +- modules/login/Login.tpl | 2 +- modules/settings/NewInstallWizard.tpl | 2 +- modules/tests/CATSTestReporter.php | 2 +- modules/wizard/Show.tpl | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename {modules => css}/calendar/Calendar.css (100%) rename {modules => css}/import/MassImport.css (100%) rename {modules => css}/install/install.css (100%) rename {modules => css}/login/login.css (100%) rename {modules => css}/settings/downloads.css (98%) rename {modules => css}/tests/tests.css (100%) rename {modules => css}/wizard/style.css (100%) diff --git a/modules/calendar/Calendar.css b/css/calendar/Calendar.css similarity index 100% rename from modules/calendar/Calendar.css rename to css/calendar/Calendar.css diff --git a/modules/import/MassImport.css b/css/import/MassImport.css similarity index 100% rename from modules/import/MassImport.css rename to css/import/MassImport.css diff --git a/modules/install/install.css b/css/install/install.css similarity index 100% rename from modules/install/install.css rename to css/install/install.css diff --git a/modules/login/login.css b/css/login/login.css similarity index 100% rename from modules/login/login.css rename to css/login/login.css diff --git a/modules/settings/downloads.css b/css/settings/downloads.css similarity index 98% rename from modules/settings/downloads.css rename to css/settings/downloads.css index e68bd8080..597383c81 100755 --- a/modules/settings/downloads.css +++ b/css/settings/downloads.css @@ -1,9 +1,9 @@ -/* Downloads Supported Types > Settings tab > Downloads */ - -#settingsDownloads { clear: both; width: 600px; } -#settingsDownloads h4 { margin: 15px 0 0 0;font: bold 14px Arial, sans-serif; color: #000; } -table.downloadSupportedGrid { margin: 0 0 15px 0; padding: 0; border: 1px solid #ccc; border-left: none; text-align: left; width: 600px; } -table.downloadSupportedGrid tr.headers { background: #f3e1d2; } -table.downloadSupportedGrid tr.headers span { vertical-align: super; } -table.downloadSupportedGrid td { padding: 0 0 0 10px; border-left: 1px solid #ccc; height: 25px; } +/* Downloads Supported Types > Settings tab > Downloads */ + +#settingsDownloads { clear: both; width: 600px; } +#settingsDownloads h4 { margin: 15px 0 0 0;font: bold 14px Arial, sans-serif; color: #000; } +table.downloadSupportedGrid { margin: 0 0 15px 0; padding: 0; border: 1px solid #ccc; border-left: none; text-align: left; width: 600px; } +table.downloadSupportedGrid tr.headers { background: #f3e1d2; } +table.downloadSupportedGrid tr.headers span { vertical-align: super; } +table.downloadSupportedGrid td { padding: 0 0 0 10px; border-left: 1px solid #ccc; height: 25px; } table.downloadSupportedGrid td.category { width: 125px; font: normal 14px Arial, sans-serif; text-align: left; } \ No newline at end of file diff --git a/modules/tests/tests.css b/css/tests/tests.css similarity index 100% rename from modules/tests/tests.css rename to css/tests/tests.css diff --git a/modules/wizard/style.css b/css/wizard/style.css similarity index 100% rename from modules/wizard/style.css rename to css/wizard/style.css diff --git a/installwizard.php b/installwizard.php index 662f3430e..5ef19171d 100755 --- a/installwizard.php +++ b/installwizard.php @@ -26,7 +26,7 @@ - + diff --git a/modules/calendar/Calendar.tpl b/modules/calendar/Calendar.tpl index 26db49b17..68916b2e5 100755 --- a/modules/calendar/Calendar.tpl +++ b/modules/calendar/Calendar.tpl @@ -1,5 +1,5 @@ - + active); ?>
diff --git a/modules/import/MassImport.tpl b/modules/import/MassImport.tpl index 583dc4d36..0caf85870 100755 --- a/modules/import/MassImport.tpl +++ b/modules/import/MassImport.tpl @@ -2,7 +2,7 @@ active, '', 'settings'); ?> - +
diff --git a/modules/import/MassImportEdit.tpl b/modules/import/MassImportEdit.tpl index 6d447ef1c..6652ce249 100755 --- a/modules/import/MassImportEdit.tpl +++ b/modules/import/MassImportEdit.tpl @@ -3,7 +3,7 @@ active); ?> - +
diff --git a/modules/install/notinstalled.php b/modules/install/notinstalled.php index f6700508b..ef3a2d05a 100755 --- a/modules/install/notinstalled.php +++ b/modules/install/notinstalled.php @@ -6,7 +6,7 @@ OpenCATS - Installation Wizard Script - + diff --git a/modules/install/phpVersion.php b/modules/install/phpVersion.php index 7c17273ca..82344e89f 100755 --- a/modules/install/phpVersion.php +++ b/modules/install/phpVersion.php @@ -6,7 +6,7 @@ CATS - Installation Wizard Script - + diff --git a/modules/login/ForgotPassword.tpl b/modules/login/ForgotPassword.tpl index eced7badd..2d923680c 100755 --- a/modules/login/ForgotPassword.tpl +++ b/modules/login/ForgotPassword.tpl @@ -5,7 +5,7 @@ OpenCATS - Login - + diff --git a/modules/login/Login.tpl b/modules/login/Login.tpl index cda7d68c4..470927d9f 100755 --- a/modules/login/Login.tpl +++ b/modules/login/Login.tpl @@ -5,7 +5,7 @@ opencats - Login - + diff --git a/modules/settings/NewInstallWizard.tpl b/modules/settings/NewInstallWizard.tpl index 2fcf9ed83..9063e71b2 100755 --- a/modules/settings/NewInstallWizard.tpl +++ b/modules/settings/NewInstallWizard.tpl @@ -5,7 +5,7 @@ CATS - Initial Configuration Wizard - + diff --git a/modules/tests/CATSTestReporter.php b/modules/tests/CATSTestReporter.php index e5ef5721b..e007449a4 100755 --- a/modules/tests/CATSTestReporter.php +++ b/modules/tests/CATSTestReporter.php @@ -203,7 +203,7 @@ public function printHeader($headIncludes = array()) echo ' ', "\n"; echo ' CATS - Tests', "\n"; echo ' ', "\n"; - echo ' ', "\n"; + echo ' ', "\n"; foreach ($headIncludes as $key => $value) { diff --git a/modules/wizard/Show.tpl b/modules/wizard/Show.tpl index 6fc945928..ad36476f6 100755 --- a/modules/wizard/Show.tpl +++ b/modules/wizard/Show.tpl @@ -6,7 +6,7 @@ - + jsInclude != ''): ?> From 636e6aa65461018871778bc018b2d5d408f39f4e Mon Sep 17 00:00:00 2001 From: Sveto Krchnavy Date: Fri, 12 May 2017 23:09:47 +0200 Subject: [PATCH 6/7] moved rest of css from root to css dir --- careersPage.css => css/careersPage.css | 118 ++++++++++++------------- ie.css => css/ie.css | 0 main.css => css/main.css | 0 not-ie.css => css/not-ie.css | 0 installtest.php | 2 +- js/submodal/loading.html | 2 +- lib/TemplateUtility.php | 6 +- modules/reports/GraphView.tpl | 2 +- modules/settings/PreviewPageTop.tpl | 2 +- 9 files changed, 66 insertions(+), 66 deletions(-) rename careersPage.css => css/careersPage.css (97%) rename ie.css => css/ie.css (100%) rename main.css => css/main.css (100%) rename not-ie.css => css/not-ie.css (100%) diff --git a/careersPage.css b/css/careersPage.css similarity index 97% rename from careersPage.css rename to css/careersPage.css index 59ed0db37..8e6f2873f 100755 --- a/careersPage.css +++ b/css/careersPage.css @@ -1,60 +1,60 @@ -@charset "utf-8"; -/* CATS Applicant Tracking System Careers Page -Released: 11.13.2007 -Created By: Sae Vang - */ - -/* COMMON */ -body, html { margin: 0; padding: 0; background: #ffffff; font: normal 12px/14px Arial, Helvetica, sans-serif; color: #000000; } -#container { margin: 0 auto; padding: 0; width: 930px; height: auto; } -#logo { float: left; margin: 0; } - #logo img { width: 424px; height: 103px; } -#actions { float: right; margin: 0; width: 310px; height: 100px; background: #efefef; border: 1px solid #cccccc; } - #actions img { float: left; margin: 2px 6px 2px 15px; width: 130px; height: 25px; } -#footer { clear: both; margin: 20px auto 0 auto; width: 150px; } - #footer img { width: 137px; height: 38px; } - -a:link, a:active { color: #1763b9; } -a:hover { color: #c75a01; } -a:visited { color: #333333; } - -h1 { margin: 0 0 10px 0; font: bold 18px Arial, Helvetica, sans-serif; } -h2 { margin: 8px 0 8px 15px; font: bold 14px Arial, Helvetica, sans-serif; } -h3 { margin: 0; font: bold 14px Arial, Helvetica, sans-serif; } -p { font: normal 12px Arial, Helvetica, sans-serif; } -img { border: none; } -strong { font-weight: bold; } -em { font-style: italics; } - - -/* CONTENTS ON PAGE SPECS */ -#careerContent { clear: both; padding: 15px 0 0 0; } - -/* DISPLAY ALL JOBS PAGE */ -#displayTable { width: 930px; } -#displayTable tr.header { background: #e0e0e0; border: 1px solid #cccccc; border-left: none; border-right: none; } -#displayTable tr.odd { background: #ffffff; } -#displayTable tr.even { background: #ebebeb; } -#displayTable td { padding: 5px; } - -/* DISPLAY JOB DETAILS */ -#detailsTable { width: 400px; } - #detailsTable td.detailsHeader { width: 30%; } -div#discriptive { float: left; width: 585px; } -div#detailsTools { float: right; width: 330px; height: 70px; background: #ffffff; border: 1px solid #cccccc; } - div#detailsTools img { float: left; margin: 2px 6px 5px 15px; } - -/* DISPLAY APPLICATION FORM */ -div.applyBoxLeft, div.applyBoxRight { width: 450px; height: 470px; background: #f9f9f9; border: 1px solid #cccccc; border-top: none; } -div.applyBoxLeft { float: left; margin: 0 10px 30px 0; } -div.applyBoxRight { float: right; margin: 0 0 30px 10px; } - div.applyBoxLeft div, div.applyBoxRight div { margin: 0 0 5px 0; padding: 3px 10px; background: #efefef; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; } - div.applyBoxLeft table, div.applyBoxRight table { margin: 0 auto; width: 420px; } - div.applyBoxLeft table td, div.applyBoxRight table td { padding: 3px; vertical-align: top; } - td.label { text-align: right; width: 110px; } - label { font-weight: bold; } - input#documentFile { width: 342px; } - input.inputbox { width: 285px; height: 15px; } - input.submitbutton { float: right; width: 195px; height: 25px; } - textarea { margin: 8px 0 0 0; width: 410px; height: 170px; } +@charset "utf-8"; +/* CATS Applicant Tracking System Careers Page +Released: 11.13.2007 +Created By: Sae Vang + */ + +/* COMMON */ +body, html { margin: 0; padding: 0; background: #ffffff; font: normal 12px/14px Arial, Helvetica, sans-serif; color: #000000; } +#container { margin: 0 auto; padding: 0; width: 930px; height: auto; } +#logo { float: left; margin: 0; } + #logo img { width: 424px; height: 103px; } +#actions { float: right; margin: 0; width: 310px; height: 100px; background: #efefef; border: 1px solid #cccccc; } + #actions img { float: left; margin: 2px 6px 2px 15px; width: 130px; height: 25px; } +#footer { clear: both; margin: 20px auto 0 auto; width: 150px; } + #footer img { width: 137px; height: 38px; } + +a:link, a:active { color: #1763b9; } +a:hover { color: #c75a01; } +a:visited { color: #333333; } + +h1 { margin: 0 0 10px 0; font: bold 18px Arial, Helvetica, sans-serif; } +h2 { margin: 8px 0 8px 15px; font: bold 14px Arial, Helvetica, sans-serif; } +h3 { margin: 0; font: bold 14px Arial, Helvetica, sans-serif; } +p { font: normal 12px Arial, Helvetica, sans-serif; } +img { border: none; } +strong { font-weight: bold; } +em { font-style: italics; } + + +/* CONTENTS ON PAGE SPECS */ +#careerContent { clear: both; padding: 15px 0 0 0; } + +/* DISPLAY ALL JOBS PAGE */ +#displayTable { width: 930px; } +#displayTable tr.header { background: #e0e0e0; border: 1px solid #cccccc; border-left: none; border-right: none; } +#displayTable tr.odd { background: #ffffff; } +#displayTable tr.even { background: #ebebeb; } +#displayTable td { padding: 5px; } + +/* DISPLAY JOB DETAILS */ +#detailsTable { width: 400px; } + #detailsTable td.detailsHeader { width: 30%; } +div#discriptive { float: left; width: 585px; } +div#detailsTools { float: right; width: 330px; height: 70px; background: #ffffff; border: 1px solid #cccccc; } + div#detailsTools img { float: left; margin: 2px 6px 5px 15px; } + +/* DISPLAY APPLICATION FORM */ +div.applyBoxLeft, div.applyBoxRight { width: 450px; height: 470px; background: #f9f9f9; border: 1px solid #cccccc; border-top: none; } +div.applyBoxLeft { float: left; margin: 0 10px 30px 0; } +div.applyBoxRight { float: right; margin: 0 0 30px 10px; } + div.applyBoxLeft div, div.applyBoxRight div { margin: 0 0 5px 0; padding: 3px 10px; background: #efefef; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; } + div.applyBoxLeft table, div.applyBoxRight table { margin: 0 auto; width: 420px; } + div.applyBoxLeft table td, div.applyBoxRight table td { padding: 3px; vertical-align: top; } + td.label { text-align: right; width: 110px; } + label { font-weight: bold; } + input#documentFile { width: 342px; } + input.inputbox { width: 285px; height: 15px; } + input.submitbutton { float: right; width: 195px; height: 25px; } + textarea { margin: 8px 0 0 0; width: 410px; height: 170px; } textarea.inputboxlarge { width: 285px; height: 70px; } \ No newline at end of file diff --git a/ie.css b/css/ie.css similarity index 100% rename from ie.css rename to css/ie.css diff --git a/main.css b/css/main.css similarity index 100% rename from main.css rename to css/main.css diff --git a/not-ie.css b/css/not-ie.css similarity index 100% rename from not-ie.css rename to css/not-ie.css diff --git a/installtest.php b/installtest.php index 6e98dde1b..5176faec6 100755 --- a/installtest.php +++ b/installtest.php @@ -45,7 +45,7 @@ CATS - Installation Test Script - + + diff --git a/lib/TemplateUtility.php b/lib/TemplateUtility.php index 667dd14c0..999b5672c 100755 --- a/lib/TemplateUtility.php +++ b/lib/TemplateUtility.php @@ -1194,7 +1194,7 @@ private static function _printCommonHeader($pageTitle, $headIncludes = array()) echo '', "\n"; echo '', "\n"; - $headIncludes[] = 'main.css'; + $headIncludes[] = 'css/main.css'; foreach ($headIncludes as $key => $filename) { @@ -1212,8 +1212,8 @@ private static function _printCommonHeader($pageTitle, $headIncludes = array()) } } - echo '', "\n"; - echo '', "\n"; + echo '', "\n"; + echo '', "\n"; echo '', "\n\n"; } diff --git a/modules/reports/GraphView.tpl b/modules/reports/GraphView.tpl index 6fce1fc2b..fc41c36a3 100755 --- a/modules/reports/GraphView.tpl +++ b/modules/reports/GraphView.tpl @@ -8,7 +8,7 @@ - + +