Merge pull request #16 from uriweb/release-1.4.1

Release 1.4.1
uriweb · May 8, 2020 · 3c05bd3 · 3c05bd3
2 parents c8b1e39 + 3df9a49
commit 3c05bd3
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 98 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,18 @@
 
 Add [programs-categories] to a page and a form magically appears.
 
-## What's new in 1.4.0
+## What's new in 1.4.1
+
+Program Finder 1.4.1 is a bug fix release.
+
+- Switches fields for Accreditation and Specializations to WYSIWYG
+- Updates default template to display information from new WYSIWIG fields properly
+- Reorders fields to match front-end display
+- Adds/updates field instructions 
+
+For complete details, see the [commit history](https://github.com/uriweb/uri-program-finder/pull/16/commits) and the [issue tracker](https://github.com/uriweb/uri-program-finder/issues).
+
+## New in 1.4.0
 
 Program Finder 1.4.0 is a minor update.
 
@@ -26,5 +37,5 @@ For complete details, see the [commit history](https://github.com/uriweb/uri-pro
 Contributors: John Pennypacker, Brandon Fuller  
 Tags: plugins  
 Requires at least: 4.0  
-Tested up to: 4.9  
-Stable tag: 1.4.0  
+Tested up to: 5.4  
+Stable tag: 1.4.1  
diff --git a/inc/uri-program-finder-fields.php b/inc/uri-program-finder-fields.php
@@ -108,27 +108,21 @@ function uri_program_finder_create_taxonomy() {
 					'key' => 'field_5eab14e914046',
 					'label' => 'Accreditation',
 					'name' => 'accreditation',
-					'type' => 'text',
-					'instructions' => 'List any program accreditation(s) (comma separated)',
+					'instructions' => 'List any program accreditation(s)',
+					'type' => 'wysiwyg',
 					'default_value' => '',
-					'placeholder' => '',
-					'prepend' => '',
-					'append' => '',
-					'formatting' => 'html',
-					'maxlength' => '',
+					'toolbar' => 'full',
+					'media_upload' => 'no',
 				),
 				array(
 					'key' => 'field_5eab151814047',
 					'label' => 'Specializations',
 					'name' => 'specializations',
-					'type' => 'text',
-					'instructions' => 'List any degree specializations (comma separated)',
+					'instructions' => 'List any degree specializations',
+					'type' => 'wysiwyg',
 					'default_value' => '',
-					'placeholder' => '',
-					'prepend' => '',
-					'append' => '',
-					'formatting' => 'html',
-					'maxlength' => '',
+					'toolbar' => 'full',
+					'media_upload' => 'no',
 				),
 				array(
 					'key' => 'field_5eab155214048',
@@ -141,23 +135,68 @@ function uri_program_finder_create_taxonomy() {
 					'media_upload' => 'no',
 				),
 				array(
-					'key' => 'field_5a907505aed60',
-					'label' => 'Department Website',
-					'name' => 'department_website',
+					'key' => 'field_5a9078363b98f',
+					'label' => 'Time to Completion',
+					'name' => 'time_to_completion',
+					'type' => 'wysiwyg',
+					'default_value' => '',
+					'toolbar' => 'full',
+					'media_upload' => 'no',
+				),
+				array(
+					'key' => 'field_5a90787f3b990',
+					'label' => 'Application Deadline',
+					'name' => 'application_deadline',
+					'type' => 'wysiwyg',
+					'default_value' => '',
+					'toolbar' => 'full',
+					'media_upload' => 'no',
+				),
+				array(
+					'key' => 'field_5a9077420046a',
+					'label' => 'Course Schedule',
+					'name' => 'course_schedule',
+					'type' => 'text',
+					'instructions' => 'URL to course schedule(s)',
+					'default_value' => 'https://uri.edu/course-schedule',
+					'placeholder' => '',
+					'prepend' => '',
+					'append' => '',
+					'formatting' => 'html',
+					'maxlength' => '',
+				),
+				array(
+					'key' => 'field_5a9076e700469',
+					'label' => 'Course Descriptions',
+					'name' => 'course_descriptions',
 					'type' => 'text',
+					'instructions' => 'URL to course descriptions',
 					'default_value' => '',
-					'placeholder' => 'https://uri.edu/department',
+					'placeholder' => '',
 					'prepend' => '',
 					'append' => '',
-					'formatting' => 'none',
+					'formatting' => 'html',
+					'maxlength' => '',
+				),
+				array(
+					'key' => 'field_5a907649020b3',
+					'label' => 'Curriculum Sheets / Advising',
+					'name' => 'curriculum_sheets',
+					'type' => 'text',
+					'instructions' => 'URL to advising (undergrad default display is "Curriculum Sheets" and links to uri.edu/advising/curriculum-sheets-all)',
+					'default_value' => 'https://web.uri.edu/advising/curriculum-sheets-all/',
+					'placeholder' => '',
+					'prepend' => '',
+					'append' => '',
+					'formatting' => 'html',
 					'maxlength' => '',
 				),
 				array(
 					'key' => 'field_5a90756aaed61',
 					'label' => 'Catalog Info',
 					'name' => 'catalog_info',
 					'type' => 'text',
-					'instructions' => 'Enter the URL of the corresponding catalog page.',
+					'instructions' => 'URL of the corresponding catalog page',
 					'default_value' => '',
 					'placeholder' => 'https://web.uri.edu/catalog/music/',
 					'prepend' => '',
@@ -166,15 +205,16 @@ function uri_program_finder_create_taxonomy() {
 					'maxlength' => '',
 				),
 				array(
-					'key' => 'field_5a9076e700469',
-					'label' => 'Course Descriptions',
-					'name' => 'course_descriptions',
+					'key' => 'field_5a907505aed60',
+					'label' => 'Department Website',
+					'name' => 'department_website',
 					'type' => 'text',
+					'instructions' => 'URL of the program\'s home department',
 					'default_value' => '',
-					'placeholder' => '',
+					'placeholder' => 'https://uri.edu/department',
 					'prepend' => '',
 					'append' => '',
-					'formatting' => 'html',
+					'formatting' => 'none',
 					'maxlength' => '',
 				),
 				array(
@@ -190,24 +230,12 @@ function uri_program_finder_create_taxonomy() {
 					'formatting' => 'html',
 					'maxlength' => '',
 				),
-				array(
-					'key' => 'field_5a907649020b3',
-					'label' => 'Curriculum Sheets',
-					'name' => 'curriculum_sheets',
-					'type' => 'text',
-					'instructions' => 'URL to Curriculum Sheets; default: https://web.uri.edu/advising/curriculum-sheets-all/',
-					'default_value' => 'https://web.uri.edu/advising/curriculum-sheets-all/',
-					'placeholder' => '',
-					'prepend' => '',
-					'append' => '',
-					'formatting' => 'html',
-					'maxlength' => '',
-				),
 				array(
 					'key' => 'field_5a907670020b2',
 					'label' => 'Apply',
 					'name' => 'apply',
 					'type' => 'select',
+					'instructions' => 'Select application portal based on degree type',
 					'choices' => array(
 						'https://apply.commonapp.org/Login?ma=376&tref=program-finder' => 'Undergraduate',
 						'https://web.uri.edu/graduate-school/admission/' => 'Graduate',
@@ -216,37 +244,6 @@ function uri_program_finder_create_taxonomy() {
 					'allow_null' => 0,
 					'multiple' => 0,
 				),
-				array(
-					'key' => 'field_5a9077420046a',
-					'label' => 'Course Schedule',
-					'name' => 'course_schedule',
-					'type' => 'text',
-					'instructions' => 'I\'m sorry.',
-					'default_value' => 'https://uri.edu/course-schedule',
-					'placeholder' => '',
-					'prepend' => '',
-					'append' => '',
-					'formatting' => 'html',
-					'maxlength' => '',
-				),
-				array(
-					'key' => 'field_5a9078363b98f',
-					'label' => 'Time to Completion',
-					'name' => 'time_to_completion',
-					'type' => 'wysiwyg',
-					'default_value' => '',
-					'toolbar' => 'full',
-					'media_upload' => 'no',
-				),
-				array(
-					'key' => 'field_5a90787f3b990',
-					'label' => 'Application Deadline',
-					'name' => 'application_deadline',
-					'type' => 'wysiwyg',
-					'default_value' => '',
-					'toolbar' => 'full',
-					'media_upload' => 'no',
-				),
 			),
 			'location' => array(
 				array(

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "uri-program-finder",
   "description": "URI Program Finder",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "homepage": "https://www.uri.edu",
   "repository": {
     "type": "git",

diff --git a/template-parts/single-program.php b/template-parts/single-program.php
@@ -67,36 +67,14 @@
 						<?php if ( $accreditation = uri_modern_get_field( 'accreditation' ) ) { ?>
 						<div class="accreditation">
 							<h3>Accreditation</h3>
-							<?php
-							$accreditation = explode( ',', $accreditation );
-							if ( 1 == sizeof( $accreditation ) ) {
-								print $accreditation[0];
-							} else {
-								print '<ul>';
-								foreach ( $accreditation as $a ) {
-									print '<li>' . trim( $a ) . '</li>';
-								}
-								print '</ul>';
-							}
-							?>
+							<?php print $accreditation; ?>
 						</div>
 						<?php } ?>
 
 						<?php if ( $specializations = uri_modern_get_field( 'specializations' ) ) { ?>
 						<div class="specializations">
 							<h3>Specializations</h3>
-							<?php
-							$specializations = explode( ',', $specializations );
-							if ( 1 == sizeof( $specializations ) ) {
-								print $specializations[0];
-							} else {
-								print '<ul>';
-								foreach ( $specializations as $s ) {
-									print '<li>' . trim( $s ) . '</li>';
-								}
-								print '</ul>';
-							}
-							?>
+							<?php print $specializations; ?>
 						</div>
 						<?php } ?>
 

diff --git a/uri-program-finder.php b/uri-program-finder.php
@@ -3,7 +3,7 @@
  * Plugin Name: URI Program Finder
  * Plugin URI: http://www.uri.edu
  * Description: Program finder tools
- * Version: 1.4.0
+ * Version: 1.4.1
  * Author: URI Web Communications
  * Author URI:
  *