diff options
Diffstat (limited to 'phpBB/styles')
3 files changed, 61 insertions, 58 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index a9408c3cab..5b50f74689 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -60,13 +60,13 @@ <!-- BEGIN custom_fields --><dt>{custom_fields.PROFILE_FIELD_NAME}:</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd><!-- END custom_fields --> <!-- IF S_USER_LOGGED_IN and S_ZEBRA --> <!-- IF U_ADD_FRIEND and U_ADD_FOE--> - <dt><strong>♥</strong></dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd> - <dt><strong>×</strong></dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd> + <dt> </dt> <dd><a href="{U_ADD_FRIEND}"><strong>{L_ADD_FRIEND}</strong></a></dd> + <dt> </dt> <dd><a href="{U_ADD_FOE}"><strong>{L_ADD_FOE}</strong></a></dd> <!-- ELSE --> <!-- IF U_REMOVE_FRIEND --> - <dt><strong>♥</strong></dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd> + <dt> </dt> <dd><a href="{U_REMOVE_FRIEND}"><strong>{L_REMOVE_FRIEND}</strong></a></dd> <!-- ELSE --> - <dt><strong>×</strong></dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd> + <dt> </dt> <dd><a href="{U_REMOVE_FOE}"><strong>{L_REMOVE_FOE}</strong></a></dd> <!-- ENDIF --> <!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 3d29923637..bf49116652 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -32,7 +32,7 @@ </li> <!-- END forumrow --> </ul> -<!-- ELSE --> +<!-- ELSEIF S_FORUM_NOTIFY --> <p><strong>{L_NO_WATCHED_FORUMS}</strong></p> <!-- ENDIF --> @@ -72,7 +72,7 @@ <!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> </li> </ul> -<!-- ELSE --> +<!-- ELSEIF S_TOPIC_NOTIFY --> <p><strong>{L_NO_WATCHED_TOPICS}</strong></p> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html index 6565588ad2..b549daaf87 100644 --- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html +++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html @@ -7,65 +7,68 @@ <tr> <td class="row1" colspan="4" align="center"><span class="genmed">{L_WATCHED_EXPLAIN}</span></td> </tr> -<tr> - <th colspan="4">{L_WATCHED_FORUMS}</th> -</tr> - -<!-- BEGIN forumrow --> - - <!-- IF forumrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td style="padding: 4px;" width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> - <td style="padding: 4px;" width="100%"><p class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></p></td> - <td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR_FULL} <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td> - <td style="padding: 4px;"> <input type="checkbox" class="radio" name="f[{forumrow.FORUM_ID}]" /> </td> - </tr> -<!-- BEGINELSE --> - <tr class="row1"> - <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td> +<!-- IF S_FORUM_NOTIFY --> + <tr> + <th colspan="4">{L_WATCHED_FORUMS}</th> </tr> -<!-- END forumrow --> -<tr> - <th colspan="4">{L_WATCHED_TOPICS}</th> -</tr> + <!-- BEGIN forumrow --> -<!-- IF TOTAL_TOPICS --> + <!-- IF forumrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td style="padding: 4px;" width="20" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td> + <td style="padding: 4px;" width="100%"><p class="topictitle"><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a></p></td> + <td class="gensmall" style="padding: 4px;" align="center" valign="middle" nowrap="nowrap"><!-- IF forumrow.LAST_POST_TIME -->{forumrow.LAST_POST_TIME}<br />{forumrow.LAST_POST_AUTHOR_FULL} <a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a><!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></td> + <td style="padding: 4px;"> <input type="checkbox" class="radio" name="f[{forumrow.FORUM_ID}]" /> </td> + </tr> + <!-- BEGINELSE --> + <tr class="row1"> + <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_FORUMS}</b></td> + </tr> + <!-- END forumrow --> +<!-- ENDIF --> +<!-- IF S_TOPIC_NOTIFY --> <tr> - <td class="row3" colspan="4"> - <table width="100%" cellspacing="1"> - <tr> - <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> - <td class="gensmall" nowrap="nowrap"> [ {TOTAL_TOPICS} ] </td> - <td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td> - </tr> - </table> - </td> + <th colspan="4">{L_WATCHED_TOPICS}</th> </tr> -<!-- ENDIF --> -<!-- BEGIN topicrow --> + <!-- IF TOTAL_TOPICS --> + <tr> + <td class="row3" colspan="4"> + <table width="100%" cellspacing="1"> + <tr> + <td class="nav" valign="middle" nowrap="nowrap"> {PAGE_NUMBER}<br /></td> + <td class="gensmall" nowrap="nowrap"> [ {TOTAL_TOPICS} ] </td> + <td class="gensmall" width="100%" align="{S_CONTENT_FLOW_END}" nowrap="nowrap"><!-- INCLUDE pagination.html --></td> + </tr> + </table> + </td> + </tr> + <!-- ENDIF --> - <!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td> - <td style="padding: 4px;" width="100%" valign="top"> - <p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br /> - <!-- IF topicrow.PAGINATION --> - <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p> - <!-- ENDIF --> - </td> - <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"> - <p class="topicdetails">{topicrow.LAST_POST_TIME}</p> - <p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL} - <a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> - </p> - </td> - <td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td> - </tr> -<!-- BEGINELSE --> - <tr class="row1"> - <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td> - </tr> -<!-- END topicrow --> + <!-- BEGIN topicrow --> + + <!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> + <td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td> + <td style="padding: 4px;" width="100%" valign="top"> + <p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br /> + <!-- IF topicrow.PAGINATION --> + <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p> + <!-- ENDIF --> + </td> + <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"> + <p class="topicdetails">{topicrow.LAST_POST_TIME}</p> + <p class="topicdetails">{topicrow.LAST_POST_AUTHOR_FULL} + <a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> + </p> + </td> + <td style="padding: 4px;"> <input type="checkbox" class="radio" name="t[{topicrow.TOPIC_ID}]" /> </td> + </tr> + <!-- BEGINELSE --> + <tr class="row1"> + <td colspan="4" align="center"><b class="genmed">{L_NO_WATCHED_TOPICS}</b></td> + </tr> + <!-- END topicrow --> +<!-- ENDIF --> <!-- IF .topicrow or .forumrow --> <tr> |