From ad79fdb064d0443cb4d826b5949539fdd8b42efb Mon Sep 17 00:00:00 2001 From: "c.bavota" Date: Thu, 1 Sep 2011 16:18:58 -0400 Subject: [PATCH] Updated to version 1.0.3 --- changelog.txt | 11 + presswork/admin/actions.php | 95 +++++-- presswork/admin/css/toolbox-styles.css | 1 + presswork/admin/inc/columns.php | 54 ++-- presswork/admin/inc/footer-scripts.php | 2 +- presswork/admin/inc/slideshows.php | 3 +- presswork/admin/inc/toolbox.php | 32 ++- presswork/admin/inc/widget-featured.php | 2 +- presswork/admin/languages/presswork.mo | Bin 480 -> 480 bytes presswork/admin/languages/presswork.po | 319 ++++++++++++------------ presswork/functions.php | 18 +- presswork/index.php | 6 +- presswork/loop.php | 51 +--- presswork/style.css | 31 ++- 14 files changed, 347 insertions(+), 278 deletions(-) diff --git a/changelog.txt b/changelog.txt index 48b6238..83292b7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,16 @@ PressWork Changelog +Version 1.0.3 09/01/2011 +- Fix for webkit list issue +- Improved columns function +- Fixed syntax bug in site header +- Fixed width issue when adding sidebar +- Added home page action for featured/sticky query +- Changed slideshow image to full size +- Updated toolbox function for child theme support +- Added donate button to admin page +- Updated language files + Version 1.0.2 08/11/2011 - Updated code for child theme requirements - Fixed missing textdomain on text elements diff --git a/presswork/admin/actions.php b/presswork/admin/actions.php index 63a9bfa..a1c468d 100755 --- a/presswork/admin/actions.php +++ b/presswork/admin/actions.php @@ -77,9 +77,9 @@ function pw_footer_content() { function pw_sidebar() { echo pw_function_handle(__FUNCTION__); if(!dynamic_sidebar("first-sidebar")) : - echo '
'; + echo '
'; + echo ''; $args = array( 'before_widget' => ''; } endif; } @@ -111,9 +111,9 @@ function pw_sidebar() { function pw_second_sidebar() { echo pw_function_handle(__FUNCTION__); if(!dynamic_sidebar("second-sidebar" ) && current_user_can('edit_theme_options')) : - echo '

'; + echo '

'; endif; + echo '

'; endif; } add_action('pw_second_sidebar_middle', 'pw_second_sidebar'); @@ -162,14 +162,14 @@ function pw_pagination() { function pw_404() { echo pw_function_handle(__FUNCTION__); ?> -
+

-
+ $sticky, + 'ignore_sticky_posts' => 1 + ); + $the_query = new WP_Query( $args ); + while ( $the_query->have_posts() ) : $the_query->the_post(); + ?> +
> + +
+ $notin, + 'posts_per_page' => 2 + ); + $the_query = new WP_Query( $args ); + while ( $the_query->have_posts() ) : $the_query->the_post(); + if($paged < 2) { + $notin[] = $post->ID; + ?> +
> + +
+ ID; + } + endwhile; + wp_reset_query(); + } + query_posts( array( 'post__not_in' => $notin, "paged" => $paged ) ); +} +add_action('pw_home_page', 'pw_home_page_featured_query'); + /* * Featured posts */ @@ -352,7 +405,7 @@ function pw_posts_featured() { $image_img_tag = wp_get_attachment_image( $image->ID, 'full' ); ?> -

%2$s photo →.', 'This gallery contains %2$s photos →.', $total_images, "presswork" ), +

%2$s photo →', 'This gallery contains %2$s photos →', $total_images, "presswork" ), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', "presswork" ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"', number_format_i18n( $total_images ) ); ?> @@ -422,7 +475,7 @@ function pw_posts() { $image_img_tag = wp_get_attachment_image( $image->ID, 'full' ); ?> -

%2$s photo →.', 'This gallery contains %2$s photos →.', $total_images, "presswork" ), +

%2$s photo →', 'This gallery contains %2$s photos →', $total_images, "presswork" ), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', "presswork" ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"', number_format_i18n( $total_images ) ); ?> @@ -525,13 +578,11 @@ function pw_columns_post_title($r) {

">

- '; _e("By", "presswork"); echo " "; the_author_posts_link(); echo ''; } ?> - -
- -
- - '; the_time(get_option('date_format')); echo ''; } ?> +

@@ -559,7 +610,7 @@ function pw_columns_post_content($r) { $image_img_tag = wp_get_attachment_image( $image->ID, 'full' ); ?> -

%2$s photo.', 'This gallery contains %2$s photos.', $total_images, "presswork" ), +

%2$s photo →', 'This gallery contains %2$s photos →', $total_images, "presswork" ), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', "presswork" ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"', number_format_i18n( $total_images ) ); ?> @@ -577,11 +628,12 @@ function pw_columns_post_content($r) { if($r['images']==1) { if(function_exists('has_post_thumbnail') && has_post_thumbnail()) { echo ''; - the_post_thumbnail(array($r['img_w'], $r['img_h']), array('class'=>'alignright')); + the_post_thumbnail(array($r['img_w'], $r['img_h']), array('class'=>$r['img_float'])); echo ''; } } the_excerpt(); + if($r['readmore']==1) echo ''.__( 'Read more →', "presswork" ).''; } } ?> @@ -590,11 +642,6 @@ function pw_columns_post_content($r) { } add_action('pw_columns_middle', 'pw_columns_post_content', 1, 1); -function pw_columns_post_readmore($r) { - if($r['readmore']==1) echo ''.__( 'Read more →', "presswork" ).''; -} -add_action('pw_columns_bottom', 'pw_columns_post_readmore', 1, 1); - // Including child theme action file if(!defined('CHILD_ACTION_FILE')) define('CHILD_ACTION_FILE', STYLESHEETPATH.'/actions.php'); diff --git a/presswork/admin/css/toolbox-styles.css b/presswork/admin/css/toolbox-styles.css index c366be8..8e36ebb 100755 --- a/presswork/admin/css/toolbox-styles.css +++ b/presswork/admin/css/toolbox-styles.css @@ -581,6 +581,7 @@ div.handle { z-index: 500; color: #444; font-size: 14px; + background: #f0f0f0; } #close-welcome:hover { diff --git a/presswork/admin/inc/columns.php b/presswork/admin/inc/columns.php index 375596f..4852f70 100755 --- a/presswork/admin/inc/columns.php +++ b/presswork/admin/inc/columns.php @@ -9,25 +9,27 @@ * @since PressWork 1.0 */ function pw_columns($args = '') { - global $pw_content_width; + global $pw_content_width, $paged; + $defaults = array( 'width' => 'full', 'columns' => 1, 'posts' => 1, 'text' => 'excerpt', 'readmore' => 1, - 'category' => 'all', + 'category' => 0, 'dates' => 1, 'authors' => 1, 'comments' => 1, 'images' => 1, 'img_w' => 100, 'img_h' => 100, - 'margin-right' => '', + 'img_float' => 'alignright', + 'margin_right' => '', 'offset' => '', 'title' => '', 'id' => '', - 'padding' => 15, + 'padding' => 0, 'colmargin' => 30 ); @@ -35,45 +37,51 @@ function pw_columns($args = '') { extract( $r, EXTR_SKIP ); $featuredcat = pw_theme_option('fp_featured'); - $posts = array( + $post_query = array( "posts_per_page"=>$r['posts'], + "ignore_sticky_posts" => 1, + 'paged' => $paged ); - if($r['category']!="all") - $posts['cat'] = $r['category']; - - if(isset($r['offset'])) - $posts['offset'] = $r['offset']; + if($r['category']!=0) + $post_query['cat'] = $r['category']; - $column = new WP_Query(); - $column->query($posts); + if(!empty($r['offset'])) + $post_query['offset'] = $r['offset']; if($r['width']=="full") { - $width = ' style="width:100%; margin-right:'.$r['margin-right'].'px;"'; - if($r['columns']!=1) $col_width = ($pw_content_width - ($padding * 2 * $columns) - ($colmargin*($columns-1))) / $r['columns']; else $col_width = $pw_content_width - ($padding * 2); - $col_width = ' style="width: '.$col_width.'px;'; + $width = ' style="width:100%;'; + if(!empty($r['margin_right'])) $width .= ' margin-right:'.$r['margin_right'].'px;"'; else $width .= '"'; + if($r['columns']!=1) $col_width = ($pw_content_width - ($colmargin*($columns-1))) / $r['columns']; else $col_width = $pw_content_width; } else { - $width = ' style="width:'.$r['width'].'px; margin-right:'.$r['margin-right'].'px;"'; - if($r['columns']!=1) $col_width = ($r['width'] - ($padding * 2 * $columns) - ($colmargin*($columns-1))) / $r['columns']; else $col_width = $r['width'] - ($padding * 2); - $col_width = ' style="width: '.$col_width.'px;'; + $width = ' style="width:'.$r['width'].'px; margin-right:'.$r['margin_right'].'px;"'; + if($r['columns']!=1) $col_width = ($r['width'] - ($colmargin*($columns-1))) / $r['columns']; else $col_width = $r['width']; } + $col_width = ' style="width: '.$col_width.'px;'; + if(!empty($padding)) $col_width .= ' padding: '.$padding.'px;'; + $x=1; if(!empty($r['id'])) { $id = ' id="'.$r['id'].'"'; } else { $id = ""; } + + $column_query = new WP_Query(); + $column_query->query($post_query); + ?>

> - '.$r['title'].'
'; ?> - have_posts()) : $column->the_post(); ?> + have_posts()) : $column_query->the_post(); ?> 1) $final_width = $col_width.' margin-left: '.$colmargin.'px;"'; else $final_width = $col_width.'"'; ?> -
> +
> -
+ 1 ); } + $featured = new WP_Query(); $featured->query($posts); ?> @@ -47,7 +48,7 @@ function pw_slideshow($args = '') { '; - the_post_thumbnail(array($r['width'], $r['height'])); + the_post_thumbnail('full'); echo ''; } ?> diff --git a/presswork/admin/inc/toolbox.php b/presswork/admin/inc/toolbox.php index 88dbee7..42d9859 100755 --- a/presswork/admin/inc/toolbox.php +++ b/presswork/admin/inc/toolbox.php @@ -67,18 +67,8 @@ function pw_toolbox() {
X
- +
@@ -157,6 +147,24 @@ function pw_add_all_color_options() { } endif; +if(!function_exists('pw_color_select_options')) : +function pw_color_select_options() { + ?> + + + + + + + + + + + + diff --git a/presswork/admin/inc/widget-featured.php b/presswork/admin/inc/widget-featured.php index d38e0e2..b6f02e3 100755 --- a/presswork/admin/inc/widget-featured.php +++ b/presswork/admin/inc/widget-featured.php @@ -34,8 +34,8 @@ function widget($args, $instance) { if(function_exists('has_post_format') && (has_post_format('aside') || has_post_format('link') || has_post_format('gallery'))) { // new aside || link post format // do nothing } else { + $rightcon = ''; if(function_exists('has_post_format') && !has_post_format('image')) { - $rightcon = ''; if(function_exists('has_post_thumbnail') && has_post_thumbnail()) { echo ''; the_post_thumbnail('fifty', array('class'=>'alignleft')); diff --git a/presswork/admin/languages/presswork.mo b/presswork/admin/languages/presswork.mo index 5942d57ea248d267afcde604be133ada20eea469..7dc48496c3fdfcb25b104fbcf6f895838bca9c5a 100644 GIT binary patch delta 31 fcmaFB{D65v6Nizpf}yFEsp-Tn1vq=-COt*~m%s?r delta 31 fcmaFB{D65v6NjOpf}w$xspZ5j1vq=-COt*~mm~\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,20 +18,20 @@ msgid "This post is password protected. Enter the password to view any comments. msgstr "" #: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:176 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:75 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:167 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:157 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:175 msgid "Primary Nav Menu" msgstr "" #: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:177 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:76 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:168 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:158 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:176 msgid "Secondary Nav Menu" msgstr "" #: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:178 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:77 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:172 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:159 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:180 msgid "Footer Nav Menu" msgstr "" @@ -69,247 +69,256 @@ msgstr "" msgid "If you have any questions or feedback, please check out our %s." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:317 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:325 #, php-format msgid "Version %1$s of %2$s is now available. Go to %3$s page." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:340 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:348 msgid "Resources" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:342 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:350 msgid "Support Forum" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:343 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:351 msgid "PressWork on Github" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:344 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:352 msgid "Find us on Twitter" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:437 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:353 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:722 +msgid "Browse Our Themes" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:446 msgid "Top Main Content on Index" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:439 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:448 msgid "The area above the main content on the index page. Perfect spot for a slideshow." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:447 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:456 msgid "Header Area" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:449 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:458 msgid "The header area appears on every page of your site if it has been placed in the header." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:457 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:466 #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:44 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:170 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:178 msgid "First Sidebar" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:459 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:468 msgid "The first sidebar appears on every page of your site, unless you have selected full width for a post or page." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:467 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:476 #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:44 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:171 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:179 msgid "Second Sidebar" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:469 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:478 msgid "The second sidebar appears on every page of your site, unless you have selected full width for a post or page." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:477 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:173 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:486 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:181 msgid "Extended Footer" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:479 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:488 msgid "The extended footer appears at the bottom of your site if it has been placed in the footer." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:551 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:560 #, php-format msgid "%1$s at %2$s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:552 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:573 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:492 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:561 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:582 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:540 msgid "(edit)" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:556 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:565 msgid "Your comment is awaiting moderation." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:573 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:582 msgid "Pingback:" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:586 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:595 msgid "Your name" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:587 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:596 msgid "Your email" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:588 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:597 msgid "Your website" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:819 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:721 +msgid "PW Admin" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:831 #, php-format msgid "Add widgets to the Header Area %shere%s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:902 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:914 #, php-format msgid "Add widgets to the Extended Footer %shere%s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:912 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:924 #, php-format msgid "© %1$d %2$s. All Rights Reserved." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:914 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:926 #, php-format msgid "Created using %s." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:1003 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:1015 msgid "Search for:" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:1004 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/functions.php:1016 msgid "Search..." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:106 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:101 #, php-format msgid "Add your own widgets to the First Sidebar %shere%s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:120 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:115 #, php-format msgid "Add widgets to the Second Sidebar %shere%s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:172 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:167 msgid "Not found" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:175 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:170 msgid "No results were found for your request." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:193 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:188 #, php-format msgid "Posts Tagged ‘%s’" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:196 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:199 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:202 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:191 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:194 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:197 msgid "Archive for" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:205 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:200 msgid "Blog Archives" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:213 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:230 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:243 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:208 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:225 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:238 msgid "No posts found." msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:266 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:261 msgid "Reply" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:279 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:274 msgid "Comment navigation" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:280 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:275 msgid "← Older Comments" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:281 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:276 msgid "Newer Comments →" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:296 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:291 msgid "Your comment" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:309 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:304 msgid "search results for" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:335 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:390 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:474 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:383 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:438 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:522 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:582 msgid "by" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:338 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:397 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:479 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:386 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:445 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:527 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:584 msgid "0 Comments" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:338 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:397 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:479 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:386 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:445 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:527 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:584 msgid "1 Comment" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:338 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:397 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:479 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:386 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:445 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:527 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:584 msgid "% Comments" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:369 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:449 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:486 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:577 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:599 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:417 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:497 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:534 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:623 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:636 msgid "Read more →" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:490 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:538 msgid "Tags" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:491 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:539 msgid "Pages" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:511 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:559 msgid "About" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:531 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:579 #, php-format msgid "Permanent Link to %s" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/actions.php:533 -msgid "By" -msgstr "" - #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/footer-scripts.php:398 msgid "If you leave this page you will lose your changes." msgstr "" @@ -328,7 +337,7 @@ msgstr "" msgid "Layout" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/slideshows.php:66 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/slideshows.php:68 msgid "Read more" msgstr "" @@ -403,131 +412,131 @@ msgstr "" msgid "Colors" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:71 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:165 -msgid "Blog Name" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:72 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:166 -msgid "Description" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:73 -msgid "Links" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:74 -msgid "Main Text" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:78 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:151 -msgid "Category Header" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:79 -msgid "Post Title" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:80 -msgid "Post Meta" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:81 -msgid "Page Background" -msgstr "" - -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:93 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:83 msgid "Fonts" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:96 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:86 msgid "Headers" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:97 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:87 msgid "Body" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:98 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:88 msgid "Font Size" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:100 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:90 msgid "Fonts by" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:105 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:95 msgid "Social" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:108 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:98 msgid "Username (without @)" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:109 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:112 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:113 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:99 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:102 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:103 msgid "Username" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:110 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:111 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:100 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:101 msgid "User ID" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:126 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:116 msgid "Updated" msgstr "" +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:123 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:125 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:126 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:128 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:129 #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:133 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:135 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:136 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:138 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:139 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:143 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:147 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:152 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:154 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:137 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:142 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:144 msgid "Color" msgstr "" +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:124 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:127 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:130 #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:134 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:137 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:140 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:144 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:148 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:153 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:138 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:143 msgid "Hover Color" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:141 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:131 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:135 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:139 #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:145 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:149 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:155 msgid "BG Color" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:142 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:146 -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:150 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:132 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:136 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:140 msgid "BG Hover Color" msgstr "" +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:141 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:160 +msgid "Category Header" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:153 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:173 +msgid "Blog Name" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:154 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:174 +msgid "Description" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:155 +msgid "Links" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:156 +msgid "Main Text" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:161 +msgid "Post Title" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:162 +msgid "Post Meta" +msgstr "" + #: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:163 +msgid "Page Background" +msgstr "" + +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:171 msgid "Logo" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:164 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:172 msgid "Header Image" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:169 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:177 msgid "Widgetized Area" msgstr "" -#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:174 +#: /users/cbavota/presswork/pressworkdev/pressworkdev/admin/inc/toolbox.php:182 msgid "Copyright" msgstr "" diff --git a/presswork/functions.php b/presswork/functions.php index accf960..c501f65 100755 --- a/presswork/functions.php +++ b/presswork/functions.php @@ -309,6 +309,14 @@ function pw_admin_page() { echo '

'; printf(__("If you have any questions or feedback, please check out our %s.", "presswork"), 'Support Forum'); echo '

'; + ?> + + + + + + + -

@PressWorkWP

+

@PressWorkWP

Want more functionality? Get

'.__("Support Forum", "presswork").''; $contextual_help .= '
  • '.__("PressWork on Github", "presswork").'
    • '; $contextual_help .= '
  • '.__("Find us on Twitter", "presswork").'
    • '; + $contextual_help .= '
  • '.__("Browse Our Themes", "presswork").'
    • '; $contextual_help .= ''; } return $contextual_help; @@ -708,7 +717,10 @@ function pw_add_menu_admin_bar() { return; /* Add the main siteadmin menu item */ - $wp_admin_bar->add_menu( array( 'id' => 'presswork-options', 'title' => "PressWork", 'href' => admin_url('themes.php')."?page=PressWork" ) ); + $wp_admin_bar->add_menu( array( 'id' => 'presswork-menu', 'title' => "PressWork", 'href' => admin_url('themes.php')."?page=PressWork" ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'presswork-menu', 'id' => 'presswork-admin', 'title' => __("PW Admin", "presswork"), 'href' => admin_url('themes.php')."?page=PressWork" ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'presswork-menu', 'id' => 'presswork-themes', 'title' => __("Browse Our Themes", "presswork"), 'href' => 'http://presswork.me/category/themes/' ) ); + } add_action( 'admin_bar_menu', 'pw_add_menu_admin_bar', 1000 ); @@ -826,7 +838,7 @@ function pw_get_element($name, $class = null) { ?>
  • -

    +

    • ID, 'pw_single_layout', true); - if($fullwidth==2) $layout = "maincontent"; + if(is_singular()) { + $fullwidth = get_post_meta($post->ID, 'pw_single_layout', true); + if($fullwidth==2) $layout = "maincontent"; + } $layout = explode(",", $layout); $i = 1; foreach($layout as $elem) { diff --git a/presswork/loop.php b/presswork/loop.php index e61e8ab..960a942 100755 --- a/presswork/loop.php +++ b/presswork/loop.php @@ -20,55 +20,12 @@ ?> $sticky, - 'ignore_sticky_posts' => 1 - ); - $the_query = new WP_Query( $args ); - while ( $the_query->have_posts() ) : $the_query->the_post(); - ?> -
    > - -
    - $notin, - 'posts_per_page' => 2 - ); - $the_query = new WP_Query( $args ); - while ( $the_query->have_posts() ) : $the_query->the_post(); - if($paged < 2) { - $notin[] = $post->ID; - ?> -
    > - -
    - ID; - } - endwhile; - wp_reset_query(); - } - query_posts( array( 'post__not_in' => $notin, "paged" => $paged ) ); - echo '
    '; -} +if(is_home()) do_action('pw_home_page'); + global $current_class; $current_class = 'odd'; + +if(is_home()) echo '
    '; ?> diff --git a/presswork/style.css b/presswork/style.css index 781759b..3d4830f 100755 --- a/presswork/style.css +++ b/presswork/style.css @@ -2,7 +2,7 @@ Theme Name: PressWork Theme URI: http://presswork.me/about/ Description: PressWork is a free, open source theme framework built for WordPress 3.2 using HTML5 and CSS3. Created by c.bavota and Brendan Sera-Shriar. -Version: 1.0.2 +Version: 1.0.3 Author: c.bavota, Brendan Sera-Shriar Author URI: http://presswork.me/ Tags: right-sidebar, left-sidebar, flexible-width, three-columns, two-columns, one-column, white, green, custom-header, custom-background, custom-colors, custom-menu, featured-images, full-width-template, post-formats, sticky-post, threaded-comments, translation-ready, theme-options @@ -96,6 +96,7 @@ p, table { margin: 1em 0; } ul, ol { padding: 0 0 0 20px; } article ul li { list-style: disc; } article ol li { list-style: decimal; } +article li { clear: left; } h1, #blogname .siteheader { font-size: 2.4em; } h2 { font-size: 2.0em; } h3 { font-size: 1.8em; } @@ -377,12 +378,14 @@ nav { } #main-wrapper .el1 { - *margin-left: 0 !important; + *margin-left: 0 !important; /* for IE */ + margin-left: 0\0/ !important; /* for IE */ } #main-wrapper .el2, #main-wrapper .el3 { - *margin-right: 0 !important; + *margin-right: 0 !important; /* for IE */ + margin-right: 0\0/ !important; /* for IE */ } #main-wrapper > li:nth-child(1) { @@ -398,6 +401,11 @@ nav { float: left; width: 100%; } + + #maincontent .content-widget.pw_columns { + width: auto; + clear: none; + } article { float: left; @@ -442,7 +450,7 @@ article { article .meta { font-size: 0.9em; - line-height: 1em; + line-height: 1.5em; float: left; width :100%; font-style: italic; @@ -869,6 +877,7 @@ nav#page-numbers span.current { #extendedfooter .widget2 { margin: 0 5% 20px; + *margin: 0 4.5% 20px; /* for IE 7 */ } #extendedfooter .rsswidget img { @@ -932,6 +941,7 @@ footer#footer-main { margin: 0 0 20px; visibility: hidden; width: 100%; + clear: both; } .pw-slideshow .slideshow-content { @@ -1311,7 +1321,8 @@ p.error { margin: 12px 0; } -div.warning { +div.warning, +aside.warning { -moz-border-radius: 3px; -khtml-border-radius: 3px; -webkit-border-radius: 3px; @@ -1326,19 +1337,21 @@ div.warning { font-family: Arial, sans-serif; } - div.warning a { + div.warning a, + aside.warning a { color: #000 !important; border-bottom: 1px dotted #000; background: none !important; } - div.warning p { + div.warning p, + aside.warning p { padding: 8px 10px; margin: 0; } - #firstsidebar div.warning, - #secondsidebar div.warning { + #firstsidebar aside.warning, + #secondsidebar aside.warning { margin-bottom: 20px; }