diff --git a/application/modules/bulletin/controllers/EditController.php b/application/modules/bulletin/controllers/EditController.php
index f458188f2a9d51b56113fa9940438296bc39fe26..c02b2bef56285b96d449c7b41ed715df4af36fd4 100644
--- a/application/modules/bulletin/controllers/EditController.php
+++ b/application/modules/bulletin/controllers/EditController.php
@@ -15,7 +15,7 @@ class Bulletin_EditController extends Creq_Controller_Action
$this->view->title = Bulletin_UtilityModel::getTextBetweenTokens($session->fileContents, '<title>', '</title>');
$this->view->body = Bulletin_SectionModel::getBodyHtml($session->fileContents, '<body>', '</body>');
- foreach (Bulletin_SectionModel::parseHtml($session->fileContents) as $key => $value) {
+ foreach (Bulletin_SectionModel::parseHtml($session->fileContents, $section) as $key => $value) {
$this->view->$key = $value;
}
}
@@ -68,7 +68,7 @@ class Bulletin_EditController extends Creq_Controller_Action
{
$in = $this->getAllParams();
$uploads = new Zend_File_Transfer_Adapter_Http();
-
+
$session = new Zend_Session_Namespace('Edit Request ' . $in['id']);
$session->fileContents = Bulletin_SectionModel::reconstructHtml($in, $session->section);
diff --git a/application/modules/bulletin/models/SectionModel.php b/application/modules/bulletin/models/SectionModel.php
index 8566b4d476518cd8441471619a15eb29b6190cb5..662c4cce55edf4dbbfa431527f40b7165d8d880c 100644
--- a/application/modules/bulletin/models/SectionModel.php
+++ b/application/modules/bulletin/models/SectionModel.php
@@ -366,6 +366,11 @@ class Bulletin_SectionModel extends Unl_Model
$this->_data['year'] = $year;
}
+ public function hasQuickPoints()
+ {
+ return $this->getCollege() != 'OUP' && $this->getMajor();
+ }
+
static public $collegeSectionNames = array(
'description' => 'Description',
'admission' => 'Admission',
@@ -394,11 +399,90 @@ class Bulletin_SectionModel extends Unl_Model
'additionalMajorEndorsementRequirements' => 'Additional Major/Endorsement Requirements',
'requirementsForMinorOfferedByDepartment' => 'Requirements For Minor Offered By Department',
),
+ 'Other University Programs' => array(
+ 'Academic Policies and Procedures' => array(
+ 'creditHourDefinition' => 'Credit Hour Definition',
+ 'academicAdviserAssignment' => 'Academic Adviser Assignment',
+ 'studentsResponsibilitiesInAcademicAdvising' => 'Students Responsibilities in Academic Advising',
+ 'maximumCreditHourLoad' => 'Maximum Credit Hour Load',
+ 'classAttendance' => 'Class Attendance',
+ 'glossaryOfAcademicAndAdvisingTerms' => 'Glossary of Academic and Advising Terms',
+ 'subjectAreaAbbreviations' => 'Subject Area Abbreviations',
+ 'coursePrerequisitesAndCorequisites' => 'Course Prerequisites and Corequisites',
+ 'gradingSystem' => 'Grading System',
+ 'academicStandardsInstitutionalPolicy' => 'Academic Standards-Institutional Policy',
+ 'honorsConvocationRecognitionRequirements' => 'Honors Convocation Recognition Requirements',
+ 'recognitionOfOutstandingAcademicAchievement' => 'Recognition of Outstanding Academic Achievement',
+ 'gradingPolicies' => 'Grading Policies',
+ 'generalEducationRequirementsAce' => 'General Education Requirements (ACE)',
+ 'aceInstitutionalObjectivesAndStudentLearningOutcomes' => 'ACE Institutional Objectives and Student Learning Outcomes',
+ 'aceStructuralCriteria' => 'ACE Structural Criteria',
+ ),
+ 'Admissions' => array(
+ 'assuredAdmission' => 'Assured Admission',
+ 'deficiencies' => 'Deficiencies',
+ ),
+ 'Aerospace Studies/Air Force ROTC' => array(
+ 'description' => 'Description',
+ 'eligibilityAndEnrollment' => 'Eligibility and Enrollment',
+ 'programs' => 'Programs',
+ 'scholarshipsBenefits' => 'Scholarships/Benefits',
+ 'curriculum' => 'Curriculum',
+ 'creditHours' => 'Credit Hours',
+ 'militaryObligation' => 'Military Obligation',
+ 'fieldTrainingProgram' => 'FieldTrainingProgram',
+
+ ),
+ 'General Education Requirements (ACE)' => array(
+
+ ),
+ 'Graduate Studies' => array(
+ 'admissionOfUnlSeniors' => 'Admission of UNL Seniors',
+ 'graduateCoursesTakenByUnlSeniors' => 'Graduate Courses Taken by UNL Seniors',
+
+ ),
+ 'Jeffrey S. Raikes School of Computer Science and Management' => array(
+ // No Sections
+ ),
+ 'Military Science/Army ROTC' => array(
+ 'description' => 'Description',
+ 'objectives' => 'Objectives',
+ 'benefits' => 'Benefits',
+ 'participationInArmyRotc' => 'Participation in Army ROTC',
+ 'curriculum' => 'Curriculum',
+ 'commissioningRequirements' => 'Commissioning Requirements',
+ ),
+ 'Naval Science/Naval ROTC' => array(
+ 'description' => 'Description',
+ 'benefits' => 'Benefits',
+ 'curriculum' => 'Curriculum',
+ 'navalScienceOpenCurriculum' => 'Naval Science Open Curriculum',
+ 'individualizedProgramOfStudiesInNavalScience' => 'Individualized Program of Studies in Naval Science',
+ ),
+ 'Pre-Professional Studies' => array(
+ // No sections
+ ),
+ 'The Libraries' => array(
+ 'description' => 'Description',
+ 'coursesOfInstruction' => 'Courses of Instruction',
+ ),
+ 'Transfer' => array(
+ 'undergraduateTransferCreditPolicy' => 'Undergraduate Transfer Credit Policy',
+ 'transferCreditPractices' => 'Transfer Credit Practices',
+ 'aCreditPresentedForTransfer' => 'A. Credit presented for transfer from within the University of Nebraska System',
+ 'bInterInstitutionalAgreements' => 'B. Inter-institutional Agreements',
+ 'cCreditPresentedForTransfer' => 'C. Credit presented for transfer which requires additional review by the degree college',
+ 'specialSituationsAndLimitations' => 'Special Situations, Qualifications, and Limitations related to Transfer of Credit',
+ ),
+ 'University Honors Program' => array(
+ // No sections
+ ),
+ ),
);
static protected $_sectionHeaderTag = '<p class="content-box-h-1">';
- static public function parseHtml($html)
+ static public function parseHtml($html, self $section)
{
$html = strtr($html, array(" xml:lang='en-us'" => ''));
$html = strtr($html, array('content-box-m-p' => 'content-box-h-1'));
@@ -435,7 +519,7 @@ class Bulletin_SectionModel extends Unl_Model
$data[$key] = $value;
}
- $data['departmentSectionNames'] = self::getDepartmentSectionNames($data['college']);;
+ $data['departmentSectionNames'] = self::getDepartmentSectionNames($section->getCollegeLong(), $section->getMajor());
$sections = explode(self::$_sectionHeaderTag, $html);
array_shift($sections);
@@ -498,10 +582,10 @@ class Bulletin_SectionModel extends Unl_Model
</div>
<div class="generated-style">
EOF;
- if ($section->getMajor()) {
+ if ($section->hasQuickPoints()) {
$html .= <<<EOF
- <p class="quick-points"><span class="quick-point-bold">COLLEGE:</span> {$data['college']}</p>
+ <p class="quick-points"><span class="quick-point-bold">COLLEGE:</span> {$section->getCollegeLong()}</p>
<p class="quick-points"><span class="quick-point-bold">MAJOR:</span> {$section->getMajor()}</p>
<p class="quick-points"><span class="quick-point-bold">DEGREE OFFERED:</span> {$data['degreeOffered']}</p>
<p class="quick-points"><span class="quick-point-bold">HOURS REQUIRED:</span> {$data['hoursRequired']}</p>
@@ -511,7 +595,7 @@ EOF;
EOF;
}
- foreach (($section->getMajor() ? self::getDepartmentSectionNames($data['college']) : self::$collegeSectionNames) as $machineName => $humanName) {
+ foreach (($section->getMajor() ? self::getDepartmentSectionNames($section->getCollegeLong(), $section->getMajor()) : self::$collegeSectionNames) as $machineName => $humanName) {
if (!$data[$machineName]) {
continue;
}
@@ -546,11 +630,14 @@ EOF;
return $html;
}
- static public function getDepartmentSectionNames($college)
+ static public function getDepartmentSectionNames($college, $major)
{
$departmentSectionNames = self::$departmentSectionNames['default'];
if (isset(self::$departmentSectionNames[$college])) {
$departmentSectionNames = self::$departmentSectionNames[$college];
+ if (isset(self::$departmentSectionNames[$college][$major])) {
+ $departmentSectionNames = self::$departmentSectionNames[$college][$major];
+ }
}
return $departmentSectionNames;
}
diff --git a/application/modules/bulletin/views/scripts/edit/index.phtml b/application/modules/bulletin/views/scripts/edit/index.phtml
index c21d2553cbec10f9c470e7cea7a92432764b1114..ea84405ec9d5c6e6a4e8eaaadf3294e0249a2f1e 100644
--- a/application/modules/bulletin/views/scripts/edit/index.phtml
+++ b/application/modules/bulletin/views/scripts/edit/index.phtml
@@ -27,12 +27,8 @@ $this->layout()->pageTitle = 'Editing: ' . ($this->section->getMajor() ? $this->
<?php echo $this->formHidden('id', $this->formSessionId); ?>
- <?php if ($this->section->getMajor()) { ?>
+ <?php if ($this->section->hasQuickPoints()) { ?>
<h2>Quick Points</h2>
- <label>
- College<br/>
- <?php echo $this->formText('college', $this->college); ?><br/>
- </label>
<label>
Degree Offered<br/>
<?php echo $this->formText('degreeOffered', $this->degreeOffered); ?><br/>
@@ -53,6 +49,8 @@ $this->layout()->pageTitle = 'Editing: ' . ($this->section->getMajor() ? $this->
Chief Adviser<br/>
<?php echo $this->formText('chiefAdviser', $this->chiefAdviser); ?><br/>
</label>
+ <?php } ?>
+ <?php if ($this->section->getMajor()) { ?>
<?php foreach ($this->departmentSectionNames as $machineName => $humanName) { ?>
<h2><?php echo $humanName; ?></h2>
diff --git a/application/modules/bulletin/views/scripts/view/index.phtml b/application/modules/bulletin/views/scripts/view/index.phtml
index 8cf27e2855cb5af4adce7ee270d822522dbc586d..581f6b4b549b10dfa3bc44e8adea08f7ac4c65a2 100644
--- a/application/modules/bulletin/views/scripts/view/index.phtml
+++ b/application/modules/bulletin/views/scripts/view/index.phtml
@@ -8,8 +8,8 @@ if ($this->preview) {
$breadcrumb = 'Viewing';
}
$this->layout()->pageTitle = $breadcrumb . ': ' . ($this->section->getMajor() ? $this->section->getMajor() : $this->section->getCollegeLong()) . ' (' . $this->request->getTypeDescription() . ')';
-$originalSection = Bulletin_SectionModel::parseHtml($this->originalFileContents);
-$proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents);
+$originalSection = Bulletin_SectionModel::parseHtml($this->originalFileContents, $this->section);
+$proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents, $this->section);
?>
<?php if ($this->decisionMessage) { ?>
@@ -20,9 +20,9 @@ $proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents)
<div class="current wdn-col">
<h2>Current</h2>
<div class="bulletinEntry">
- <?php if ($this->section->getMajor()) { ?>
+ <?php if ($this->section->hasQuickPoints()) { ?>
<h2 class="sec_header content-box-h-1">Quick Points</h2>
- <b>College:</b> <?php echo $this->htmlDiff($this->escape($originalSection['college']), $this->escape($proposedSection['college'])); ?><br/>
+ <b>College:</b> <?php echo $this->section->getCollegeLong(); ?><br/>
<b>Degree Offered:</b> <?php echo $this->htmlDiff($this->escape($originalSection['degreeOffered']), $this->escape($proposedSection['degreeOffered'])); ?><br/>
<b>Hours Required:</b> <?php echo $this->htmlDiff($this->escape($originalSection['hoursRequired']), $this->escape($proposedSection['hoursRequired'])); ?><br/>
<b>Minimum Cumulative GPA:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minimumCumulativeGpa']), $this->escape($proposedSection['minimumCumulativeGpa'])); ?><br/>
@@ -35,9 +35,9 @@ $proposedSection = Bulletin_SectionModel::parseHtml($this->proposedFileContents)
<div class="proposed wdn-col">
<h2>Proposed</h2>
<div class="bulletinEntry">
- <?php if ($this->section->getMajor()) { ?>
+ <?php if ($this->section->hasQuickPoints()) { ?>
<h2 class="sec_header content-box-h-1">Quick Points</h2>
- <b>College:</b> <?php echo $this->htmlDiff($this->escape($originalSection['college']), $this->escape($proposedSection['college'])); ?><br/>
+ <b>College:</b> <?php echo $this->section->getCollegeLong(); ?><br/>
<b>Degree Offered:</b> <?php echo $this->htmlDiff($this->escape($originalSection['degreeOffered']), $this->escape($proposedSection['degreeOffered'])); ?><br/>
<b>Hours Required:</b> <?php echo $this->htmlDiff($this->escape($originalSection['hoursRequired']), $this->escape($proposedSection['hoursRequired'])); ?><br/>
<b>Minimum Cumulative GPA:</b> <?php echo $this->htmlDiff($this->escape($originalSection['minimumCumulativeGpa']), $this->escape($proposedSection['minimumCumulativeGpa'])); ?><br/>