diff --git a/application/modules/courses/views/scripts/edit/index.phtml b/application/modules/courses/views/scripts/edit/index.phtml index 366609a3fac2e5e1f3c50c3ea638aeb267d11654..c4b37f2a2b96d38d86c010e1184640a2d8ae9798 100644 --- a/application/modules/courses/views/scripts/edit/index.phtml +++ b/application/modules/courses/views/scripts/edit/index.phtml @@ -2,7 +2,7 @@ <?php $this->headScript()->appendFile($this->baseUrl() . '/tinymce/jscripts/tiny_mce/tiny_mce.js'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/tinymce.js'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/edit.js'); ?> -<?php $this->layout()->tagline = 'Editing: ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')'; ?> +<?php $this->layout()->breadcrumbs = array('Editing: ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')'); ?> <form action="<?php echo $this->url(array('action' => 'edit.post')); ?>" enctype="multipart/form-data" method="post"> diff --git a/application/modules/courses/views/scripts/public-view/results.phtml b/application/modules/courses/views/scripts/public-view/results.phtml index eb3b33a48e3b445e412e7ab2495ecf2d091c8889..27d0bee6c9b19164edf0c2bf1b2104efd896240b 100644 --- a/application/modules/courses/views/scripts/public-view/results.phtml +++ b/application/modules/courses/views/scripts/public-view/results.phtml @@ -1,5 +1,5 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/iace/reports/weekly.css', 'all'); ?> -<?php $this->layout()->tagline = 'Curriculum Search'; ?> +<?php $this->layout()->breadcrumbs = array('Curriculum Search'); ?> <?php $this->layout()->hideMenu = true; ?> <h2>Results for:</h2> diff --git a/application/modules/courses/views/scripts/public-view/search.phtml b/application/modules/courses/views/scripts/public-view/search.phtml index b82eef142a072a1ebe2872c84eee276827e8a0f2..4d1c95c3f093696eda8c464514812827e5ad1722 100644 --- a/application/modules/courses/views/scripts/public-view/search.phtml +++ b/application/modules/courses/views/scripts/public-view/search.phtml @@ -1,7 +1,7 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/courses/public-view/search.css', 'all'); ?> <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/iace/reports/weekly.css', 'all'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/public-view/search.js'); ?> -<?php $this->layout()->tagline = 'Curriculum Search'; ?> +<?php $this->layout()->breadcrumbs = array('Curriculum Search'); ?> <?php $this->layout()->hideMenu = true; ?> <?php if ($this->hasSearched) { ?> diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml index 819af851091e56c7f381d481fa82a05ef4bc7adf..e6a662772c4f46c533789f263ca07e2fbe11b92a 100644 --- a/application/modules/courses/views/scripts/view/index.phtml +++ b/application/modules/courses/views/scripts/view/index.phtml @@ -2,11 +2,11 @@ <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/view.js'); ?> <?php if ($this->preview) { - $tagline = 'Previewing'; + $breadcrumb = 'Previewing'; } else { - $tagline = 'Viewing'; + $breadcrumb = 'Viewing'; } -$this->layout()->tagline = $tagline . ': ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')'; +$this->layout()->breadcrumbs = array($breadcrumb . ': ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')'); ?> <div id="viewRequest"> <?php echo $this->partial('view/course-info.phtml', $this); ?> diff --git a/application/modules/default/views/scripts/index/index.phtml b/application/modules/default/views/scripts/index/index.phtml index 56f2ba4b2e5c31a1d9e37598eecb285d90905066..88722a51c5b5883cf329a4d581904b4220eb675e 100644 --- a/application/modules/default/views/scripts/index/index.phtml +++ b/application/modules/default/views/scripts/index/index.phtml @@ -1,4 +1,4 @@ -<?php $this->layout()->tagline = 'Welcome'; ?> +<?php $this->layout()->breadcrumbs = array('Welcome'); ?> <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/index/index.css', 'all'); ?> <div id="announcements" class="titled_box"> diff --git a/application/modules/default/views/scripts/layout.phtml b/application/modules/default/views/scripts/layout.phtml index 3f8cb84540e2e7cd1178018b5965f1f3d1fa748b..e6a42a8079d5ef428e57f553e34eac1ab76a668a 100644 --- a/application/modules/default/views/scripts/layout.phtml +++ b/application/modules/default/views/scripts/layout.phtml @@ -7,12 +7,9 @@ $this->headScript()->prependFile($this->baseUrl() . '/javascript/index.js'); if (!$this->layout()->template) { $this->layout()->template = 'Fixed'; } -if (!$this->layout()->title) { - $this->layout()->title = 'Course Approval'; -} -if (!$this->layout()->tagline) { - $this->layout()->tagline = ''; -} + +$this->layout()->title = 'Office of Undergraduate Studies'; +$this->layout()->tagline = 'Course Approval'; $template = UNL_Templates::factory($this->layout()->template, array('sharedcodepath' => 'sharedcode')); $template->titlegraphic = '<h1>' . $this->layout()->title . '</h1>' @@ -41,17 +38,10 @@ $template->loadSharedCodeFiles(); $defaultBreadcrumbs = array( '<a href="http://www.unl.edu/">UNL</a>', - '<a href="http://www.unl.edu/ous">Undergraduate Studies</a>' + '<a href="http://www.unl.edu/ous">Undergraduate Studies</a>', + '<a href="' . Zend_Controller_Front::getInstance()->getBaseUrl() . '">Course Approval</a>' ); -if (!$this->layout()->breadcrumbs && $this->layout()->title) { - $defaultBreadcrumbs[] = '<a href="' . Zend_Controller_Front::getInstance()->getBaseUrl() . '">' . $this->layout()->title . '</a>'; -} - -if (!$this->layout()->breadcrumbs && $this->layout()->tagline) { - $defaultBreadcrumbs[] = $this->layout()->tagline; -} - $this->layout()->breadcrumbs = array_merge($defaultBreadcrumbs, (array) $this->layout()->breadcrumbs); $breadcrumbCount = 0; diff --git a/application/modules/iace/views/scripts/reports/through-date.phtml b/application/modules/iace/views/scripts/reports/through-date.phtml index 4903aaf3a33502f932226cd29f4525a3e534262d..dfa980f7bb397d11779421955d5cf876746edfff 100644 --- a/application/modules/iace/views/scripts/reports/through-date.phtml +++ b/application/modules/iace/views/scripts/reports/through-date.phtml @@ -1,5 +1,4 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/iace/reports/weekly.css', 'all'); ?> -<?php $this->layout()->tagline = ''; ?> <?php $this->layout()->hideMenu = true; ?> <h2> diff --git a/application/modules/iace/views/scripts/reports/weekly.phtml b/application/modules/iace/views/scripts/reports/weekly.phtml index 33c68ee0a28ea157aba8de05706c4d71ea750731..d8e410308a5ff947bcdc4ec2f4c486ba1985f127 100644 --- a/application/modules/iace/views/scripts/reports/weekly.phtml +++ b/application/modules/iace/views/scripts/reports/weekly.phtml @@ -1,5 +1,4 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/iace/reports/weekly.css', 'all'); ?> -<?php $this->layout()->tagline = ''; ?> <?php $this->layout()->hideMenu = true; ?> <h2> diff --git a/application/modules/requests/views/scripts/approval-body-admin/edit-body.phtml b/application/modules/requests/views/scripts/approval-body-admin/edit-body.phtml index 6229b9d746733a7ec7fc03b1581234621f1d0fd7..0559f525c32b2aeafc3dd0656b5abaa9358d4cbe 100644 --- a/application/modules/requests/views/scripts/approval-body-admin/edit-body.phtml +++ b/application/modules/requests/views/scripts/approval-body-admin/edit-body.phtml @@ -1,6 +1,6 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/requests/approval-body-admin.css', 'all'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/requests/approval-body-admin.js'); ?> -<?php $this->layout()->tagline = 'Approval Body Admin'; ?> +<?php $this->layout()->breadcrumbs = array('Approval Body Admin'); ?> <?php $this->layout()->hideMenu = true; ?> <?php if ($this->approvalBody->getId()) { ?> diff --git a/application/modules/requests/views/scripts/approval-body-admin/edit-role.phtml b/application/modules/requests/views/scripts/approval-body-admin/edit-role.phtml index 7394c25c929049f156df8b58db3a07054cc250b4..723f7216161df742f5a1a1c755a7eafdf3070942 100644 --- a/application/modules/requests/views/scripts/approval-body-admin/edit-role.phtml +++ b/application/modules/requests/views/scripts/approval-body-admin/edit-role.phtml @@ -2,7 +2,7 @@ <?php $this->headScript()->appendFile($this->baseUrl() . '/tinymce/jscripts/tiny_mce/tiny_mce.js'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/tinymce.js'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/requests/approval-body-admin.js'); ?> -<?php $this->layout()->tagline = 'Approval Body Admin'; ?> +<?php $this->layout()->breadcrumbs = array('Approval Body Admin'); ?> <?php $this->layout()->hideMenu = true; ?> diff --git a/application/modules/requests/views/scripts/approval-body-admin/index.phtml b/application/modules/requests/views/scripts/approval-body-admin/index.phtml index 3569066557042f114c19e8dd0a8b8fced48d85ca..0e191c60229da466b44b3bca155be411d6e95479 100644 --- a/application/modules/requests/views/scripts/approval-body-admin/index.phtml +++ b/application/modules/requests/views/scripts/approval-body-admin/index.phtml @@ -1,6 +1,6 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/requests/approval-body-admin.css', 'all'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/requests/approval-body-admin.js'); ?> -<?php $this->layout()->tagline = 'Approval Body Admin'; ?> +<?php $this->layout()->breadcrumbs = array('Approval Body Admin'); ?> <?php $this->layout()->hideMenu = true; ?> <ul class="editMenu"> diff --git a/application/modules/requests/views/scripts/approval-chain-manager/index.phtml b/application/modules/requests/views/scripts/approval-chain-manager/index.phtml index 5edcbd468fc74997a4459733139dd8f6e8450860..162ff2ed32ca09bc013cafc92089aa4c666a4eae 100644 --- a/application/modules/requests/views/scripts/approval-chain-manager/index.phtml +++ b/application/modules/requests/views/scripts/approval-chain-manager/index.phtml @@ -1,7 +1,7 @@ <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/requests/approval-chain-manager.css', 'all'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/requests/approval-chain-manager.js'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/edit.js'); ?> -<?php $this->layout()->tagline = 'Approval Chain Manager'; ?> +<?php $this->layout()->breadcrumbs = array('Approval Chain Manager'); ?> <?php $this->layout()->hideMenu = true; ?> <ul class="editMenu"> diff --git a/application/modules/requests/views/scripts/index/index.phtml b/application/modules/requests/views/scripts/index/index.phtml index 5e064208984a04317ba2394b272fa29c5de75cb6..41b605b4840024e9cb84406f14b64a43e2448f38 100644 --- a/application/modules/requests/views/scripts/index/index.phtml +++ b/application/modules/requests/views/scripts/index/index.phtml @@ -1,4 +1,4 @@ -<?php $this->layout()->tagline = 'My Requests'; ?> +<?php $this->layout()->breadcrumbs = array('My Requests'); ?> <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/requests/index.css', 'all'); ?> <?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/requests/index.js'); ?>