Permalink
Browse files

0.33

changes as in change log
  • Loading branch information...
jimo committed Sep 14, 2012
1 parent 51a3539 commit 157fc25efacec2e5207554657ae34dd9435a2c50
View
@@ -48,7 +48,6 @@
</div><!-- .entry-attachment -->
</div>
<?php fastfood_hook_after_post_content(); ?>
- <?php $ff_tmptrackback = get_trackback_url(); ?>
</div>
<?php fastfood_hook_after_post(); ?>
View
@@ -4,12 +4,12 @@
echo '<div class="comment_tools" id="comments">' . __( 'Enter your password to view comments.','fastfood' ) . '</div>';
return;
}
- global $fastfood_opt, $ff_is_printpreview, $ff_is_mobile_browser, $ff_is_ie6;
+ global $fastfood_opt, $fastfood_is_printpreview, $fastfood_is_mobile, $fastfood_is_ie6;
?>
<?php if ( comments_open() ) { ?>
<div class="comment_tools" id="comments">
- <?php comments_number( __( 'No Comments','fastfood' ), __( '1 Comment','fastfood' ), __( '% Comments','fastfood' ) ); ?> - <a href="#respond" title="<?php _e( "Leave a comment",'fastfood' ); ?>" <?php if ( !$ff_is_printpreview && ( $fastfood_opt['fastfood_cust_comrep'] == 1 ) && !$ff_is_mobile_browser ) echo 'onclick="return addComment.viewForm()"'; ?> ><?php _e( "Leave a comment",'fastfood' ); ?></a>
+ <?php comments_number( __( 'No Comments','fastfood' ), __( '1 Comment','fastfood' ), __( '% Comments','fastfood' ) ); ?> - <a href="#respond" title="<?php _e( "Leave a comment",'fastfood' ); ?>" <?php if ( !$fastfood_is_printpreview && ( $fastfood_opt['fastfood_cust_comrep'] == 1 ) && !$fastfood_is_mobile ) echo 'onclick="return addComment.viewForm()"'; ?> ><?php _e( "Leave a comment",'fastfood' ); ?></a>
</div>
<?php
} elseif ( have_comments() ) { ?>
@@ -39,7 +39,7 @@
}
//if comments are open
if ( comments_open() ) {
- if ( !$ff_is_printpreview ) { //script not to be loaded in print preview
+ if ( !$fastfood_is_printpreview ) { //script not to be loaded in print preview
//define custom argoments for comment form
$ff_custom_args = array(
'comment_field' => '<p class="comment-form-comment"><textarea id="comment" name="comment" cols="45" rows="7" style="width: 95%;max-width: 95%;" aria-required="true"></textarea></p>',
@@ -52,7 +52,7 @@
//output comment form
comment_form($ff_custom_args);
- if ( ( $fastfood_opt['fastfood_cust_comrep'] == 1 ) && !$ff_is_mobile_browser && !$ff_is_ie6 ) { // disable custom script if default comment-reply is in use ?>
+ if ( ( $fastfood_opt['fastfood_cust_comrep'] == 1 ) && !$fastfood_is_mobile && !$fastfood_is_ie6 ) { // disable custom script if default comment-reply is in use ?>
<script type="text/javascript">
/* <![CDATA[ */
addComment.resetForm();
View
@@ -6,12 +6,12 @@ input[type="checkbox"], input[type="radio"] {
input[type="radio"] {
margin-left: 20px;
}
-#fastfood-infos ul {
+#theme-infos ul {
list-style: disc outside;
margin-left: 30px;
}
-#fastfood-options,
-#fastfood-infos {
+#theme-options,
+#theme-infos {
background: #f9f9f9;
box-shadow: 0px 2px 8px #999;
margin: 0;
@@ -21,18 +21,18 @@ input[type="radio"] {
#tabs-container {
margin: 20px 20px 20px 150px;
}
-#ff-tabselector,
+#tabselector,
#selector {
position: absolute;
top: 100px;
left: 0;
}
-#ff-tabselector li,
+#tabselector li,
#selector li {
width: 130px;
padding: 3px 16px 3px 4px;
}
-#ff-tabselector li a,
+#tabselector li a,
#selector li a {
text-decoration: none;
}
@@ -44,7 +44,7 @@ input[type="radio"] {
font-weight: bold;
background: url("../images/litem_rtl.png") no-repeat 135px center transparent;
}
-#ff-main-wrap {
+#main-wrap {
position: relative;
}
.stylediv {
@@ -57,57 +57,72 @@ input[type="radio"] {
font-weight: bold;
font-size: 1.1em;
}
-.ff-sub-opt-nam {
+.sub-opt-nam {
font-size: 11px;
font-weight: bold;
}
-.ff-sub-opt-des {
+.sub-opt-des {
font-style:italic;
font-size: 10px;
}
.column-des {
font-style:italic;
- border-top: 1px solid #eee;
font-size: 10px;
- margin-top: 10px;
+ margin-top: 4px;
}
.column-req {
border-top: 1px solid #eee;
margin-top: 10px;
color: #999;
}
-.color_preview_box {
- width:2em;
- border:1px solid #262626;
- cursor: crosshair;
-}
-.ff-tab-opt {
+.tab-opt {
padding: 10px;
border-bottom: 2px groove #fff;
}
-.ff-sub-opt {
+.sub-opt-wrap {
margin-top: 10px;
padding-top: 10px;
padding-left: 20px;
border-top: 1px solid #eee;
}
-.column-des + .ff-sub-opt {
+.column-des + .sub-opt {
border-top: none;
padding-top: 0;
}
-.ff-col-tools {
- margin-top: 10px;
+.sub-opt.type-col {
+ float: left;
+ margin: 0 20px 20px 0;
+ width: 260px;
position: relative;
}
-.ff_cp {
- background:#eee;
- border:1px solid #aaa;
+.col-tools {
+ border: 1px solid #DFDFDF;
+ padding: 10px;
+ background-color: #fff;
+}
+
+.col-tools span {
+ font-weight: bold;
+}
+.color_preview_box {
+ width:80px;
+ height:80px;
+ float: left;
+ cursor: crosshair;
+}
+.col-tools input {
+ margin: 0 10px 0 0;
+}
+.option_cp {
+ background:#828c95;
+ background: -moz-linear-gradient(-45deg, #c6c6c6 0%, #828c95 36%, #3a3a3a 100%); /* FF3.6+ */
+ border-radius: 0 100px 100px 100px;
position:absolute;
display:none;
- top: 25px;
- left: 31px;
+ top: 70px;
+ left: 55px;
z-index: 500;
- box-shadow: 0 0 2px #777;
+ box-shadow: 0 0 2px #000;
}
.farbtastic .wheel {
left: 0;
View
@@ -1,4 +1,4 @@
-<?php global $current_user, $fastfood_opt, $fastfood_version, $post, $ff_is_printpreview; ?>
+<?php global $current_user, $fastfood_opt, $fastfood_version, $post, $fastfood_is_printpreview; ?>
<!-- begin footer -->
<?php fastfood_hook_before_footer(); ?>
@@ -10,7 +10,7 @@
&copy; <?php echo date( 'Y' ); ?> <strong><?php bloginfo( 'name' ); ?></strong> <?php _e( 'All rights reserved','fastfood' ); ?>
<?php if ( ( !isset( $fastfood_opt['fastfood_mobile_css'] ) || ( $fastfood_opt['fastfood_mobile_css'] == 1) ) ) echo '<span class="hide_if_print"> - <a href="' . home_url() . '?mobile_override=mobile">'. __('Mobile View','fastfood') .'</a></span>'; ?>
<small id="credits">
- <?php if ( $fastfood_opt['fastfood_tbcred'] == 1 ) { ?>Fastfood theme by <a href="http://www.twobeers.net/" title="<?php _e( 'Visit author homepage','fastfood' ); ?> @ TwoBeers.net">TwoBeers Crew</a> - Powered by <a href="http://wordpress.org/" title="<?php _e( 'Powered by WordPress','fastfood' ); ?>">WordPress</a><?php } ?>
+ <?php if ( $fastfood_opt['fastfood_tbcred'] == 1 ) { printf( __( 'Fastfood theme by %s - Powered by %s', 'fastfood' ), '<a target="_blank" href="http://www.twobeers.net/" title="' . __( 'Visit author homepage', 'fastfood' ) . ' @ TwoBeers.net">TwoBeers Crew</a>', '<a target="_blank" href="http://wordpress.org/" title="WordPress">WordPress</a>' ); } ?>
</small>
<!-- <?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. -->
@@ -25,7 +25,7 @@
<?php if ( $fastfood_opt['fastfood_navbuttons'] == 1 ) fastfood_navbuttons(); ?>
</div>
- <?php if ( $ff_is_printpreview ) { ?>
+ <?php if ( $fastfood_is_printpreview ) { ?>
<div id="close_preview">
<a id="close_button" title="<?php _e( 'Close','fastfood' ); ?>" href="<?php echo get_permalink( $post->ID ); ?>"><?php _e( 'Close','fastfood' ); ?></a>
<a href="javascript:window.print()" title="<?php _e( 'Print','fastfood' ); ?>" id="print_button" class="hide-if-no-js"><?php _e( 'Print','fastfood' ); ?></a>
@@ -40,7 +40,6 @@
global $fastfood_version;
echo ' | WP version - ' . get_bloginfo ( 'version' );
echo ' | WP language - ' . get_bloginfo ( 'language' );
- if ( phpversion() ) echo ' | PHP v' . phpversion();
foreach ( $fastfood_opt as $key => $val ) { echo ' | ' . $key . ' - ' . $val; };
?>
-->
Oops, something went wrong.

0 comments on commit 157fc25

Please sign in to comment.