From c51e4192760ec1188955b83c1d13c8374c940734 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 1 Aug 2007 22:17:38 +0000
Subject: [PATCH] Various small fixes.
---
application/controllers/AuthController.php | 4 +-
.../controllers/ConflictController.php | 7 ---
application/controllers/HomeController.php | 2 +-
application/controllers/IndexController.php | 2 +-
application/controllers/RequestController.php | 47 +++++++++++++++----
application/library/View.php | 6 +++
application/models/rows/CourseGeneration.php | 2 +-
.../models/tables/CourseGenerations.php | 4 ++
application/views/home.xhtml | 6 +--
application/views/request/submit.xhtml | 3 +-
application/views/request/time_location.xhtml | 26 ++++++++++
.../views/sidebars/bulletinPreview.xhtml | 13 +++++
application/views/sidebars/navigation.xhtml | 2 -
.../views/sidebars/requestProgress.xhtml | 3 --
document_root/css/index.oss | 11 ++---
document_root/javascript/mce.js | 4 +-
16 files changed, 105 insertions(+), 37 deletions(-)
create mode 100644 application/views/sidebars/bulletinPreview.xhtml
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index af1cd59a..fef7b333 100644
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -18,7 +18,7 @@ class AuthController extends Nmc_Controller_Action
$postData = $in->getPost();
$out = new Application_View();
- $out->title = 'Processing...';
+ $out->tagline = 'Processing...';
try {
$auth = Nmc_Auth::getInstance();
@@ -93,7 +93,7 @@ class AuthController extends Nmc_Controller_Action
Nmc_User::getInstance()->logout();
Nmc_Auth::getInstance()->clearIdentity();
$out = new Application_View();
- $out->assign('location', '/');
+ $out->location = '/';
echo $out->render('unlModernWrapper.xhtml');
}
diff --git a/application/controllers/ConflictController.php b/application/controllers/ConflictController.php
index 2b53cd38..0edd8ff2 100644
--- a/application/controllers/ConflictController.php
+++ b/application/controllers/ConflictController.php
@@ -8,13 +8,6 @@ class ConflictController extends Nmc_Controller_Action
$this->_registerPlugin(new Nmc_Controller_Action_Plugin_Authorize());
}
- public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
- {
- parent::__construct($request, $response, $invokeArgs);
- $this->_registerPlugin(new Nmc_Controller_Action_Plugin_Authorize());
- //$this->_registerPlugin(new Nmc_Controller_Action_Plugin_Test());
- }
-
public function indexAction()
{
$skippedRecords = Nmc_Registry_Session::getInstance('conflict')->skippedRecords;
diff --git a/application/controllers/HomeController.php b/application/controllers/HomeController.php
index b4a70e53..e604e206 100644
--- a/application/controllers/HomeController.php
+++ b/application/controllers/HomeController.php
@@ -20,7 +20,7 @@ class HomeController extends Nmc_Controller_Action
$out->roles = $roles;
$out->myRequests = $requests;
$out->page = 'home';
- $out->title = 'My Requests';
+ $out->tagline = 'My Requests';
echo $out->render('unlModernWrapper.xhtml');
}
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 11597675..2cb48a3f 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -8,7 +8,7 @@ class IndexController extends Nmc_Controller_Action
$out = new Application_View();
$out->addScriptPath(APPLICATION_PATH . DIRECTORY_SEPARATOR . 'views');
$out->page = 'login';
- $out->title = 'Curriculum Action Request';
+ $out->tagline = '';
echo $out->render('unlModernWrapper.xhtml');
}
diff --git a/application/controllers/RequestController.php b/application/controllers/RequestController.php
index 4495a41a..61dbb069 100755
--- a/application/controllers/RequestController.php
+++ b/application/controllers/RequestController.php
@@ -23,6 +23,7 @@ class RequestController extends Nmc_Controller_Action
$out = new Application_View();
$out->page = 'request/search';
$out->addCssFile('/ooss/request/edit_wrapper');
+ $out->tagline = 'Course Search';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -57,6 +58,8 @@ class RequestController extends Nmc_Controller_Action
Nmc_Registry_Session::getInstance()->course = $course;
}
+
+ $out->tagline = 'Course Search Results';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -148,6 +151,7 @@ class RequestController extends Nmc_Controller_Action
$view->currentGeneration = $currentGeneration;
$view->proposedGeneration = $proposedGeneration;
$view->comments = $comments;
+ $view->tagline = 'View Request';
$view->addHelperPath(APPLICATION_PATH . '/library/View/Helper', 'Application_View_Helper');
$out = $this->getResponse();
@@ -170,6 +174,7 @@ class RequestController extends Nmc_Controller_Action
$view = new Application_View();
$view->refresh = '/Request/View/' . $requestId;
+ $view->tagline = 'Processing...';
$out = $this->getResponse();
$out->setBody($view->render('unlModernWrapper.xhtml'));
@@ -411,6 +416,10 @@ class RequestController extends Nmc_Controller_Action
if($submit == 'Submit') {
return $this->_submitRequestAction();
+ } else if ($submit == 'Save for Later Submission') {
+ // save for later
+ } else if ($submit == 'CancelRequest') {
+ return $this->_cancelRequest();
}
$out = new Application_View();
@@ -474,14 +483,16 @@ class RequestController extends Nmc_Controller_Action
$view = new Application_View();
$view->addSidebarModule('requestProgress');
+ $view->addSidebarModule('bulletinPreview');
$view->page = 'request/edit_wrapper';
$view->requestPage = 'course_id';
$view->addCssFile('/ooss/request/course_id');
- $view->js_files[] = '/tinymce/jscripts/tiny_mce/tiny_mce.js';
- $view->js_files[] = '/javascript/mce.js';
+ $view->addJsFile('/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ $view->addJsFile('/javascript/mce.js');
$view->course = $course;
$view->request = $request;
+ $view->tagline = 'Edit Request';
$out = $this->getResponse();
$out->setHeader('Content-type', 'application/xhtml+xml; charset=UTF-8');
@@ -496,11 +507,14 @@ class RequestController extends Nmc_Controller_Action
$out->page = 'request/edit_wrapper';
$out->requestPage = 'credit_hours';
$out->addCssFile('/ooss/request/credit_hours');
+ $out->addJsFile('/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ $out->addJsFile('/javascript/mce.js');
$course = Nmc_Registry_Session::getInstance()->course;
$request = Nmc_Registry_Session::getInstance()->request;
$out->course = $course;
$out->request = $request;
+ $out->tagline = 'Edit Request';
$creditsSingleValues = array();
foreach($course->credits as $credit) {
@@ -529,11 +543,13 @@ class RequestController extends Nmc_Controller_Action
$out->page = 'request/edit_wrapper';
$out->requestPage = 'time_location';
$out->addCssFile('/ooss/request/time_location');
+ $out->addJsFile('/javascript/request/time_location.js');
$course = Nmc_Registry_Session::getInstance()->course;
$request = Nmc_Registry_Session::getInstance()->request;
$out->course = $course;
$out->request = $request;
+ $out->tagline = 'Edit Request';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -546,14 +562,15 @@ class RequestController extends Nmc_Controller_Action
$out->page = 'request/edit_wrapper';
$out->requestPage = 'notes_description';
$out->addCssFile('/ooss/request/nodes_description');
- $out->js_files[] = '/tinymce/jscripts/tiny_mce/tiny_mce.js';
- $out->js_files[] = '/javascript/mce.js';
+ $out->addJsFile('/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ $out->addJsFile('/javascript/mce.js');
$course = Nmc_Registry_Session::getInstance()->course;
$request = Nmc_Registry_Session::getInstance()->request;
$out->course = $course;
$out->request = $request;
+ $out->tagline = 'Edit Request';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -566,8 +583,8 @@ class RequestController extends Nmc_Controller_Action
$out->page = 'request/edit_wrapper';
$out->requestPage = 'graduate_tie_in';
$out->addCssFile('/ooss/request/graduate_tie_in');
- $out->js_files[] = '/tinymce/jscripts/tiny_mce/tiny_mce.js';
- $out->js_files[] = '/javascript/mce.js';
+ $out->addJsFile('/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ $out->addJsFile('/javascript/mce.js');
$course = Nmc_Registry_Session::getInstance()->course;
$request = Nmc_Registry_Session::getInstance()->request;
@@ -582,6 +599,7 @@ class RequestController extends Nmc_Controller_Action
$out->hasGradTieIn = $hasGradTieIn;
$out->course = $course;
$out->request = $request;
+ $out->tagline = 'Edit Request';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -594,13 +612,14 @@ class RequestController extends Nmc_Controller_Action
$out->page = 'request/edit_wrapper';
$out->requestPage = 'supportive_material';
$out->addCssFile('/ooss/request/supportave_material');
- $out->js_files[] = '/tinymce/jscripts/tiny_mce/tiny_mce.js';
- $out->js_files[] = '/javascript/mce.js';
+ $out->addJsFile('/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ $out->addJsFile('/javascript/mce.js');
$course = Nmc_Registry_Session::getInstance()->course;
$out->course = $course;
$request = Nmc_Registry_Session::getInstance()->request;
$out->request = $request;
+ $out->tagline = 'Edit Request';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -618,6 +637,7 @@ class RequestController extends Nmc_Controller_Action
$request = Nmc_Registry_Session::getInstance()->request;
$out->course = $course;
$out->request = $request;
+ $out->tagline = 'Edit Request';
echo $out->render('unlModernWrapper.xhtml');
}
@@ -632,6 +652,7 @@ class RequestController extends Nmc_Controller_Action
$out->course = $course;
$out->request = $request;
$out->page = 'request/edit_wrapper';
+ $out->tagline = 'Edit Request';
$out->requestPage = 'submit';
$out->addCssFile('/ooss/request/submit');
@@ -659,6 +680,16 @@ class RequestController extends Nmc_Controller_Action
throw $e;
}
}
+
+ protected function _cancelRequest()
+ {
+ Nmc_Registry_Session::getInstance()->erase('course');
+ Nmc_Registry_Session::getInstance()->erase('request');
+
+ $view = new Application_View();
+ $view->refresh = '/home';
+ echo $view->render('unlModernWrapper.xhtml');
+ }
}
?>
diff --git a/application/library/View.php b/application/library/View.php
index 978cc415..07856236 100644
--- a/application/library/View.php
+++ b/application/library/View.php
@@ -7,9 +7,15 @@ class Application_View extends Nmc_View_UnlModern
public function __construct($config = array())
{
parent::__construct($config);
+
+ $this->addHelperPath(APPLICATION_PATH
+ . DIRECTORY_SEPARATOR . 'library'
+ . DIRECTORY_SEPARATOR . 'View'
+ . DIRECTORY_SEPARATOR . 'Helper', 'Application_View_Helper');
$this->addCssFile('/ooss/index');
$this->addCssFile('/ooss/common');
$this->_sidebarModules[] = 'navigation';
+ $this->title = "Curriculum Action Request";
}
public function addSidebarModule($moduleName) {
diff --git a/application/models/rows/CourseGeneration.php b/application/models/rows/CourseGeneration.php
index 75e4820e..d748bfe9 100644
--- a/application/models/rows/CourseGeneration.php
+++ b/application/models/rows/CourseGeneration.php
@@ -162,7 +162,7 @@ class CourseGeneration extends Asset
if (is_null($courseCode)) {
return false;
}
- return CourseEsDesignations::getInstance()->isCourseCodeEssentialStudies($courseCode);
+ return CourseEsDesignations::getInstance()->isCourseCodeEssentialStudies($courseCode, $college);
}
/**
diff --git a/application/models/tables/CourseGenerations.php b/application/models/tables/CourseGenerations.php
index 43ad83d0..5b3ba0a8 100644
--- a/application/models/tables/CourseGenerations.php
+++ b/application/models/tables/CourseGenerations.php
@@ -115,6 +115,7 @@ class CourseGenerations extends Nmc_Db_Table
$newHomeCrosslist = CourseCrosslistings::getInstance()->fetchNew();
$newHomeCrosslist->type = 'home listing';
+ /*
$newFixedCredit = CourseCredits::getInstance()->fetchNew();
$newFixedCredit->type = 1;
$newFixedCredit->hours = 3;
@@ -122,12 +123,15 @@ class CourseGenerations extends Nmc_Db_Table
$newMaxCredit = CourseCredits::getInstance()->fetchNew();
$newMaxCredit->type = 5;
$newMaxCredit->hours = 3;
+ */
$newRecord = parent::fetchNew();
$newRecord->termsOffered = array('Fall', 'Spring', 'Summer');
$newRecord->gradingType = 'unrestricted';
+ /*
$newRecord->credits[] = $newFixedCredit;
$newRecord->credits[] = $newMaxCredit;
+ */
$newRecord->deliveryMethods = array('Classroom');
$newRecord->campuses = array('UNL');
diff --git a/application/views/home.xhtml b/application/views/home.xhtml
index 8cb00a5c..57c2425f 100755
--- a/application/views/home.xhtml
+++ b/application/views/home.xhtml
@@ -17,7 +17,7 @@
<div class="tr"></div>
<div class="tl">
<h2>Activity</h2>
- <h3><em>Curent Roll:</em> Yourself</h3>
+ <h3><em>Current Role:</em> Yourself</h3>
</div>
<div class="bl"></div>
</div>
@@ -81,7 +81,7 @@
<div class="tr"></div>
<div class="tl">
<h2>Activity</h2>
- <h3><em>Curent Roll:</em> <?php echo $role->name; ?></h3>
+ <h3><em>Current Role:</em> <?php echo $role->name; ?></h3>
</div>
<div class="bl"></div>
</div>
@@ -146,4 +146,4 @@
</div>
<?php } ?>
-<?php echo nl2br(Nmc_Registry_Session::getInstance()->loginError); ?>
\ No newline at end of file
+<?php echo nl2br(Nmc_Registry_Session::getInstance()->loginError); ?>
diff --git a/application/views/request/submit.xhtml b/application/views/request/submit.xhtml
index b867e8ba..d09ae7ca 100644
--- a/application/views/request/submit.xhtml
+++ b/application/views/request/submit.xhtml
@@ -11,4 +11,5 @@
</h2>
<input id="submit_request" type="submit" name="submit" value="Submit" />
-<input id="save_request" type="submit" name="submit" value="Save for Later Submission" />
\ No newline at end of file
+<input id="save_request" type="submit" name="submit" value="Save for Later Submission" />
+<input id="cancel_request" type="submit" name="submit" value="Cancel Request" />
\ No newline at end of file
diff --git a/application/views/request/time_location.xhtml b/application/views/request/time_location.xhtml
index 7e5f3ca9..6a9f175d 100644
--- a/application/views/request/time_location.xhtml
+++ b/application/views/request/time_location.xhtml
@@ -112,4 +112,30 @@
<?php } ?>
/>
</label>
+</fieldset>
+
+<h2>HSS Status</h2>
+<fieldset class="three_column">
+ <label>
+ Integrated Studies
+ <input type="checkbox"
+ name="__integratedStudies"
+ disabled="disabled"
+ value="UNL"
+ <?php if($this->course->integratedStudies == 'yes') { ?>
+ checked="checked"
+ <?php } ?>
+ />
+ </label>
+ <label>
+ Essential Studies
+ <input type="checkbox"
+ name="__essentialStudies"
+ disabled="disabled"
+ value="UNO"
+ <?php if($this->course->isEssentialStudies()) { ?>
+ checked="checked"
+ <?php } ?>
+ />
+ </label>
</fieldset>
\ No newline at end of file
diff --git a/application/views/sidebars/bulletinPreview.xhtml b/application/views/sidebars/bulletinPreview.xhtml
new file mode 100644
index 00000000..ea191835
--- /dev/null
+++ b/application/views/sidebars/bulletinPreview.xhtml
@@ -0,0 +1,13 @@
+<div id="ntohunteh" class="titled_box">
+ <div class="box_shadow_2">
+ <div class="tr"></div>
+ <div class="tl">
+ <h2>Bulletin Preview</h2>
+ </div>
+ <div class="bl"></div>
+ </div>
+ <div class="content">
+ <?php echo $this->bulletinEntry($this->course); ?>
+ </div>
+</div>
+
diff --git a/application/views/sidebars/navigation.xhtml b/application/views/sidebars/navigation.xhtml
index ab399b0f..1f10e097 100644
--- a/application/views/sidebars/navigation.xhtml
+++ b/application/views/sidebars/navigation.xhtml
@@ -11,8 +11,6 @@
<ul>
<li><a href="/Home">My Requests</a></li>
<li><a href="/Request/Search">New Request</a></li>
- <li><a href="/">Menu Item</a></li>
- <li><a href="/">Menu Item</a></li>
</ul>
</div>
</div>
diff --git a/application/views/sidebars/requestProgress.xhtml b/application/views/sidebars/requestProgress.xhtml
index 00f799e4..b8984d6c 100644
--- a/application/views/sidebars/requestProgress.xhtml
+++ b/application/views/sidebars/requestProgress.xhtml
@@ -37,8 +37,5 @@
<div id="request_type_reminder">
Request Type: <?php echo $this->request->type->name; ?>
</div>
- <div id="bulletin_preview">
- <?php $course = $this->course; include('bulletinEntry.xhtml'); ?>
- </div>
</div>
</div>
diff --git a/document_root/css/index.oss b/document_root/css/index.oss
index 4bdba899..67341e62 100755
--- a/document_root/css/index.oss
+++ b/document_root/css/index.oss
@@ -40,16 +40,15 @@
}
li a {
- display:block;
- height:46px;
- margin:0pt;
- padding:0pt;
- width:218px;
+ display: block;
+ height: 46px;
+ margin: 0px;
+ padding: 0px;
+ width: 218px;
background: transparent;
font-size: 18px;
- padding-left: 30px;
padding-top: 15px;
}
}
diff --git a/document_root/javascript/mce.js b/document_root/javascript/mce.js
index cfb1777a..e9a2f1fd 100644
--- a/document_root/javascript/mce.js
+++ b/document_root/javascript/mce.js
@@ -1,11 +1,11 @@
tinyMCE.init({
mode : "textareas",
theme : "advanced",
- plugins : "spellchecker, crosslistings, noneditable",
+ plugins : "spellchecker",//, crosslistings, noneditable",
editor_selector : "mceEditor",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
- theme_advanced_buttons1 : "bold, italic, underline, sub, sup, spellchecker, crosslistings",
+ theme_advanced_buttons1 : "bold, italic, underline, sub, sup, spellchecker", //, crosslistings",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
noneditable_noneditable_class : "mceNonEditable"
--
GitLab