Skip to content
Snippets Groups Projects
Commit c51e4192 authored by Tim Steiner's avatar Tim Steiner
Browse files

Various small fixes.

parent eff26b57
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 105 additions and 37 deletions
application/controllers/AuthController.php
+ 2
− 2
View file @ c51e4192
......@@ -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');
}
......
application/controllers/ConflictController.php
+ 0
− 7
View file @ c51e4192
......@@ -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;
......
application/controllers/HomeController.php
+ 1
− 1
View file @ c51e4192
......@@ -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');
}
......
application/controllers/IndexController.php
+ 1
− 1
View file @ c51e4192
......@@ -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');
}
......
application/controllers/RequestController.php
+ 39
− 8
View file @ c51e4192
......@@ -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');
}
}
?>
application/library/View.php
+ 6
− 0
View file @ c51e4192
......@@ -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) {
......
application/models/rows/CourseGeneration.php
+ 1
− 1
View file @ c51e4192
......@@ -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);
}
/**
......
application/models/tables/CourseGenerations.php
+ 4
− 0
View file @ c51e4192
......@@ -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');
......
application/views/home.xhtml
+ 3
− 3
View file @ c51e4192
......@@ -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>
......
application/views/request/submit.xhtml
+ 2
− 1
View file @ c51e4192
......@@ -12,3 +12,4 @@
<input id="submit_request" type="submit" name="submit" value="Submit" />
<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
application/views/request/time_location.xhtml
+ 26
− 0
View file @ c51e4192
......@@ -113,3 +113,29 @@
/>
</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
application/views/sidebars/bulletinPreview.xhtml 0 → 100644
+ 13
− 0
View file @ c51e4192
<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>
application/views/sidebars/navigation.xhtml
+ 0
− 2
View file @ c51e4192
......@@ -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>
......
application/views/sidebars/requestProgress.xhtml
+ 0
− 3
View file @ c51e4192
......@@ -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>
document_root/css/index.oss
+ 5
− 6
View file @ c51e4192
......@@ -42,14 +42,13 @@
li a {
display: block;
height: 46px;
margin:0pt;
padding:0pt;
margin: 0px;
padding: 0px;
width: 218px;
background: transparent;
font-size: 18px;
padding-left: 30px;
padding-top: 15px;
}
}
......
document_root/javascript/mce.js
+ 2
− 2
View file @ c51e4192
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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment