Skip to content
Snippets Groups Projects
Commit 9d0647ef authored by John-Paul Robinson's avatar John-Paul Robinson
Browse files

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.
parent bce3ba36
No related branches found
No related tags found
No related merge requests found
...@@ -509,6 +509,19 @@ class UabVectorTemplate extends QuickTemplate { ...@@ -509,6 +509,19 @@ class UabVectorTemplate extends QuickTemplate {
<div id="whitebox-shadow"> <div id="whitebox-shadow">
<!-- whitebox --> <!-- whitebox -->
<div id="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 --> <!-- maincolumn-l-r -->
<div id="maincolumn-l-r"> <div id="maincolumn-l-r">
<!-- content --> <!-- content -->
...@@ -580,19 +593,6 @@ class UabVectorTemplate extends QuickTemplate { ...@@ -580,19 +593,6 @@ class UabVectorTemplate extends QuickTemplate {
</div> </div>
</div> </div>
<!-- /header --> <!-- /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> </div>
<!-- /whitebox --> <!-- /whitebox -->
</div> </div>
...@@ -716,7 +716,9 @@ class UabVectorTemplate extends QuickTemplate { ...@@ -716,7 +716,9 @@ class UabVectorTemplate extends QuickTemplate {
default: default:
?> ?>
<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>> <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"> <div class="body">
<?php if ( is_array( $content ) ): ?> <?php if ( is_array( $content ) ): ?>
<ul> <ul>
...@@ -728,6 +730,9 @@ class UabVectorTemplate extends QuickTemplate { ...@@ -728,6 +730,9 @@ class UabVectorTemplate extends QuickTemplate {
<?php echo $content; /* Allow raw HTML block to be defined by extensions */ ?> <?php echo $content; /* Allow raw HTML block to be defined by extensions */ ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
</ul>
</div>
<!-- /moduletable -->
</div> </div>
<?php <?php
break; break;
......
...@@ -29,10 +29,10 @@ body { ...@@ -29,10 +29,10 @@ body {
} }
/* Content */ /* Content */
#content { #content {
margin-left: 10em;
padding: 1em; padding: 1em;
left: 30%;
/* /*
margin-left: 10em;
left: 30%;
background-image: url(images/border.png); background-image: url(images/border.png);
background-position: top left; background-position: top left;
background-repeat: repeat-y; background-repeat: repeat-y;
...@@ -390,14 +390,8 @@ body { ...@@ -390,14 +390,8 @@ body {
} }
/* Panel */ /* Panel */
#mw-panel { #mw-panel {
position: absolute;
top: 160px;
padding-top: 1em;
width: 10em;
left: 0;
} }
#mw-panel div.portal { #mw-panel div.portal {
padding-bottom: 1.5em;
} }
#mw-panel div.portal h5 { #mw-panel div.portal h5 {
font-weight: normal; font-weight: normal;
...@@ -407,13 +401,11 @@ body { ...@@ -407,13 +401,11 @@ body {
padding-left: 1.75em; padding-left: 1.75em;
cursor: default; cursor: default;
border: none; border: none;
font-size: 0.75em;
} }
#mw-panel div.portal div.body { #mw-panel div.portal div.body {
margin: 0; margin: 0;
padding-top: 0.5em; padding-top: 0.5em;
margin-left: 1.25em; margin-left: 1.25em;
background-image: url(images/portal-break.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: top left; background-position: top left;
} }
...@@ -430,7 +422,6 @@ body { ...@@ -430,7 +422,6 @@ body {
padding-bottom: 0.5em; padding-bottom: 0.5em;
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
font-size: 0.75em;
} }
#mw-panel div.portal div.body ul li a { #mw-panel div.portal div.body ul li a {
color: #0645ad; color: #0645ad;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment