diff --git a/application/modules/courses/controllers/EditController.php b/application/modules/courses/controllers/EditController.php index f0dd7ed017411017b56d9c6c748b005683d546e4..034c5b45959a5d2d3c44029d957ce3a8cd94ebfd 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 bbdfed616e8cbb2dad2dbfa0c755575098f6f85b..5692a93a340ba551f0603c057ee66103ac412069 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 a095a0fe951ba0f2468bbf0bd01644a83d86555f..dd9ed37ae74f125092d3d8aead0ff5baaf03b4da 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 80e844f2bf20c6bd6e03ffcc71629df5c6b3358e..53e04c7203871f02ddb5f9aab26bcf21446a6602 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;}