From 78a3ced801881c10b7d8722d57231d52249b335a Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Thu, 27 Aug 2009 17:43:12 +0000
Subject: [PATCH] Re-insert the bulletin preview sidebar that was lost in the
switch to the new templates.
---
.../modules/courses/controllers/EditController.php | 1 -
.../modules/courses/views/scripts/edit/index.phtml | 10 ++++++++--
document_root/css/courses/edit.css | 5 +----
document_root/css/courses/view.css | 1 -
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/application/modules/courses/controllers/EditController.php b/application/modules/courses/controllers/EditController.php
index f0dd7ed0..034c5b45 100644
--- a/application/modules/courses/controllers/EditController.php
+++ b/application/modules/courses/controllers/EditController.php
@@ -15,7 +15,6 @@ class Courses_EditController extends App_Controller_Action
$this->view->errors = $session->errors;
$layout = Zend_Layout::getMvcInstance();
- $layout->sidebar = $this->view->render('edit/bulletin-preview.phtml');
}
public function editPostAction()
diff --git a/application/modules/courses/views/scripts/edit/index.phtml b/application/modules/courses/views/scripts/edit/index.phtml
index bbdfed61..5692a93a 100644
--- a/application/modules/courses/views/scripts/edit/index.phtml
+++ b/application/modules/courses/views/scripts/edit/index.phtml
@@ -4,8 +4,13 @@
<?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/edit.js'); ?>
<?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">
+<div class="one_col left">
+<?php echo $this->partial('edit/bulletin-preview.phtml', $this); ?>
+</div>
+
+<div class="three_col right">
+<form action="<?php echo $this->url(array('action' => 'edit.post')); ?>" enctype="multipart/form-data" method="post">
@@ -1073,4 +1078,5 @@ if (in_array($this->request->getType(), array('NewCourseWithACE', 'AddACEToCours
<input type="submit" value="Preview" />
<input id="cancel_request" type="submit" name="submitType" value="Cancel" />
-</form>
\ No newline at end of file
+</form>
+</div>
\ No newline at end of file
diff --git a/document_root/css/courses/edit.css b/document_root/css/courses/edit.css
index a095a0fe..dd9ed37a 100644
--- a/document_root/css/courses/edit.css
+++ b/document_root/css/courses/edit.css
@@ -23,9 +23,6 @@
}
-#creqMain {
- width: 720px;
-}
#aceSection li {
margin-bottom: 1em;
@@ -80,7 +77,7 @@ body #creqMain .required {
div.main_section {
background-color: #eee;
border: 2px solid #ccc;
- margin-top: 50px;
+ margin-bottom: 50px;
padding: 30px 10px 10px 10px;
position: relative;
}
diff --git a/document_root/css/courses/view.css b/document_root/css/courses/view.css
index 80e844f2..53e04c72 100644
--- a/document_root/css/courses/view.css
+++ b/document_root/css/courses/view.css
@@ -1,5 +1,4 @@
@CHARSET "UTF-8";
-#creqMain {width: 720px;}
#decisionMessage {margin: 1em; padding: 0.5em; text-align: center; color: #060; background-color: #cfc; border: 1px solid #4c4;}
--
GitLab