diff --git a/application/controllers/RequestController.php b/application/controllers/RequestController.php index 01d1f7e2f3886292645a5eab7db82dd824d0fb90..90278840b90e5123a8e88008e10012221eccd8db 100755 --- a/application/controllers/RequestController.php +++ b/application/controllers/RequestController.php @@ -119,11 +119,8 @@ class RequestController extends Nmc_Controller_Action Nmc_Registry_Session::getInstance()->course = $course; $out = new Application_View(); - if ($request->type->name == 'RemoveCourse') { - $out->location = '/Request/SupportiveMaterial'; - } else { - $out->location = '/Request/CourseID'; - } + $out->location = '/Request/Edit'; + echo $out->render('unlModernWrapper.xhtml'); } diff --git a/application/library/View/Helper/BulletinEntry.php b/application/library/View/Helper/BulletinEntry.php index 7de27d3f2fc7ec74a1513f1dbbb6f58eafe9c2a1..65025097c097b24b78585261b9c7bf8c0dfe4808 100644 --- a/application/library/View/Helper/BulletinEntry.php +++ b/application/library/View/Helper/BulletinEntry.php @@ -8,7 +8,9 @@ class Application_View_Helper_BulletinEntry ?> <div class="bulletinEntry"> <div> - <?php + <?php if ($request->type->name == 'RemoveCourse') { ?> + <del> + <?php } // ES and IS if ($course->isEssentialStudies() == true) { @@ -157,9 +159,19 @@ class Application_View_Helper_BulletinEntry Prereq: <?php echo $course->prerequisite; ?> <?php } ?> <em><?php echo $course->notes; ?></em> + + <?php if ($request->type->name == 'RemoveCourse') { ?> + </del> + <?php } ?> </div> + <?php if ($request->type->name == 'RemoveCourse') { ?> + <del> + <?php } ?> <?php echo $course->description; ?> + <?php if ($request->type->name == 'RemoveCourse') { ?> + </del> + <?php } ?> </div> diff --git a/application/views/request/fullEdit.xhtml b/application/views/request/fullEdit.xhtml index 27bceea9ab07c711fc7f47b61d3e8517e46eaac0..d08285faa48d6602f2a4ea47415e8dc7312620f5 100644 --- a/application/views/request/fullEdit.xhtml +++ b/application/views/request/fullEdit.xhtml @@ -4,6 +4,9 @@ +<?php if ($this->request->type->name != 'RemoveCourse') { ?> + + <div class="main_section"> <h2>Course ID</h2> @@ -614,6 +617,7 @@ </div> +<?php } // if not a remove course request ?> diff --git a/application/views/sidebars/bulletinPreview.xhtml b/application/views/sidebars/bulletinPreview.xhtml index 6afdf0f20fae8904394693ff9f14dd275121aa2f..bd508ea19427e135af76c2be22d6f33358f6bd65 100644 --- a/application/views/sidebars/bulletinPreview.xhtml +++ b/application/views/sidebars/bulletinPreview.xhtml @@ -2,7 +2,7 @@ <h4>Bulletin Preview</h4> <?php $originalCourse = $this->course->getParentGeneration(true); - if ($originalCourse) { + if ($originalCourse && $this->request->type->name != 'RemoveCourse') { echo $this->bulletinEntryDiff($originalCourse, $this->course, $this->request); } else { echo $this->bulletinEntry($this->course, $this->request);