Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Finishing touches.

  • Loading branch information...
commit d07babf2e6296f656e709bcacafbe4049fa2395f 1 parent 135e7f8
@cbavota cbavota authored
View
2  presswork/admin/css/admin-style.css
@@ -76,7 +76,7 @@
background: url(../images/sprite.png) no-repeat -165px -60px;
padding-left: 30px;
font-size: 12px;
- margin: 30px auto 0;
+ margin: 20px auto 0;
width :90px;
}
View
130 presswork/admin/languages/presswork.po
@@ -10,22 +10,28 @@ msgstr ""
"MIME-Version: 1.0\n"
#. Text in function
+#: presswork/functions.php:440
+msgid "%1$s at %2$s"
+msgstr ""
+
+#. Text in function
#: presswork/admin/actions.php:215
msgid "← Older Comments"
msgstr ""
#. Text in function
-#: presswork/functions.php:433
+#: presswork/functions.php:440
+#: presswork/functions.php:462
msgid "(Edit)"
msgstr ""
#. Text in echo
-#: presswork/functions.php:439
+#: presswork/functions.php:446
msgid "<em>Your comment is awaiting moderation.</em>"
msgstr ""
#. Text in function
-#: presswork/functions.php:246
+#: presswork/functions.php:247
msgid "<p>If you have any questions or feedback, please check out our %s.</p>"
msgstr ""
@@ -42,17 +48,17 @@ msgid "Archive for"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:132
-#: presswork/admin/inc/toolbox.php:136
-#: presswork/admin/inc/toolbox.php:140
-#: presswork/admin/inc/toolbox.php:145
+#: presswork/admin/inc/toolbox.php:133
+#: presswork/admin/inc/toolbox.php:137
+#: presswork/admin/inc/toolbox.php:141
+#: presswork/admin/inc/toolbox.php:147
msgid "BG Color"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:133
-#: presswork/admin/inc/toolbox.php:137
-#: presswork/admin/inc/toolbox.php:141
+#: presswork/admin/inc/toolbox.php:134
+#: presswork/admin/inc/toolbox.php:138
+#: presswork/admin/inc/toolbox.php:142
msgid "BG Hover Color"
msgstr ""
@@ -63,12 +69,12 @@ msgstr ""
#. Text in echo
#: presswork/admin/inc/toolbox.php:67
-#: presswork/admin/inc/toolbox.php:154
+#: presswork/admin/inc/toolbox.php:156
msgid "Blog Name"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:92
+#: presswork/admin/inc/toolbox.php:93
msgid "Body"
msgstr ""
@@ -88,6 +94,12 @@ msgid "Category"
msgstr ""
#. Text in echo
+#: presswork/admin/inc/toolbox.php:73
+#: presswork/admin/inc/toolbox.php:143
+msgid "Category Header"
+msgstr ""
+
+#. Text in echo
#: presswork/admin/inc/welcome.php:22
msgid "Close"
msgstr ""
@@ -98,15 +110,15 @@ msgid "Close the<br />Welcome Screen"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:124
-#: presswork/admin/inc/toolbox.php:126
+#: presswork/admin/inc/toolbox.php:125
#: presswork/admin/inc/toolbox.php:127
-#: presswork/admin/inc/toolbox.php:129
+#: presswork/admin/inc/toolbox.php:128
#: presswork/admin/inc/toolbox.php:130
-#: presswork/admin/inc/toolbox.php:134
-#: presswork/admin/inc/toolbox.php:138
-#: presswork/admin/inc/toolbox.php:142
+#: presswork/admin/inc/toolbox.php:131
+#: presswork/admin/inc/toolbox.php:135
+#: presswork/admin/inc/toolbox.php:139
#: presswork/admin/inc/toolbox.php:144
+#: presswork/admin/inc/toolbox.php:146
msgid "Color"
msgstr ""
@@ -127,13 +139,13 @@ msgid "Content Margins"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:163
+#: presswork/admin/inc/toolbox.php:165
msgid "Copyright"
msgstr ""
#. Text in echo
#: presswork/admin/inc/toolbox.php:68
-#: presswork/admin/inc/toolbox.php:155
+#: presswork/admin/inc/toolbox.php:157
msgid "Description"
msgstr ""
@@ -158,30 +170,30 @@ msgid "Enter your Twitter, Facebook &amp; Flickr usernames so people can find yo
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:162
-#: presswork/functions.php:701
+#: presswork/admin/inc/toolbox.php:164
+#: presswork/functions.php:718
msgid "Extended Footer"
msgstr ""
#. Text in echo
#: presswork/admin/inc/toolbox.php:43
-#: presswork/admin/inc/toolbox.php:159
-#: presswork/functions.php:701
+#: presswork/admin/inc/toolbox.php:161
+#: presswork/functions.php:718
msgid "First Sidebar"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:93
+#: presswork/admin/inc/toolbox.php:94
msgid "Font Size"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:88
+#: presswork/admin/inc/toolbox.php:89
msgid "Fonts"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:95
+#: presswork/admin/inc/toolbox.php:96
msgid "Fonts by"
msgstr ""
@@ -191,7 +203,7 @@ msgid "Footer"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:161
+#: presswork/admin/inc/toolbox.php:163
msgid "Footer Nav Menu"
msgstr ""
@@ -221,22 +233,22 @@ msgid "Header"
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "Header Area"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:91
+#: presswork/admin/inc/toolbox.php:92
msgid "Headers"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:125
-#: presswork/admin/inc/toolbox.php:128
-#: presswork/admin/inc/toolbox.php:131
-#: presswork/admin/inc/toolbox.php:135
-#: presswork/admin/inc/toolbox.php:139
-#: presswork/admin/inc/toolbox.php:143
+#: presswork/admin/inc/toolbox.php:126
+#: presswork/admin/inc/toolbox.php:129
+#: presswork/admin/inc/toolbox.php:132
+#: presswork/admin/inc/toolbox.php:136
+#: presswork/admin/inc/toolbox.php:140
+#: presswork/admin/inc/toolbox.php:145
msgid "Hover Color"
msgstr ""
@@ -256,7 +268,7 @@ msgid "Links"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:153
+#: presswork/admin/inc/toolbox.php:155
msgid "Logo"
msgstr ""
@@ -277,7 +289,7 @@ msgid "Main Text"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:156
+#: presswork/admin/inc/toolbox.php:158
msgid "Nav Menu"
msgstr ""
@@ -342,7 +354,7 @@ msgid "PW - Twitter Feed"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:75
+#: presswork/admin/inc/toolbox.php:76
msgid "Page Background"
msgstr ""
@@ -365,12 +377,17 @@ msgid "Permanent Link to %s"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:74
+#: presswork/functions.php:462
+msgid "Pingback:"
+msgstr ""
+
+#. Text in echo
+#: presswork/admin/inc/toolbox.php:75
msgid "Post Meta"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:73
+#: presswork/admin/inc/toolbox.php:74
msgid "Post Title"
msgstr ""
@@ -391,7 +408,7 @@ msgid "PressWork comes with the top 20 most popular Google Fonts. You can easily
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:81
+#: presswork/admin/inc/toolbox.php:82
msgid "Preview"
msgstr ""
@@ -433,13 +450,13 @@ msgstr ""
#. Text in echo
#: presswork/admin/inc/toolbox.php:43
-#: presswork/admin/inc/toolbox.php:160
-#: presswork/functions.php:701
+#: presswork/admin/inc/toolbox.php:162
+#: presswork/functions.php:718
msgid "Second Sidebar"
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:100
+#: presswork/admin/inc/toolbox.php:101
msgid "Social"
msgstr ""
@@ -449,7 +466,7 @@ msgid "Social Networking"
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:157
+#: presswork/admin/inc/toolbox.php:159
msgid "Sub Nav Menu"
msgstr ""
@@ -479,22 +496,22 @@ msgid "The PressWork<br />Toolbar"
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "The extended footer appears at the bottom of your site if it has been placed in the footer."
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "The first sidebar appears on every page of your site, unless you have selected full width for a post or page."
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "The header area appears on every page of your site if it has been placed in the header."
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "The second sidebar appears on every page of your site, unless you have selected full width for a post or page."
msgstr ""
@@ -520,7 +537,7 @@ msgid "Title"
msgstr ""
#. Text in function
-#: presswork/functions.php:245
+#: presswork/functions.php:246
msgid "Toolbox Deactivated."
msgstr ""
@@ -530,7 +547,7 @@ msgid "Turn on the Drag &amp; Drop Editor, Guides &amp; Functions, or even Reset
msgstr ""
#. Text in echo
-#: presswork/admin/inc/toolbox.php:117
+#: presswork/admin/inc/toolbox.php:118
msgid "Updated"
msgstr ""
@@ -540,12 +557,12 @@ msgid "Username"
msgstr ""
#. Text in function
-#: presswork/functions.php:701
+#: presswork/functions.php:718
msgid "Version %1$s of %2$s is now available. Go to %3$s page."
msgstr ""
#. Text in function
-#: presswork/admin/inc/toolbox.php:158
+#: presswork/admin/inc/toolbox.php:160
msgid "Widgetized Area"
msgstr ""
@@ -557,11 +574,6 @@ msgid "by"
msgstr ""
#. Text in function
-#: presswork/functions.php:433
-msgid "on %1$s at %2$s"
-msgstr ""
-
-#. Text in function
#: presswork/admin/actions.php:228
msgid "search results for"
msgstr ""
View
67 presswork/functions.php
@@ -245,13 +245,15 @@ function pw_admin_page() {
<img src="<?php echo get_template_directory_uri(); ?>/admin/images/logo_pw.jpg" width="260" height="114" alt="" class="pw-logo" />
<?php echo '<div id="message" class="updated fade" style="display: none;"><p><strong>'.THEME_NAME." ".__("Toolbox Deactivated.", "presswork").'</strong></p></div>'."\n"; ?>
<?php
- printf(__("<p>If you have any questions or feedback, please check out our %s.</p>", "presswork"), '<a href="http://presswork.me/support/">Support Forum</a>');
+ printf(__("<p>If you've got mad skills when it comes to WordPress and you want to join the %s community,<br />find us on %s and contribute. Together we can make %s the ultimate WordPress framework.</p><p>Click on the button below to activate/deactivate the %s front-end toolbox.</p>", "presswork"), THEME_NAME, "<a href='https://github.com/digibomb/PressWork' target='_blank'>GitHub</a>", THEME_NAME, THEME_NAME);
$toolbox = theme_option('toolbox');
if($toolbox=="on") { $class = "deactivate"; } else { $class = ''; }
?>
<a href="javascript:void(0)" class="active <?php echo $class; ?>"></a>
<input type="hidden" name="frontURL" id="frontURL" value="<?php echo home_url("/"); ?>" />
- <?php /*
+ <?php
+ printf(__("<p>If you have any questions or feedback, please check out our %s.</p>", "presswork"), '<a href="http://presswork.me/support/">Support Forum</a>');
+ /*
<p class="pw-briefcase">Want more functionality? Get</p>
*/ ?>
<p class="pw-twitter"><a href="http://twitter.com/pressworkwp">@PressWorkWP</a></p>
@@ -423,33 +425,46 @@ function pw_widgets_init() {
*
* @since PressWork 1.0
*/
- function pw_comment_template($comment, $args, $depth) {
- $GLOBALS['comment'] = $comment; ?>
+ function pw_comment_template($comment, $args, $depth) {
+ $GLOBALS['comment'] = $comment;
+ switch ( $comment->comment_type ) :
+ case '' :
+ ?>
<li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
- <div id="comment-<?php comment_ID(); ?>">
- <div class="comment-avatar">
- <?php echo get_avatar( $comment, 60 ); ?>
- </div>
- <div class="comment-author">
- <?php echo get_comment_author_link()." "; ?>
- </div>
- <div class="comment-meta">
- <?php
- printf(__('%1$s at %2$s', "presswork"), get_comment_date(),get_comment_time());
- edit_comment_link(__('(Edit)', "presswork"),' ','');
- ?>
- </div>
- <div class="comment-text">
- <?php if ($comment->comment_approved == '0') { _e('<em>Your comment is awaiting moderation.</em>', "presswork"); } ?>
- <?php comment_text() ?>
- </div>
- <?php if($args['max_depth']!=$depth && comments_open() && $comment->comment_type!="pingback") { ?>
- <div class="reply">
- <?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
+ <div id="comment-<?php comment_ID(); ?>">
+ <div class="comment-avatar">
+ <?php echo get_avatar( $comment, 60 ); ?>
+ </div>
+ <div class="comment-author">
+ <?php echo get_comment_author_link()." "; ?>
+ </div>
+ <div class="comment-meta">
+ <?php
+ printf(__('%1$s at %2$s', "presswork"), get_comment_date(),get_comment_time());
+ edit_comment_link(__('(Edit)', "presswork"),' ','');
+ ?>
+ </div>
+ <div class="comment-text">
+ <?php if ($comment->comment_approved == '0') { _e('<em>Your comment is awaiting moderation.</em>', "presswork"); } ?>
+ <?php comment_text() ?>
+ </div>
+ <?php if($args['max_depth']!=$depth && comments_open() && $comment->comment_type!="pingback") { ?>
+ <div class="reply">
+ <?php comment_reply_link(array_merge($args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
+ </div>
+ <?php } ?>
</div>
- <?php } ?>
- </div>
+
+ <?php
+ break;
+ case 'pingback' :
+ case 'trackback' :
+ ?>
+ <li class="pingback">
+ <p><?php _e( 'Pingback:', "presswork" ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', "presswork" ), ' ' ); ?></p>
<?php
+ break;
+ endswitch;
}
endif;
View
30 presswork/style.css
@@ -650,19 +650,19 @@ h1.catheader {
border: 1px solid #71bf8c;
}
- h3#comments-title, #respond h3 { font:normal 20px georgia,times,serif; margin: 10px 0; clear: left; }
- h3#comments-title { background: url(admin/images/h2line.png) repeat-x bottom; padding-bottom: 8px; }
-
+ h3#comments-title, #respond h3 { font:normal 20px; margin: 10px 0; clear: left; }
+ h3#comments-title { margin-bottom: 0; }
+
#respond { margin-top: 15px; clear: both; float: left; width: 100%; }
- ol.commentlist { list-style:none; margin:0; padding:0; float: left; width: 100%;}
+ .commentlist { list-style:none; margin:0; padding:0; float: left; width: 100%;}
- ol.commentlist li { padding:20px 0 20px; background: url(admin/images/h2line.png) repeat-x bottom; clear: both; float: left; width: 100%; border-bottom: 1px dotted rgba(0,0,0,0.2); }
- ol.commentlist ul.children li { padding:20px; background: #f6f6f6; border: 1px solid #eee; width: 100%; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
- ol.commentlist ul.children li.even { background: #fff; border-color: #fff; }
+ .commentlist li.comment, .commentlist li.pingback { padding:20px 0 20px; clear: both; float: left; width: 100%; border-bottom: 1px dotted rgba(0,0,0,0.2); line-height: 1.5em; }
+ .commentlist ul.children li { padding:20px; background: #f6f6f6; border: 1px solid #eee; width: 100%; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
+ .commentlist ul.children li.odd { background: #fff; border-color: #fff; }
.comment-notes { line-height: 1.2em; }
- .commentlist .avatar {
+ .commentlist li.comment .avatar {
float: left;
padding: 2px;
border-radius: 3px;
@@ -672,7 +672,7 @@ h1.catheader {
border: 1px solid #ddd;
}
- .commentlist .comment-author {
+ .commentlist li.comment .comment-author {
font-size: 1.2em;
line-height: 1.6em;
padding-left: 75px;
@@ -680,21 +680,21 @@ h1.catheader {
width: 100%;
}
- .commentlist .comment-meta {
+ .commentlist li.comment .comment-meta {
padding-left: 75px;
font-size: 0.9em;
}
- .commentlist .comment-text {
+ .commentlist li.comment .comment-text {
padding: 0 0 0 75px;
}
- .commentlist .url {
+ .commentlist li.comment .url {
font-size: 1.2em;
font-style: italic;
}
- ol.commentlist li div.reply a {
+ .commentlist li div.reply a {
clear: both;
float: right;
padding: 6px 8px;
@@ -709,7 +709,7 @@ h1.catheader {
background: -moz-linear-gradient(top, #EEEEEE, #DDDDDD);
}
- ol.commentlist li div.reply a:hover {
+ .commentlist li div.reply a:hover {
color: #888;
}
@@ -718,7 +718,7 @@ h1.catheader {
float: right;
}
- ol.commentlist li ul.children { margin:16px 0 0; list-style: none; clear:both; float: right; width: 90%; }
+ .commentlist li ul.children { margin:16px 0 0; list-style: none; clear:both; float: right; width: 90%; }
/* Pagination */
Please sign in to comment.
Something went wrong with that request. Please try again.