diff --git a/unl_theme/views/default/css.php b/unl_theme/views/default/css.php index e920b65c733501a6025fdc94c80b8b40f814778c..0b42b0a75d299d9381acff1a618e2370c8dbcfcd 100644 --- a/unl_theme/views/default/css.php +++ b/unl_theme/views/default/css.php @@ -35,6 +35,70 @@ /*UNL Overrides*/ #wdn_navigation_bar {display:none; visibility:hidden;} +#titlegraphic, .nav_collapsed #titlegraphic {margin-top:10px;} + +/* *************************************** + Tab Navigation - to be moved to UNL styles eventually +*************************************** */ +#bulletin-nav { + + width:auto; + line-height:normal; + margin:15px 0px 40px 0px; + padding:0px; + border-bottom:2px solid #e6e6e6; + } +#bulletin-nav:after {content: ".";display: block;clear: both;height:0;visibility: hidden;} +#maincontent #bulletin-nav ul { + margin:0px 10px -2px 10px; + padding:0px; + list-style:none; + text-align:left; + height:34px; + } +#maincontent #bulletin-nav ul li { + display:inline; + float:left; + background:url('/wdn/templates_3.0/css/content/images/tabs/ulBG.png') repeat-x left; + /**/ + } +#maincontent #bulletin-nav a { + display:block; + height:34px; + padding:0px 18px 0px 15px; + text-decoration:none; + color:#D9D9D9; + font-size:1.05em; + background:url('/wdn/templates_3.0/css/content/images/tabs/inactiveRight.png') no-repeat bottom right; + } +#maincontent #bulletin-nav ul li:last-child a { + background:url('/wdn/templates_3.0/css/content/images/tabs/inactiveRightLast.png') no-repeat bottom right; + } +#maincontent #bulletin-nav a span { + color:#666666; + margin-left:-2px; + margin-top:9px; + float:left; + position:relative; + } + /* +.bulletin-tabs { +background-color:#E1EBF0; +padding:10px; +border-bottom-style:solid; +border-bottom-color: #CC0000; +border-bottom-width: 2px; +margin-right:4px; +} */ +#bulletin-nav a.bulletin-selected{font-size:11px; color:#000000;background-color:#E1EBF0; text-align:center; border-top-style: solid; border-top-color: #CC0000; border-top-width:1px; } + + +#bulletin-nav a span:hover{text-decoration:underline;} +#bulletin-nav a span:active{color:#333333;} +#bulletin-nav a span:visited{color:#666666;} + +#bulletin-nav-nojs span img{margin-right:3px;} + /* *************************************** PAGE LAYOUT - MAIN STRUCTURE diff --git a/unl_theme/views/default/page_elements/unl_nav.php b/unl_theme/views/default/page_elements/unl_nav.php index 1c4cd2412047445de3e55d5d2922f3f8bf482e3b..1814bcfe23a68c7d61ee5530d9d7b038f834bd07 100644 --- a/unl_theme/views/default/page_elements/unl_nav.php +++ b/unl_theme/views/default/page_elements/unl_nav.php @@ -13,10 +13,10 @@ ?> <li> - <a href="<?php echo $_SESSION['user']->getURL(); ?>"><img alt="Profile" class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>"></a> + <a href="<?php echo $_SESSION['user']->getURL(); ?>" ><span style="background:url('<?php echo $_SESSION['user']->getIcon('topbar'); ?>') no-repeat; padding-left:20px;">Your Profile</span></a> </li> <li> - <a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a> + <a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><span><?php echo elgg_echo('dashboard'); ?></span></a> </li> <?php @@ -34,7 +34,7 @@ ksort($alphamenu); foreach($alphamenu as $item) { - echo "<li><a href=\"{$item->value}\">" . $item->name . "</a></li>"; + echo "<li><a href=\"{$item->value}\"><span>" . $item->name . "</span></a></li>"; } } ?> @@ -46,7 +46,7 @@ echo elgg_view('elgg_topbar/extend', $vars); ?> - <li><a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a></li> + <li><a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><span><?php echo elgg_echo('settings'); ?></span></a></li> <?php @@ -55,7 +55,7 @@ ?> - <li><a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a></li> + <li><a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><span><?php echo elgg_echo("admin"); ?></span></a></li> <?php @@ -66,7 +66,7 @@ - <li><a href="<?php echo $vars['url']; ?>action/logout"><small><?php echo elgg_echo('logout'); ?></small></a></li> + <li><a href="<?php echo $vars['url']; ?>action/logout"><span><?php echo elgg_echo('logout'); ?></span></a></li> diff --git a/unl_theme/views/default/pageshells/pageshell.php b/unl_theme/views/default/pageshells/pageshell.php index 61f52fa4536a5e9295c793bad1604a6fb78893fc..4ad94f82c4f11bfa510dbed12e0447a325e1195d 100644 --- a/unl_theme/views/default/pageshells/pageshell.php +++ b/unl_theme/views/default/pageshells/pageshell.php @@ -1,7 +1,6 @@ <?php header('Content-type: text/html; charset=UTF-8'); - require_once 'UNL/Templates.php'; UNL_Templates::$options['version'] = 3;