From: Enlightenment S. <no-...@en...> - 2010-07-29 15:58:48
|
Log: I forgot some markup changes. Author: dresb Date: 2010-07-29 08:58:42 -0700 (Thu, 29 Jul 2010) New Revision: 50648 Modified: trunk/web/www/p.php trunk/web/www/site/site.php trunk/web/www/theme/css/screen.css trunk/web/www/theme/img/header-menu-background.png Modified: trunk/web/www/p.php =================================================================== --- trunk/web/www/p.php 2010-07-29 15:44:37 UTC (rev 50647) +++ trunk/web/www/p.php 2010-07-29 15:58:42 UTC (rev 50648) @@ -26,15 +26,20 @@ <div id="header"> + <div class="titles"> + <div class="layout"> + + <h1><span>Englightenment<span></h1> + <h2><span>Beauty at your fingertips</span></h2> + + </div> + </div> + <div class="menu"> <div class="layout"> - <?php $class = "logo"; if ($page == "index") $class = "logo current" ?> - <h1 class="<?php echo $class ?>"> - <a href="/" title="Homepage" name="Homepage"><span>Enlightenment.org</span></a> - </h1> - <ul class="menu"> + <?php echo(nav_button("main1", ""));?> <?php echo(nav_button("main2", ""));?> <?php echo(nav_button("main3", ""));?> <?php echo(nav_button("main4", ""));?> Modified: trunk/web/www/site/site.php =================================================================== --- trunk/web/www/site/site.php 2010-07-29 15:44:37 UTC (rev 50647) +++ trunk/web/www/site/site.php 2010-07-29 15:58:42 UTC (rev 50648) @@ -141,11 +141,12 @@ $c = "passive"; if (file_exists("p/$b/$lang-label")) - $l = read_var("p/$b/$lang-label"); + $l = read_var("p/$b/$lang-label"); else - $l = read_var("p/$b/en-label"); + $l = read_var("p/$b/en-label"); if (file_exists("p/$b/page")) { $h = read_var("p/$b/page"); + $pname = $h; $h = "p.php?p=$h&l=$lang"; } else if (file_exists("p/$b/link")) { @@ -154,9 +155,9 @@ if ((strncasecmp($page,$l,strlen($l)) == 0) OR (($page == "index") AND ($l == "Home") )) { $c = "active"; - return "<li class='current'><a href='#'>$l</a></li>\n"; + return "<li class='$pname current'><a><span>$l</span></a></li>\n"; } - return "<li><a href='$h'>$l</a></li>\n"; + return "<li class='$pname'><a href='$h'><span>$l</span></a></li>\n"; } function nav_subs() { @@ -192,7 +193,7 @@ if ($h == "") { $h = "p.php?p=$p/$fl&l=$lang"; } - echo("<li class='$class'><a href='$h'>$l</a></li>\n"); + echo("<li class='$class'><a href='$h'><span>$l</span></a></li>\n"); $item++; } else if (file_exists("p/$p/$fl/en-label")) { @@ -200,7 +201,7 @@ if ($h == "") { $h = "p.php?p=$p/$fl&l=$lang"; } - echo("<li class='$class'><a href='$h'>$l</a></li>\n"); + echo("<li class='$class'><a href='$h'><span>$l</span></a></li>\n"); $item++; } } Modified: trunk/web/www/theme/css/screen.css =================================================================== --- trunk/web/www/theme/css/screen.css 2010-07-29 15:44:37 UTC (rev 50647) +++ trunk/web/www/theme/css/screen.css 2010-07-29 15:58:42 UTC (rev 50648) @@ -1,12 +1,7 @@ #header .layout { display: inline-block; } #header .menu { background: url("/theme/img/header-menu-background.png") repeat-x; } #header .submenu { background: url("/theme/img/header-submenu-background.png") repeat-x; } -#header h1.logo { float: left; background: url("/theme/img/menu-default-right.png") no-repeat right top; margin: 0; } -#header h1.logo a { display: inline-block; background: url("/theme/img/menu-default-left.png") no-repeat left top; } -#header h1.logo a span { display: inline-block; height: 72px; width: 112px; overflow: hidden; /* Replace text with image */ text-indent: -999px; background: url("/theme/img/logo-default.png") no-repeat; } -#header h1.logo:hover, #header h1.logo.current { background-image: url("/theme/img/menu-selected-right.png"); } -#header h1.logo:hover a, #header h1.logo.current a { background-image: url("/theme/img/menu-selected-left.png"); } -#header h1.logo:hover a span, #header h1.logo.current a span { background-image: url("/theme/img/logo-selected.png"); } +#header .titles { display: none; } #header ul.menu { text-align: right; list-style: none inside none; margin: 0; padding: 0; } #header ul.menu li { display: inline-block !important; display: inline; height: 72px; line-height: 72px; text-align: center; } #header ul.menu li a { display: inline-block; height: 72px; text-decoration: none; } @@ -15,6 +10,12 @@ #header ul.menu li.current, #header ul.menu li:hover { background: url("/theme/img/menu-selected-right.png") no-repeat right top; } #header ul.menu li.current a, #header ul.menu li:hover a { background: url("/theme/img/menu-selected-left.png") no-repeat left top; color: #f3f3f3; } #header ul.menu li.current a { /* "- $gutter * 2"" removes the padding set above */ min-width: 80px; max-width: 192px; } +#header ul.menu li.index { float: left; background: url("/theme/img/menu-default-right.png") no-repeat right top; margin: 0; } +#header ul.menu li.index a { display: inline-block; background: url("/theme/img/menu-default-left.png") no-repeat left top; padding: 0; } +#header ul.menu li.index a span { display: inline-block; height: 72px; width: 112px; overflow: hidden; /* Replace text with image */ text-indent: -999px; background: url("/theme/img/logo-default.png") no-repeat; } +#header ul.menu li.index:hover, #header ul.menu li.index.current { background-image: url("/theme/img/menu-selected-right.png"); } +#header ul.menu li.index:hover a, #header ul.menu li.index.current a { background-image: url("/theme/img/menu-selected-left.png"); } +#header ul.menu li.index:hover a span, #header ul.menu li.index.current a span { background-image: url("/theme/img/logo-selected.png"); } #header ul.submenu { text-align: right; list-style: none inside none; margin: 0; padding: 0; float: right; clear: right; } #header ul.submenu li { display: inline-block !important; display: inline; height: 36px; line-height: 36px; text-align: center; } #header ul.submenu li a { display: inline-block; height: 36px; text-decoration: none; } Modified: trunk/web/www/theme/img/header-menu-background.png =================================================================== (Binary files differ) |