Skip to content

Commit

Permalink
added top border image and padding. added google font options
Browse files Browse the repository at this point in the history
git-svn-id: https://techozoic-fluid.googlecode.com/svn/trunk@85 010e1cd8-cc02-723b-e9b4-cf61d25fcfdd
  • Loading branch information
jeremyclark13 committed Jan 20, 2011
1 parent a801ae3 commit f306139
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 23 deletions.
2 changes: 2 additions & 0 deletions changelog.php
Expand Up @@ -16,6 +16,8 @@
- Removed deprecated comment function.<br />
- Fixed problem with header folder upload permissions<br />
- Added option to change image upload location, images can now be stored in wp-content directory to prevent removal with theme updates.<br />
- Added border to top of header, and spacing to better frame theme.<br />
- Added option to use Google Fonts.<br />

<h3>Version 1.9.2</h3><br />
- Fixed IE 7 layout error when blog title box was aligned left.<br />
Expand Down
17 changes: 15 additions & 2 deletions functions.php
Expand Up @@ -63,6 +63,16 @@ function techozoic_error_message() {
$content_width = tech_content_width();
}

/**************************************
Techozoic Google Font Replacement
Since 1.9.3
***************************************/
function tech_google_font() {
global $tech;
wp_enqueue_style('google_fonts' , "http://fonts.googleapis.com/css?family={$tech['google_font_family']}", '', '', 'screen');
}


/**************************************
Techozoic comment number correction
since 1.9.3
Expand Down Expand Up @@ -153,7 +163,7 @@ function tech_content_width(){
***************************************/
function tech_footer_text(){
global $tech, $version;
$string = $tech['footer_text'];
$string = stripslashes($tech['footer_text']);
$shortcode = array('/%BLOGNAME%/i','/%THEMENAME%/i','/%THEMEVER%/i','/%THEMEAUTHOR%/i','/%TOP%/i','/%COPYRIGHT%/i','/%MYSQL%/i');
$output = array(get_bloginfo('name'),"Techozoic",$version,'<a href="http://clark-technet.com/"> Jeremy Clark</a>','<a href="#top">'. __('Top' ,'techozoic') .'</a>','&copy; '. date('Y'),sprintf(__('%1$d mySQL queries in %2$s seconds.','techozoic'), get_num_queries(),timer_stop(0)));
echo preg_replace($shortcode, $output, $string);
Expand Down Expand Up @@ -353,7 +363,7 @@ function tech_cufon_script() {
function tech_cufon_options() {
global $tech;
$list = "";
$headings = explode( ',' , $tech['cufon_font_headings']);
$headings = explode( ',' , $tech['font_headings']);
$class = array(
'Main Blog Title' => '.blog_title',
'Sidebar Titles' => '.sidebar h2, .sidebar h3, #footer h2',
Expand Down Expand Up @@ -732,6 +742,9 @@ function tech_thickbox($content) {
if ($tech['nav_menu_type'] == "Dropdown" || $tech['nav_menu_type'] == "WP 3 Menu"){
add_action('wp_print_styles','tech_dropdown_js');
}
if ($tech['google_font'] == "Enable") {
add_action('wp_print_styles','tech_google_font');
}
if ($tech['cufon_font'] == "Enable") {
add_action('template_redirect', 'tech_cufon_script'); // Calls script to add Cufon font replacement scripts See - http://cufon.shoqolate.com/
add_action('wp_head', 'tech_cufon_options');
Expand Down
6 changes: 3 additions & 3 deletions header.php
Expand Up @@ -71,9 +71,6 @@
<![endif]-->
<!--[if IE 7]>
<style type="text/css">
#l_sidebar{ padding-top: 30px; }
#content { padding-top: 30px; }
#r_sidebar { padding-top: 30px; }
#headerimgwrap{ position:absolute;left:20%}
.hleft{position:absolute;}
.hright{position:absolute; right:0;}
Expand All @@ -91,6 +88,7 @@
<body <?php body_class(); ?>>
<a name="top"></a>
<div id="header">
<div id="header_top">
<?php if ( function_exists('dynamic_sidebar') && is_active_sidebar( 'left_header' ) ){
echo '<div class="hleft">'. "\n";
dynamic_sidebar( 'left_header' );
Expand Down Expand Up @@ -188,8 +186,10 @@
tech_breadcrumbs();
}?>
</div><!--end headerl-->
</div><!--end header_top-->
</div><!--end header-->


<div id="page">
<div id="pagel">
<div id="pager">
Expand Down
Binary file added images/bgtop.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 49 additions & 5 deletions options/css-build.php
Expand Up @@ -33,6 +33,14 @@ function tech_font($font) {
return $font;
}

function tech_google_font_family($where) {
global $tech;
$classes = explode( ',' , $tech['font_headings']);
if (in_array($where, $classes)){
return str_replace('+', ' ', $tech['google_font_family']) . ', ';
}
}

function tech_color_verify($color){
if ($color){
if ($color[0] != '#')
Expand Down Expand Up @@ -98,10 +106,18 @@ function tech_color_verify($color){
$tech['nav_align'] = '';
break;
}

$tech['default_font'] = tech_font($tech['default_font']);
$tech['body_font'] = tech_font($tech['body_font']);
$tech['header_font'] = tech_font($tech['header_font']);
$tech['nav_font'] = tech_font($tech['nav_font']);
$tech_blog_title_font = tech_google_font_family('Main Blog Title') . tech_font($tech['header_font']);
$tech_h1_font = tech_google_font_family('H1 Headings') . tech_font($tech['header_font']);
$tech_h2_font = tech_google_font_family('H2 Headings') . tech_font($tech['header_font']);
$tech_h3_font = tech_google_font_family('H3 Headings') . tech_font($tech['header_font']);
$tech_h4_font = tech_google_font_family('H4 Headings') . tech_font($tech['header_font']);
$tech_h5_font = tech_google_font_family('H5 Headings') . tech_font($tech['header_font']);
$tech_sidebar_font = tech_google_font_family('Sidebar Titles') . tech_font($tech['sidebar_font']);
$tech_post_title_font = tech_google_font_family('Post Titles') . tech_font($tech['header_font']);
$cufon_header_size = $tech['main_heading_font_size'] ;
$cufon_sidebar_size = "1.6";
$tech_color_scheme = $tech['color_scheme'];
Expand Down Expand Up @@ -190,8 +206,29 @@ function tech_color_verify($color){
font-family:{$tech['body_font']}, Sans-Serif;
background-color:{$tech_post_bg_color};
}
h1,h2,h3,h4,h5,.blog_title{
font-family:{$tech['header_font']}, Sans-Serif;
h1{
font-family:{$tech_h1_font}, Sans-Serif;
}
h2{
font-family:{$tech_h2_font}, Sans-Serif;
}
h3{
font-family:{$tech_h3_font}, Sans-Serif;
}
h4{
font-family:{$tech_h4_font}, Sans-Serif;
}
h5{
font-family:{$tech_h5_font}, Sans-Serif;
}
.blog_title{
font-family:{$tech_blog_title_font}, Sans-Serif;
}
.post_title{
font-family:{$tech_post_title_font}, Sans-Serif;
}
.sidebar h2, .sidebar h3, #footer h2{
font-family:{$tech_sidebar_font}, Sans-Serif;
}
.blog_title{
font-size: {$tech['main_heading_font_size']}em;
Expand Down Expand Up @@ -583,6 +620,9 @@ function tech_color_verify($color){
.fontsizeplus{
font-size: 18px;
}
#l_sidebar, #content, #r_sidebar {
padding-top: 30px;
}
.post_comment_cont{
clear:both;
margin:3px;
Expand Down Expand Up @@ -627,7 +667,7 @@ function tech_color_verify($color){
border:none;
text-align:left;
min-width:760px;
margin:auto;
margin:0 auto 10px;
padding:0;
}
#pagel{
Expand Down Expand Up @@ -838,12 +878,16 @@ function tech_color_verify($color){
text-transform:capitalize;
}
#header {
margin:0 auto;
margin:10px auto 0;
padding:0;
min-width: 760px;
text-align:left;
position:relative;
}
#header_top{
background:transparent url({$img_path}/images/bgtop.png) repeat-x left top;
height: 100%;
}
#headerl{
background:url('{$img_path}/images/bgl.png') repeat-y scroll left top transparent;
width: 100%;
Expand Down
34 changes: 25 additions & 9 deletions options/option-array.php
Expand Up @@ -456,21 +456,13 @@
"options" => array("Trebuchet MS", "Verdana", "Georgia", "Tahoma", "Arial", "Times New Roman","Lucida Sans Unicode","Impact")),

array("name" => __("Cufon Font Replacement","techozoic"),
"desc" =>__("Visit this <a href=\"http://cufon.shoqolate.com/generate/\">link</a> to find out about Cufon.","techozoic"),
"desc" =>__("Visit this <a href=\"http://cufon.shoqolate.com/generate/\">link</a> to find out about Cufon. <strong>Cufon will be phased out in favor of <a href='http://code.google.com/webfonts'>Google Fonts</a></strong>","techozoic"),
"id" => "cufon_font",
"old_id" => "unused before 1.8.7",
"std" => "Disable",
"type" => "radio",
"options" => array("Enable","Disable")),

array("name" => __("Cufon Font Replacement","techozoic"),
"desc"=>__("Check which headings you would like replaced.","techozoic"),
"id" => "cufon_font_headings",
"old_id" => "unused before 1.8.7",
"std" => "",
"type" => "checkbox",
"options" => array("Main Blog Title","Sidebar Titles","Post Titles","H1 Headings","H2 Headings","H3 Headings","H4 Headings","H5 Headings")),

array("name" => __("Cufon Font Replacement","techozoic"),
"desc" => __("Choose the Font you would like to replace with. More coming in later versions.","techozoic"),
"id" => "cufon_font_list",
Expand All @@ -480,6 +472,30 @@
"type" => "select",
"options" => array("contempory","journal","nevis","quicksand")),

array("name" => __("Google Font Replacement","techozoic"),
"desc" =>__("Enable this to use the Google Font API to add new fonts.","techozoic"),
"id" => "google_font",
"old_id" => "unused before 1.8.7",
"std" => "Disable",
"type" => "radio",
"options" => array("Enable","Disable")),

array("name" => __("Goolge Fonts","techozoic"),
"desc" => __("Visit the <a href='http://code.google.com/webfonts' target='_blank'>Google Fonts</a> site to pick the font to use. After clicking on the font to use, locate the <strong>Font API parameter name</strong> ex: Walter+Turncoat. This should be added to the text box.","techozoic"),
"id" => "google_font_family",
"old_id" => "unused before 1.9.3",
"std" => "",
"type" => "text"),

array("name" => __("Font Replacement","techozoic"),
"desc"=>__("Check which headings you would like replaced.","techozoic"),
"id" => "font_headings",
"old_id" => "cufon_font_headings",
"std" => "",
"type" => "checkbox",
"options" => array("Main Blog Title","Sidebar Titles","Post Titles","H1 Headings","H2 Headings","H3 Headings","H4 Headings","H5 Headings")),


array( "name" => __("Custom Backgrounds","techozoic"),
"type" => "header",
"tab_id" => "background",
Expand Down
2 changes: 2 additions & 0 deletions readme.txt
Expand Up @@ -34,6 +34,8 @@ Installation can be done automatically through the Install Themes feature or man
* Removed deprecated comment function.
* Fixed problem with header folder upload permissions
* Added option to change image upload location, images can now be stored in wp-content directory to prevent removal with theme updates.
* Added border to top of header, and spacing to better frame theme.
* Added option to use Google Fonts.

= Version 1.9.2 =
* Fixed IE 7 layout error when blog title box was aligned left.
Expand Down
9 changes: 7 additions & 2 deletions reset-style.css
Expand Up @@ -26,7 +26,7 @@ body{
#page{
background-color:#F7F7F7;
border:none;
margin:auto;
margin:0 auto 10px;
min-width:760px;
padding:0;
text-align:left;
Expand Down Expand Up @@ -103,13 +103,18 @@ Header
#header{
background:url(images/headers/Grunge.jpg) no-repeat bottom center #f7f7f7;
height:200px;
margin:0 auto;
margin:10px auto 0;
padding:0;
width:95%;
min-width: 760px;
position: relative;
}

#header_top{
background:transparent url(images/bgtop.png) repeat-x left top;
height: 100%;
}

#headerimg{
-khtml-opacity:0.85px;
-moz-border-radius:3px;
Expand Down
9 changes: 7 additions & 2 deletions style.css
Expand Up @@ -26,7 +26,7 @@ body{
#page{
background-color:#F7F7F7;
border:none;
margin:auto;
margin:0 auto 10px;
min-width:760px;
padding:0;
text-align:left;
Expand Down Expand Up @@ -103,13 +103,18 @@ Header
#header{
background:url(images/headers/Grunge.jpg) no-repeat bottom center #f7f7f7;
height:200px;
margin:0 auto;
margin:10px auto 0;
padding:0;
width:95%;
min-width: 760px;
position: relative;
}

#header_top{
background:transparent url(images/bgtop.png) repeat-x left top;
height: 100%;
}

#headerimg{
-khtml-opacity:0.85px;
-moz-border-radius:3px;
Expand Down

0 comments on commit f306139

Please sign in to comment.