diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-15 21:40:25 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-15 21:40:25 +0000 |
| commit | c76a2cdfe867952c3b1087a585589debc0b5d648 (patch) | |
| tree | c6fab56488507014529675db2a0b361f64273f36 /phpBB/styles | |
| parent | 6e92276b87ee57b45598cb559ebce7db999ce3ac (diff) | |
| download | forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.gz forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.bz2 forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.xz forums-c76a2cdfe867952c3b1087a585589debc0b5d648.zip | |
- viewtopic/forum search boxes should also use search config option and u_search permission [Bug #9850]
- mcp_reports was still using some of the mcp_queue post_id logic, changed enough to report_id logic to make it work properly now. I hope I didn't miss any external places referring to mcp_reports which send it a post_id_list. I really wonder whether people don't test the MCP at all? Good that I noticed this myself when fixing an incorrect language string (No reports selected) message [Bug #9741]
- forgot to check in the changed mcp/info file for mcp_warn with global m_warn option
- mcp_post.html was missing a submit button for changing the poster in prosilver [Bug #9771]
- language variables in javascript in templates should use LA_ not L_ for proper escaping of single quotes
git-svn-id: file:///svn/phpbb/trunk@7361 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
5 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 6d82b5782e..a16396f094 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -31,7 +31,7 @@ <input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> <!-- ENDIF --> <input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /> - <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> + <input type="hidden" name="report_id_list[]" value="{REPORT_ID}" /> </fieldset> </form> @@ -110,7 +110,12 @@ <dl> <dt><label>{L_CHANGE_POSTER}:</label></dt> <!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF --> - <dd style="margin-top:3px;"><input class="inputbox autowidth" type="text" name="username" value="" /> <span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></dd> + <dd style="margin-top:3px;"> + <input class="inputbox autowidth" type="text" name="username" value="" /> + <input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}" /> + <br /> + <span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> + </dd> </dl> </fieldset> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index 04f0d74682..67c9c84f6b 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -43,7 +43,7 @@ <span>{postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}<br /> {L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span> </dd> - <dd class="mark"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></dd> + <dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd> </dl> </li> <!-- END postrow --> @@ -75,7 +75,7 @@ <fieldset class="display-actions"> <input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" /> <!-- IF not S_CLOSED --> <input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF --> - <div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div> + <div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div> </fieldset> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 811dfce3ae..0d6d5f3cd0 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -129,7 +129,7 @@ <div id="search-box"> <form action="{U_SEARCH}" method="get" id="search"> <fieldset> - <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{L_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{L_SEARCH_MINI}';" accesskey="s" /> + <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" accesskey="s" /> <input class="button2" value="{L_SEARCH}" type="submit" /><br /> <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_HIDDEN_FIELDS} </fieldset> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 34a93054a0..c9e3a9d4e7 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -32,7 +32,7 @@ </tr> </table> - <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> + <input type="hidden" name="report_id_list[]" value="{REPORT_ID}" /> </form> <br clear="all"/> diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html index 15bb797a8e..3b746c9932 100644 --- a/phpBB/styles/subsilver2/template/mcp_reports.html +++ b/phpBB/styles/subsilver2/template/mcp_reports.html @@ -26,7 +26,7 @@ <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORTER_FULL}</span></td> <td style="padding: 4px;" align="{S_CONTENT_FLOW_BEGIN}" valign="top" nowrap="nowrap"><span class="gen">{postrow.REPORT_TIME}</span><br /> <span class="gensmall">[ <a href="{postrow.U_VIEW_DETAILS}">{L_VIEW_DETAILS}</a> ]</span></td> - <td align="center"><input type="checkbox" class="radio" name="post_id_list[]" value="{postrow.POST_ID}" /></td> + <td align="center"><input type="checkbox" class="radio" name="report_id_list[]" value="{postrow.REPORT_ID}" /></td> </tr> <!-- BEGINELSE --> <tr> |