Thread: [Openfirst-cvscommit] SF.net SVN: openfirst: [170] trunk/src/style
Brought to you by:
xtimg
From: <ast...@us...> - 2006-06-21 18:26:15
|
Revision: 170 Author: astronouth7303 Date: 2006-06-21 11:26:09 -0700 (Wed, 21 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=170&view=rev Log Message: ----------- Tweaking slug appearance. Modified Paths: -------------- trunk/src/includes/skinfunctions.php trunk/src/style/slugs.css trunk/src/style/slugs.js Modified: trunk/src/includes/skinfunctions.php =================================================================== --- trunk/src/includes/skinfunctions.php 2006-06-21 15:49:15 UTC (rev 169) +++ trunk/src/includes/skinfunctions.php 2006-06-21 18:26:09 UTC (rev 170) @@ -35,7 +35,7 @@ $eimage = htmlentities($StylePath).'/images/slug.gif'; // Image source: http://www.onescience.com/forum/images/slug_125.gif //onclick=\"handleSlugClick(this)\" - echo "<div class=\"slug\"><img src=\"{$eimage}\" alt=\"(SLUG)\" title=\"Show slug\" /><span>{$eslug}</span></div>"; + echo "<span class=\"slug\"><img src=\"{$eimage}\" alt=\"(SLUG)\" title=\"Show slug\" /><span>{$eslug}</span></span>"; } /** Prints out the URI for a slug. @@ -66,4 +66,4 @@ # } -?> \ No newline at end of file +?> Modified: trunk/src/style/slugs.css =================================================================== --- trunk/src/style/slugs.css 2006-06-21 15:49:15 UTC (rev 169) +++ trunk/src/style/slugs.css 2006-06-21 18:26:09 UTC (rev 170) @@ -1,9 +1,11 @@ .slug { + border: thin solid red; /* debug */ +/* display:block;*/ +/* float: left;*/ margin: .2em; - float: left; - /* Set font size, etc. to normal */ -/* border: solid red; - padding: .1em;*/ + overflow: visible; + width: 18px; /* Change with image */ + height: 15px; /* Change with image */ } .slug > * { vertical-align: middle; @@ -13,13 +15,23 @@ border: none; } .slug > span { - display: none; - border: thin solid silver; - height: 15px; /* Change with image */ - line-height: 15px; - margin-left: 2px; - padding: 0 2px; +/* visibility: hidden;*/ + border: thin solid silver; + background: white; + height: 15px; /* Change with image */ + line-height: 15px; + margin-left: 2px; + padding: 0 2px; + z-index: 50; +/* position: relative; +/* left: 18px; /* Change with image */ +/* top: -15px; /* Change with line-height */ } + +/*.slug.expand > span { + display: inline; +}*/ + /*.slug > img:active + span, .slug > img:focus + span, .slug:focus > span, Modified: trunk/src/style/slugs.js =================================================================== --- trunk/src/style/slugs.js 2006-06-21 15:49:15 UTC (rev 169) +++ trunk/src/style/slugs.js 2006-06-21 18:26:09 UTC (rev 170) @@ -1,17 +1,21 @@ +// vim:syn=php +// <?php + // Pass this the DOM event function handleSlugClick(evt) { - var obj = evt.target; - if (obj.parentNode.className != 'slug') return; - var target = obj.nextSibling; - if (target.style.display == "none") { - target.style.display = "inline"; - } else if (target.style.display == "inline") { - target.style.display = "none"; - } else { - target.style.display = "inline"; - } + disp = 'visible'; + var obj = evt.target; + if (obj.parentNode.className != 'slug') return; + var target = obj.nextSibling; + if (target.style.visibility == disp) { + target.style.visibility = "hidden"; + target.title = "Show slug"; + } else { + target.style.visibility = disp; + target.title = "Hide slug"; + } } document.documentElement.addEventListener('click', handleSlugClick, true); -// TODO: Add support for non-JS browsers \ No newline at end of file +// TODO: Add support for non-JS browsers This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ast...@us...> - 2006-06-23 05:04:35
|
Revision: 197 Author: astronouth7303 Date: 2006-06-22 22:04:28 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/openfirst/?rev=197&view=rev Log Message: ----------- -htmlentities() -updated config vars -removed slug style experiments Modified Paths: -------------- trunk/src/style/footers.php trunk/src/style/headers.php trunk/src/style/slugs.css Modified: trunk/src/style/footers.php =================================================================== --- trunk/src/style/footers.php 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/footers.php 2006-06-23 05:04:28 UTC (rev 197) @@ -6,7 +6,7 @@ <div id="footer"> <hr /> <div id="copyright" class="menu center"> - © Copyright 2002-2003 by <?php echo $Title; ?>. All rights reserved. + © Copyright 2002-2003 by <?php echo $ogSiteTitle; ?>. All rights reserved. </div> <?php if(isset($user->membertype) && $user->membertype == "administrator"){ Modified: trunk/src/style/headers.php =================================================================== --- trunk/src/style/headers.php 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/headers.php 2006-06-23 05:04:28 UTC (rev 197) @@ -1,11 +1,11 @@ <?php header('content-type: text/html; charset=utf-8'); -global $BasePath, $ogModuleManager, $ogMoreStyles, $Home, $ogCurrentModule; -global $Title, $ogSiteTitle, $ogMoreHeadItems, $usersonline, $ogUser, $StylePath; +global $ogBasePath, $ogModuleManager, $ogMoreStyles, $ogHome, $ogCurrentModule; +global $Title, $ogSiteTitle, $ogMoreHeadItems, $usersonline, $ogUser, $ogStylePath; -if(! isset($BasePath)){ - $BasePath = 'http://openfirst.sourceforge.net'; +if(!isset($ogBasePath)){ + $ogBasePath = 'http://openfirst.sourceforge.net'; $StylePath = 'http://openfirst.sourceforge.net/style'; $Title = "openFIRST Team"; } else { @@ -16,13 +16,13 @@ if ($module->getActive() && $module->getShowOnMenu()) { if (is_object($ogCurrentModule) && $ogCurrentModule->getDir() == $dir){ $CurrentModule =& $thisModule; - $headerlinks[] = ' » <a class="menu selected" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a> + $headerlinks[] = ' » <a class="menu selected" href="'.htmlentities("$ogBasePath/$dir").'">'.htmlentities($module->getName()).'</a> '; $adminnav = $module->getAdminBar(); $subnav = $module->getNavBar(); } else { - $headerlinks[] .= ' » <a class="menu" href="'.htmlentities("$BasePath/$dir").'">'.htmlentities($module->getName()).'</a> + $headerlinks[] .= ' » <a class="menu" href="'.htmlentities("$ogBasePath/$dir").'">'.htmlentities($module->getName()).'</a> '; } } @@ -31,6 +31,8 @@ $headers = implode(' |', $headerlinks); unset($headerlinks); + echo '<'.'?xml version="1.0" encoding="utf-8" ?'.'> +'; } ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> @@ -44,10 +46,9 @@ echo htmlentities($rtitle); unset($rtitle); ?></title> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Language" content="en" /> - <meta name="copyright" content="© 2003 openFIRST http://openfirst.sf.net." /> - <meta name="author" content="openFIRST - http://openfirst.sf.net" /> + <meta name="copyright" content="© 2006 openFIRST http://openfirst.sf.net." /> <meta name="generator" content="openFIRST - http://openfirst.sf.net" /> <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/style.css" /> <link rel="stylesheet" type="text/css" href="<?php echo htmlentities($StylePath); ?>/slugs.css" /> @@ -71,7 +72,7 @@ <table class="nav1"> <tr id="toplogo"> <td> - <img src="<?php echo htmlentities($StylePath); ?>/images/openfirst.png" alt="openFIRST Portal System" /> + <img src="<?php echo htmlentities($ogStylePath); ?>/images/openfirst.png" alt="openFIRST Portal System" /> </td> </tr> <tr> @@ -119,9 +120,9 @@ // Check if messenger module has activated usersonline option then echo value if(isset($usersonline)){ - echo $usersonline; + echo htmlentities($usersonline); } else { - echo "Welcome to the <b>$ogSiteTitle</b> website!"; + echo "Welcome to the <b>".htmlentities($ogSiteTitle)."</b> website!"; } ?> @@ -148,8 +149,8 @@ </table><div id="content"> <?php -if ($BasePath == 'http://openfirst.sourceforge.net') { - unset($BasePath); +if ($ogBasePath == 'http://openfirst.sourceforge.net') { + unset($ogBasePath); } -?> \ No newline at end of file +?> Modified: trunk/src/style/slugs.css =================================================================== --- trunk/src/style/slugs.css 2006-06-23 05:00:55 UTC (rev 196) +++ trunk/src/style/slugs.css 2006-06-23 05:04:28 UTC (rev 197) @@ -1,14 +1,15 @@ .slug { +/* border: 1px solid red; /*debug*/ /* float: left;*/ margin: .2em; overflow: visible; position: relative; - vertical-align: top; + vertical-align: middle; height: 15px; /* change with image */ line-height: 15px; /* change with image */ } .slug > * { - vertical-align: top; + vertical-align: middle; } .slug > img { cursor: pointer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |