Index: trunk/xpressme_integration_kit/include/xpress_render.php =================================================================== --- trunk/xpressme_integration_kit/include/xpress_render.php (revision 560) +++ trunk/xpressme_integration_kit/include/xpress_render.php (revision 561) @@ -100,6 +100,12 @@ } + if ($xpess_config->is_theme_sidebar_disp){ + $xpress_class = 'xpress-body'; + } else { + $xpress_class = 'xpress-body onecolumn'; + } + $pattern = ']*)>'; - $body_class = 'class="xpress"'; + $body_class = 'class="' . $xpress_class . '"'; if(preg_match("/".$pattern."/s", $contents, $body_matches)){ $body_tag_option = $body_matches[1]; @@ -108,8 +114,8 @@ if(preg_match("/".$pattern."/", $body_tag_option, $class_matches)){ $class_value = $class_matches[1]; - $reprace = 'xpress '. $class_value; + $reprace = $xpress_class . ' '. $class_value; $body_class = preg_replace("/".$class_value."/", $reprace, $body_tag_option); } else { - $body_class = 'class="xpress" ' . $body_tag_option; + $body_class = 'class="' . $xpress_class . '" ' . $body_tag_option; } } Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/functions.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/functions.php (revision 560) +++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/functions.php (revision 561) @@ -8,4 +8,7 @@ )); + // This theme uses wp_nav_menu() + if ( function_exists('add_theme_support') )add_theme_support( 'nav-menus' ); + load_theme_textdomain('xpress'); @@ -15,8 +18,8 @@ if ( xpress_header_image() ) { $url = xpress_header_image_url() ; - $output .= "#header { background: url('$url') no-repeat bottom center; }\n"; + $output .= "#header { background: url('$url') repeat-x bottom left; }\n"; } if ( false !== ( $color = xpress_header_color() ) ) { - $output .= "#headerimg h1 a, #headerimg h1 a:visited, #headerimg .description { color: $color; }\n"; + $output .= "#xpress-header-bar-top a, #xpress-header-bar-top a:visited, #xpress-header-bar-top .xpress-description ,#xpress-header-bar-top .xpress-conditional-title,#access a, #xpress-menu a{ color: $color; }\n"; } if ( false !== ( $display = xpress_header_display() ) ) { @@ -39,5 +42,5 @@ return $q['upper']; } else - return '69aee7'; + return 'ffffff'; } @@ -47,5 +50,5 @@ return $q['lower']; } else - return '4180b6'; + return 'ffffff'; } @@ -66,5 +69,5 @@ $color = xpress_header_color(); if ( false === $color ) - return 'white'; + return 'black'; return $color; @@ -279,5 +282,5 @@ font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; font-weight: bold; - font-size: 4em; + font-size: 2em; text-align: center; padding-top: 70px; Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/header.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/header.php (revision 560) +++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/header.php (revision 561) @@ -25,30 +25,43 @@ - +>
-
-
-
- - +
+ -
- -
-
- siteurl; - echo '' . __('Main Page','xpress') . ' | '; - } - ?> - - -
-
-
+ + +
+
Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/images/header-img.php =================================================================== --- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/images/header-img.php (revision 560) +++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/images/header-img.php (revision 561) @@ -1,9 +1,9 @@ array ( x1, x2 ) ) @@ -51,22 +51,22 @@ // Blank out the blue thing for ( $i = 0; $i < $h; $i++ ) { - $x1 = 19; - $x2 = 740; - imageline( $im, $x1, 18 + $i, $x2, 18 + $i, $white ); + $x1 = 0; + $x2 = 800; + imageline( $im, $x1, $i, $x2, $i, $white ); } // Draw a new color thing for ( $i = 0; $i < $h; $i++ ) { - $x1 = 20; - $x2 = 739; + $x1 = 0; + $x2 = 800; $r = ( $r2 - $r1 != 0 ) ? $r1 + ( $r2 - $r1 ) * ( $i / $h ) : $r1; $g = ( $g2 - $g1 != 0 ) ? $g1 + ( $g2 - $g1 ) * ( $i / $h ) : $g1; $b = ( $b2 - $b1 != 0 ) ? $b1 + ( $b2 - $b1 ) * ( $i / $h ) : $b1; $color = imagecolorallocate( $im, $r, $g, $b ); - if ( array_key_exists($i, $corners) ) { - imageline( $im, $x1, 18 + $i, $x2, 18 + $i, $white ); - list ( $x1, $x2 ) = $corners[$i]; - } - imageline( $im, $x1, 18 + $i, $x2, 18 + $i, $color ); +// if ( array_key_exists($i, $corners) ) { +// imageline( $im, $x1, 18 + $i, $x2, 18 + $i, $white ); +// list ( $x1, $x2 ) = $corners[$i]; +// } + imageline( $im, $x1, $i, $x2, $i, $color ); } Index: trunk/xpressme_integration_kit/wp-content/themes/xpress_default/style.css =================================================================== --- trunk/xpressme_integration_kit/wp-content/themes/xpress_default/style.css (revision 560) +++ trunk/xpressme_integration_kit/wp-content/themes/xpress_default/style.css (revision 561) @@ -91,6 +91,5 @@ } #xpress-header-bar-top { - height: 32px; - margin-bottom: 16px; + margin-bottom: 0px; } #xpress-header-bar-top img{ @@ -98,17 +97,21 @@ } #xpress-header-bar #xpress-header-bar-top .xpress-header-title { + font-size: 24px; float: left; - font-size: 16px; -} -#xpress-header-bar #xpress-header-bar-top .xpress-conditional-title { - font-size: 14px; - margin-bottom: 20px; - -} - -#xpress-header-bar .xpress-description { - clear: both; +} +#xpress-header-bar #xpress-header-bar-top .xpress-description { + clear: both; + font-weight: bold; font-size: 12px; - float: left; + padding-top: 8px; + padding-left: 40px; + +} + +#xpress-header-bar .xpress-conditional-title { + font-weight: bold; + font-size: 12px; + padding-top: 14px; + padding-left: 40px; } @@ -749,2 +752,93 @@ color: #777; } + + +/* =Menu +-------------------------------------------------------------- */ +#menu_div { + border-bottom: 1px solid #000; +// background: #fff; + margin: 0 auto; + display:block; + clear:both; + height:26px; +// float:left; +} +.xpress-header-title{ + padding-left: 5px; + padding-top: 5px; +} +#access{ +// background: #fff; + margin: 0 auto; + display:block; + padding-left: 5px; + float:left; +} +#xpress-menu { +// background: #fff; + margin: 0 auto; + display:block; + float:right; +} +#access .menu-header +#xpress-menu .menu-header { + font-size: 13px; + margin-left: 12px; +} +#access .menu-header ul, +#xpress-menu .menu-header ul { + list-style: none; + margin: 0; +} +#access .menu-header li, +#xpress-menu .menu-header li { + float:left; + position: relative; +} +#access a, +#xpress-menu a { + display:block; + text-decoration:none; +// color:#aaa; + padding:0 2px; + line-height:24px; +} +#access ul ul, +#xpress-menu ul ul { + display:none; + position:absolute; + top:38px; + left:0; + float:left; + -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); + -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); + box-shadow: 0px 3px 3px rgba(0,0,0,0.2); + z-index: 99999; +} +#access ul ul ul, +#xpress-menu ul ul ul { + left:100%; + top:0; +} +#access ul ul a, +#xpress-menu ul ul a { + background:#333; + height:auto; + line-height:1em; + padding:10px; + width: 130px; +} +#access li:hover > a, +#access ul ul :hover > a, +#xpress-menu li:hover > a, +#xpress-menu ul ul :hover > a { + color:#fff; + background:#333; +} + +#access ul li:hover > ul, +#xpress-menu ul li:hover > ul { + display:block; +} +