From dc56c67ad5059802135fdcee4207b7ab2b80d1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Buljevi=C4=87?= Date: Mon, 24 Sep 2012 11:36:07 +0300 Subject: [PATCH 1/4] Update packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php Added $Params['UserParameters'] into $view_parameters - necessary for choosing the language of the comments in the view. --- .../ezextension/ezcomments/modules/comment/list.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php b/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php index 921013c..64f8aa0 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php +++ b/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php @@ -31,6 +31,18 @@ if ( isset( $Params['Offset'] ) ) $offset = (int) $Params['Offset']; $viewParameters = array( 'offset' => $offset ); + +if ( isset( $Params['UserParameters'] ) ) +{ + $UserParameters = $Params['UserParameters']; +} +else +{ + $UserParameters = array(); +} + +$viewParameters = array_merge( $viewParameters, $UserParameters ); + $tpl->setVariable( 'view_parameters', $viewParameters ); $Result = array(); From 1516db232bd27e423f1ff47c75d822793666079a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Buljevi=C4=87?= Date: Mon, 24 Sep 2012 11:43:27 +0300 Subject: [PATCH 2/4] Update packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl On a multilingual site /design/admin2/templates/comment/list.tpl displays only the comments in the default language. This solution enables the administrator or editor to review all the comments in all the languages available. --- .../design/admin2/templates/comment/list.tpl | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl b/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl index e157100..b73feb5 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl +++ b/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl @@ -1,5 +1,15 @@ {def $remove_comments_allowed = fetch(user, has_access_to, hash(module, comment, function, removecomments))} {def $edit_allowed = fetch(user, has_access_to, hash(module, comment, function, edit))} +{def $lang_codes = ezini('RegionalSettings', 'SiteLanguageList', 'site.ini')} +{def $lang_names = ezini('RegionalSettings', 'TranslationSA', 'site.ini')} +{def $ind = ''} + +{def $comment_fetch_array = hash(offset, $view_parameters.offset, length, 10)} + +{if is_set($view_parameters.lang)} + {set $comment_fetch_array = $comment_fetch_array|merge( hash(language_code, $view_parameters.lang) )} +{/if} +
@@ -9,6 +19,17 @@
+
+

{'Choose the language of the comments: '|i18n( 'ezcomments/comment/list' )}

+

+ {foreach $lang_codes as $code} + {set $ind = $code|extract_left(3)} + {$lang_names.$ind} {$code} + {/foreach} +

+
+
+ {undef $lang_codes $lang_names $ind} @@ -21,7 +42,7 @@ {def $comments_count = fetch(comment, comment_count)} - {def $comments = fetch(comment, comment_list_by_content_list, hash(offset, $view_parameters.offset, length, 10))} + {def $comments = fetch(comment, comment_list_by_content_list, $comment_fetch_array)} {foreach $comments as $comment sequence array('bglight', 'bgdark') as $sequence} From 84325eadf44d597357d9a98b0a443e3926b63def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Buljevi=C4=87?= Date: Tue, 20 Nov 2012 12:20:31 +0100 Subject: [PATCH 3/4] Update packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl Added changes for displaying the navigator. If there are no comments in the current comment fetch, the navigator doesn't need to be displayed. Also, a new variable called "lang_list" is introduced and it is set by the extension/ezcomments/modules/list.php file. It has all the necessary information on the current languages on the site. --- .../design/admin2/templates/comment/list.tpl | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl b/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl index b73feb5..827cdfd 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl +++ b/packages/ezcomments_extension/ezextension/ezcomments/design/admin2/templates/comment/list.tpl @@ -5,12 +5,23 @@ {def $ind = ''} {def $comment_fetch_array = hash(offset, $view_parameters.offset, length, 10)} +{def $comment_count_array = array()} {if is_set($view_parameters.lang)} {set $comment_fetch_array = $comment_fetch_array|merge( hash(language_code, $view_parameters.lang) )} + {foreach $lang_list as $language} + {if $view_parameters.lang|eq($language.locale)} + {set $comment_count_array = $comment_count_array|merge( hash(language_id, $language.id) )} + {/if} + {/foreach} +{else} + {foreach $lang_list as $language} + {if ezini('RegionalSettings', 'Locale', 'site.ini')|eq($language.locale)} + {set $comment_count_array = $comment_count_array|merge( hash(language_id, $language.id) )} + {/if} + {/foreach} {/if} -
@@ -19,7 +30,7 @@
-
+

{'Choose the language of the comments: '|i18n( 'ezcomments/comment/list' )}

{foreach $lang_codes as $code} @@ -41,7 +52,7 @@ {if $edit_allowed}

{/if} - {def $comments_count = fetch(comment, comment_count)} + {def $comments_count = fetch(comment, comment_count, $comment_count_array)} {def $comments = fetch(comment, comment_list_by_content_list, $comment_fetch_array)} {foreach $comments as $comment sequence array('bglight', 'bgdark') as $sequence} @@ -58,12 +69,12 @@
 
- {include name=navigator - uri='design:navigator/google.tpl' - page_uri='comment/list' - item_count=$comments_count - view_parameters=$view_parameters - item_limit=10} + {include name=navigator + uri='design:navigator/google.tpl' + page_uri='comment/list' + item_count=$comments_count + view_parameters=$view_parameters + item_limit=10}
From de1921c6ee35caf7a7509950241b5af05b21b9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomislav=20Buljevi=C4=87?= Date: Tue, 20 Nov 2012 12:22:59 +0100 Subject: [PATCH 4/4] Update packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php Added a variable called langList which fetches the list of the languages currently available on the site and outputs all the information via the eZContentLanguage::fetchList() method. --- .../ezextension/ezcomments/modules/comment/list.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php b/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php index 64f8aa0..c0d5885 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php +++ b/packages/ezcomments_extension/ezextension/ezcomments/modules/comment/list.php @@ -43,6 +43,9 @@ $viewParameters = array_merge( $viewParameters, $UserParameters ); +$langList = eZContentLanguage::fetchList(); +$tpl->setVariable( 'lang_list', $langList ); + $tpl->setVariable( 'view_parameters', $viewParameters ); $Result = array();