diff --git a/block.tpl.php b/block.tpl.php index a84d5fe047975ce3453bef1a468075d9a8768e40..7d89a06136c96cee5d3ff4b93e4e15e74a192105 100644 --- a/block.tpl.php +++ b/block.tpl.php @@ -1,6 +1,11 @@
diff --git a/comment-wrapper.tpl.php b/comment-wrapper.tpl.php index f701782bb6b4adc8235c77ee8d938cc4aaf5bb47..11f90ac41a566ce76f601555721a737e3352e784 100644 --- a/comment-wrapper.tpl.php +++ b/comment-wrapper.tpl.php @@ -36,7 +36,13 @@
type != 'forum'): ?>
- comment_count; if ($node->comment_count > 1) { print ' Comments'; } else { print ' Comment'; } ?> + + comment_count; + if ($node->comment_count > 1) { + print ' ' .t('Comments'); } + else { print ' ' .t('Comment'); } ?> +
diff --git a/comment.tpl.php b/comment.tpl.php index e4f8a31cce7e57214ed74d97eaf1ac1afaa7cc97..bc978ccf4beb3205af8b86269e215e3b0689764d 100644 --- a/comment.tpl.php +++ b/comment.tpl.php @@ -26,7 +26,7 @@ * @see theme_comment() */ ?> -
+
@@ -37,7 +37,7 @@ new): ?> - on +
diff --git a/node.tpl.php b/node.tpl.php index 8b62252a44a40fa27a3a2722f2fbe447deb1654e..943b527e0e94adcc9faafde9d091495493e909f4 100644 --- a/node.tpl.php +++ b/node.tpl.php @@ -1,37 +1,89 @@ -
"> +
+ +"> -
-

- -

-

- By ' .$name . '';} ?> - '. $date . '';} ?> +

+

+ +

+

+ '. t('By') .' '. $name .''; + } + ?> + '. $date .''; + } + ?>

-
"> +
1): ?>
- - 1) { print ' Comments'; } else { print ' Comment'; } ?> - -
- - - + + 1) { + print ' ' . t('Comments'); + } + else { + print ' ' . t('Comment'); + } + ?> + +
+ + + -
- -
- + +
+ +
+ +
@@ -48,7 +100,7 @@
- +
diff --git a/page.tpl.php b/page.tpl.php index 177f9ed0cc59e83a6a76a30a8a39f2f29dd97987..95ce73d43eb67831284d7436ae94c3d0e23f2b63 100644 --- a/page.tpl.php +++ b/page.tpl.php @@ -1,7 +1,11 @@ +/** + * @file page.tpl.php + * Renders the pages for Magazeen. +*/ +?> diff --git a/style.css b/style.css index 793a78d67178ecfe2a0cb1a47c4d037349b6a16c..b9c01cc3e8f2bd8ceeb22a0ca9b8b035efbd6fe1 100644 --- a/style.css +++ b/style.css @@ -1146,7 +1146,7 @@ h3.post-title-small { background:transparent url(images/footer-cat-right.gif) no-repeat scroll right top; display:block; float:left; - height:1.75em; + height:23px; line-height:1.75em; margin:0; padding:0 .9em 0 0; diff --git a/template.php b/template.php index f256338c0071e4e337e0ff60fb67fe35756386c2..bca37aa05d68faa78b67fe13a29edb4d77652139 100644 --- a/template.php +++ b/template.php @@ -1,6 +1,11 @@ '; - $output .= ''; + $output .= ''; $output .= t('Add new comment'); $output .= ''; $output .= '
'; @@ -262,8 +267,8 @@ function phptemplate_comment_count($comment_count, $node_url) { default: $output = '
'; - $output .= ''; - $output .= $comment_count . ' ' . t('comment'); + $output .= ''; + $output .= $comment_count .' '. t('comments'); $output .= ''; $output .= '
'; } @@ -280,7 +285,7 @@ function phptemplate_display_author($name) { $output = ''; } else { - $output = 'By ' .$name . ''; + $output = ''. t('By') .' '. $name .''; } return $output; } @@ -322,9 +327,10 @@ function magazeen_preprocess_block(&$vars, $hook) { function phptemplate_mainwidth_class($right) { - $mainwidth = 'width940'; - if ( $right ) {$mainwidth = 'width580';} - print $mainwidth; + $mainwidth = 'width940'; + if ( $right ) { + $mainwidth = 'width580';} + print $mainwidth; } /** @@ -365,17 +371,17 @@ function magazeen_theme(&$existing, $type, $theme, $path){ ); } - function magazeen_preprocess_comment_form(&$vars) { - $vars['submit'] = drupal_render($vars['form']['submit']); - $vars['preview'] = drupal_render($vars['form']['preview']); - $vars['subject'] = drupal_render($vars['form']['subject']); - $vars['comment'] = drupal_render($vars['form']['comment_filter']['comment']); - $vars['form']['name']['#title'] = t('Name (required)'); - $vars['name'] = drupal_render($vars['form']['name']); - $vars['form']['mail']['#title'] = t('Mail (will not be published) (required)'); - $vars['mail'] = drupal_render($vars['form']['mail']); - $vars['form']['homepage']['#title'] = t('Website'); - $vars['homepage'] = drupal_render($vars['form']['homepage']); - $vars['comment_preview'] = drupal_render($vars['form']['comment_preview']); - } +function magazeen_preprocess_comment_form(&$vars) { + $vars['submit'] = drupal_render($vars['form']['submit']); + $vars['preview'] = drupal_render($vars['form']['preview']); + $vars['subject'] = drupal_render($vars['form']['subject']); + $vars['comment'] = drupal_render($vars['form']['comment_filter']['comment']); + $vars['form']['name']['#title'] = t('Name (required)'); + $vars['name'] = drupal_render($vars['form']['name']); + $vars['form']['mail']['#title'] = t('Mail (will not be published) (required)'); + $vars['mail'] = drupal_render($vars['form']['mail']); + $vars['form']['homepage']['#title'] = t('Website'); + $vars['homepage'] = drupal_render($vars['form']['homepage']); + $vars['comment_preview'] = drupal_render($vars['form']['comment_preview']); +} //dsm($vars['form']); \ No newline at end of file diff --git a/theme-settings.php b/theme-settings.php index a559c8f48bb4a9268dba6c691a8f5ab4b145e8b8..518815f7b66f91fda164789ed0e005d8702c07cd 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -1,5 +1,9 @@ TRUE, '#collapsed' => TRUE, ); - // Comment Title - $form['tnt_container']['general_settings']['comment']['comment_title'] = array( - '#type' => 'textfield', - '#title' => t('Comment Title'), - '#description' => t('Customize the title for the comments box'), - '#size' => 60, - '#default_value' => $settings['comment_title'], - ); + // Comment Title + $form['tnt_container']['general_settings']['comment']['comment_title'] = array( + '#type' => 'textfield', + '#title' => t('Comment Title'), + '#description' => t('Customize the title for the comments box'), + '#size' => 60, + '#default_value' => $settings['comment_title'], + ); - // Display Teaser Comment - $form['tnt_container']['general_settings']['comment']['display_teaser_comment'] = array( - '#type' => 'select', - '#title' => t('Option to display comment count in teaser if there no comment'), - '#default_value' => $settings["display_teaser_comment"], - '#options' => array( - 'normal' => t('Display comment count'), - 'hide' => t('Don\'t display comment count'), - 'addnew' => t('Display "Add new comment"'), - ), - ); + // Display Teaser Comment + $form['tnt_container']['general_settings']['comment']['display_teaser_comment'] = array( + '#type' => 'select', + '#title' => t('Option to display comment count in teaser if less than 1'), + '#default_value' => $settings["display_teaser_comment"], + '#options' => array( + 'normal' => t('Display comment count'), + 'hide' => t('Don\'t display comment count'), + 'addnew' => t('Display "Add new comment"'), + ), + ); // SEO settings $form['tnt_container']['seo'] = array( @@ -293,7 +297,8 @@ function phptemplate_settings($saved_settings) { '#rows' => 6, '#default_value' => $settings['meta_description'], ); - } else { + } + else { $form['tnt_container']['seo']['meta']['#description'] = 'NOTICE: You currently have the "nodewords" module installed and enabled, so the meta tag theme settings have been disabled to prevent conflicts. If you later wish to re-enable the meta tag theme settings, you must first disable the "nodewords" module.'; $form['tnt_container']['seo']['meta']['meta_keywords']['#disabled'] = 'disabled'; $form['tnt_container']['seo']['meta']['meta_description']['#disabled'] = 'disabled';