diff --git a/application/controllers/NewrequestController.php b/application/controllers/NewrequestController.php index f8d99e82bfde444aae72061ee9d1629357c6117e..db9ac4f58422fab1c87f4b2ab92ebccd6176864e 100644 --- a/application/controllers/NewrequestController.php +++ b/application/controllers/NewrequestController.php @@ -361,6 +361,7 @@ class NewRequestController extends Nmc_Controller_Action $requestFormOrder = array('CourseID', 'CreditHours', 'TimeLocation', + 'NotesDescription', 'GraduateTieIn', 'SupportiveMaterial', //'AdditionalInformation', @@ -475,6 +476,25 @@ class NewRequestController extends Nmc_Controller_Action echo $out->render('index.xhtml'); } + public function notesDescriptionAction() + { + $out = new Nmc_View(); + + $out->page = 'request/edit_wrapper'; + $out->requestPage = 'notes_description'; + $out->css_files[] = '/css/request/nodes_description.css'; + $out->js_files[] = '/tinymce/jscripts/tiny_mce/tiny_mce.js'; + $out->js_files[] = '/javascript/mce.js'; + + $course = Nmc_Registry_Session::getInstance()->course; + $request = Nmc_Registry_Session::getInstance()->request; + + $out->course = $course; + $out->request = $request; + + echo $out->render('index.xhtml'); + } + public function graduateTieInAction() { $out = new Nmc_View(); diff --git a/application/views/request/edit_wrapper.xhtml b/application/views/request/edit_wrapper.xhtml index 2352f2f8d5e6dbe5bd211ece4a431a3e5883041b..164e99c3014651af28041c402e35c959c19106e8 100644 --- a/application/views/request/edit_wrapper.xhtml +++ b/application/views/request/edit_wrapper.xhtml @@ -14,6 +14,9 @@ <li> <a href="/NewRequest/TimeLocation">Time, Locations Taught</a> </li> + <li> + <a href="/NewRequest/NotesDescription">Notes & Description</a> + </li> <li> <a href="/NewRequest/GraduateTieIn">Graduate Tie-in</a> </li> diff --git a/application/views/request/graduate_tie_in.xhtml b/application/views/request/graduate_tie_in.xhtml index 9eed96d97c1e7777821c98c3223e195cbb28fd96..48a1feedca1ac1e105727aebf7f418a0f8e43854 100644 --- a/application/views/request/graduate_tie_in.xhtml +++ b/application/views/request/graduate_tie_in.xhtml @@ -1,17 +1,10 @@ -<fieldset> - <label> - <h2>Notes (will appear in italics)</h2> - <textarea name="notes" class="mceEditor"><?php echo htmlspecialchars($this->course->notes); ?></textarea> - </label> - <label> - <h2>Description</h2> - <textarea name="description" class="mceEditor"><?php echo htmlspecialchars($this->course->description); ?></textarea> - </label> -</fieldset> - <?php if($this->hasGradTieIn) { ?> <fieldset> <h2>Graduate Tie-in</h2> + <span id="grad_tie_in_note"> + Grad Tie-in is <em>only</em> completed if credits, notes, + or prerequisites differ from 400-level course. + </span> <label> <h3>Credits</h3> <input type="text" name="gradTieIn[credits]" value ="<?php echo htmlspecialchars($this->course->gradTieIn->credits); ?>" />