From 9d0647ef22bbf6771e98730b9c4477c570dda535 Mon Sep 17 00:00:00 2001 From: John-Paul Robinson <jpr@uab.edu> Date: Fri, 2 Dec 2011 18:02:40 -0600 Subject: [PATCH] Move the leftcolumn ahead of maincolumn content for easier rendering Moved the leftcolumn element ahead of the maincolumn-l-r (content) element to simplify rendering using the uab theme stylesheets. Changed the default portal rendering to adhere to the uab style theme of ul element for menu title rather than h5 from the mw vector default. Removed the mw-panel properties to avoid conflicting with the uab style sheets and adjusted several other properties of the menu item body to address font and spacing. Moved the content back to its original postion, not 30% over since now the menus are on the left and naturally take up the space. --- skins/UabVector.php | 33 +++++++++++++++++++-------------- skins/uabvector/main-ltr.css | 13 ++----------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/skins/UabVector.php b/skins/UabVector.php index 05b14a3..a8df81a 100644 --- a/skins/UabVector.php +++ b/skins/UabVector.php @@ -509,6 +509,19 @@ class UabVectorTemplate extends QuickTemplate { <div id="whitebox-shadow"> <!-- whitebox --> <div id="whitebox"> + <!-- leftcolumn --> + <div id="leftcolumn"> + <!-- sidebar --> + <div class="sidebar"> + <!-- panel --> + <div id="mw-panel" class="noprint"> + <?php $this->renderPortals( $this->data['sidebar'] ); ?> + </div> + <!-- /panel --> + </div> + <!-- /sidebar --> + </div> + <!-- /leftcolumn --> <!-- maincolumn-l-r --> <div id="maincolumn-l-r"> <!-- content --> @@ -580,19 +593,6 @@ class UabVectorTemplate extends QuickTemplate { </div> </div> <!-- /header --> - <!-- leftcolumn --> - <div id="leftcolumn"> - <!-- sidebar --> - <div class="sidebar"> - <!-- panel --> - <div id="mw-panel" class="noprint"> - <?php $this->renderPortals( $this->data['sidebar'] ); ?> - </div> - <!-- /panel --> - </div> - <!-- /sidebar --> - </div> - <!-- /leftcolumn --> </div> <!-- /whitebox --> </div> @@ -716,7 +716,9 @@ class UabVectorTemplate extends QuickTemplate { default: ?> <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>> - <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5> + <!-- moduletable --> + <div class="moduletable"> + <ul class ="menu" <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?> <div class="body"> <?php if ( is_array( $content ) ): ?> <ul> @@ -728,6 +730,9 @@ class UabVectorTemplate extends QuickTemplate { <?php echo $content; /* Allow raw HTML block to be defined by extensions */ ?> <?php endif; ?> </div> + </ul> + </div> + <!-- /moduletable --> </div> <?php break; diff --git a/skins/uabvector/main-ltr.css b/skins/uabvector/main-ltr.css index 86a5f23..4740d60 100644 --- a/skins/uabvector/main-ltr.css +++ b/skins/uabvector/main-ltr.css @@ -29,10 +29,10 @@ body { } /* Content */ #content { - margin-left: 10em; padding: 1em; - left: 30%; /* + margin-left: 10em; + left: 30%; background-image: url(images/border.png); background-position: top left; background-repeat: repeat-y; @@ -390,14 +390,8 @@ body { } /* Panel */ #mw-panel { - position: absolute; - top: 160px; - padding-top: 1em; - width: 10em; - left: 0; } #mw-panel div.portal { - padding-bottom: 1.5em; } #mw-panel div.portal h5 { font-weight: normal; @@ -407,13 +401,11 @@ body { padding-left: 1.75em; cursor: default; border: none; - font-size: 0.75em; } #mw-panel div.portal div.body { margin: 0; padding-top: 0.5em; margin-left: 1.25em; - background-image: url(images/portal-break.png); background-repeat: no-repeat; background-position: top left; } @@ -430,7 +422,6 @@ body { padding-bottom: 0.5em; margin: 0; overflow: hidden; - font-size: 0.75em; } #mw-panel div.portal div.body ul li a { color: #0645ad; -- GitLab