Update phpBB to 3.0.12
authorJesper Kristensen <mail@jesperkristensen.dk>
Sun, 24 Nov 2013 22:43:05 +0100
changeset 303 0e42e03cba6a1d7229af66a715cb15e60db3ed7c
parent 302 6ccc8676fc01fb556c56d39e526335228afa7bb9
child 304 1d454f368a6c3b451e4870f78c0def543fef50a0
push id148
push usermail@jesperkristensen.dk
push dateSun, 24 Nov 2013 21:44:24 +0000
Update phpBB to 3.0.12
phpbb/INSTALL
phpbb/theme/mcs/template/login_forum.html
phpbb/theme/mcs/template/memberlist_search.html
phpbb/theme/mcs/template/posting_editor.html
phpbb/theme/mcs/template/report_body.html
phpbb/theme/mcs/template/search_results.html
phpbb/theme/mcs/template/ucp_groups_manage.html
phpbb/theme/mcs/template/ucp_pm_history.html
phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
phpbb/theme/mcs/template/ucp_prefs_personal.html
phpbb/theme/mcs/template/viewtopic_print.html
--- a/phpbb/INSTALL
+++ b/phpbb/INSTALL
@@ -1,13 +1,13 @@
 Installation steps for developing the theme. Sets up phpBB to not interfere with HG.
 
 1) Install phpBB 3.0.x
   * Install in <mcs-hg-clone>/phpbb/board/
-  * Theme currently matches phpBB 3.0.11
+  * Theme currently matches phpBB 3.0.12
   * Follow setup instructions
 
 2) Set up the theme
   * Copy from <mcs-hg-clone>/phpbb/theme/mcs to <mcs-hg-clone>/phpbb/board/styles/mcs
   * Install mcs theme using phpBB's Admin Control Panel
   * In phpmyadmin or similar: Change phpbb_styles_imageset.imageset_path, phpbb_styles_template.template_path and phpbb_styles_theme.theme_path from mcs to ../../theme/mcs
   * In includes/session.php remove "rawurlencode" near line 2189 in the img function (leave its parameter in place). Do the same for all occurances of "rawurlencode" in includes/functions.php
   * Delete <mcs-hg-clone>/phpbb/board/styles/mcs
--- a/phpbb/theme/mcs/template/login_forum.html
+++ b/phpbb/theme/mcs/template/login_forum.html
@@ -1,11 +1,11 @@
 <!-- INCLUDE overall_header.html -->
 
-<h1>{L_LOGIN} {FORUM_NAME}</h1>
+<h1>{L_LOGIN}<!-- IF FORUM_NAME -->: <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h1>
 
 <form id="login_forum" method="post" action="{S_LOGIN_ACTION}">
 {S_FORM_TOKEN}
 
 <p class="panel">{L_LOGIN_FORUM}</p>
 
 	<!-- IF LOGIN_ERROR -->
 		<p class="error">{LOGIN_ERROR}</p>
--- a/phpbb/theme/mcs/template/memberlist_search.html
+++ b/phpbb/theme/mcs/template/memberlist_search.html
@@ -56,16 +56,18 @@ function insert_single(user)
 		<dt><label for="icq">{L_ICQ}:</label></dt>
 		<dd><input type="text" name="icq" id="icq" value="{ICQ}" /></dd>
 		<dt><label for="aim">{L_AIM}:</label></dt>
 		<dd><input type="text" name="aim" id="aim" value="{AIM}" /></dd>
 		<dt><label for="yahoo">{L_YIM}:</label></dt>
 		<dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" /></dd>
 		<dt><label for="msn">{L_MSNM}:</label></dt>
 		<dd><input type="text" name="msn" id="msn" value="{MSNM}" /></dd>
+		<dt><label for="jabber">{L_JABBER}:</label></dt>
+		<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" /></dd>
 		<dt><label for="joined">{L_JOINED}:</label></dt>
 		<dd><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input type="text" name="joined" id="joined" value="{JOINED}" /></dd>
 <!-- IF S_VIEWONLINE -->
 		<dt><label for="active">{L_LAST_ACTIVE}:</label></dt>
 		<dd><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input type="text" name="active" id="active" value="{ACTIVE}" /></dd>
 <!-- ENDIF -->
 		<dt><label for="count">{L_POSTS}:</label></dt>
 		<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" name="count" id="count" value="{COUNT}" /></dd>
--- a/phpbb/theme/mcs/template/posting_editor.html
+++ b/phpbb/theme/mcs/template/posting_editor.html
@@ -128,17 +128,17 @@
 	</div>
 	<!-- ENDIF -->
 
 	<!-- IF S_HAS_ATTACHMENTS -->
 		<h2>{L_POSTED_ATTACHMENTS}</h2>
 		<div class="panel">
 
 			<!-- BEGIN attach_row -->
-				<h3><a href="{attach_row.U_VIEW_ATTACHMENT}" class="{S_CONTENT_FLOW_END}">{attach_row.FILENAME}</a></h3>
+				<h3><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></h3>
 				<dl class="kvlist postinglist">
 					<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}:</label></dt>
 					<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="3" cols="40">{attach_row.FILE_COMMENT}</textarea></dd>
 				</dl>
 				<div>
 					<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" /> <!-- ENDIF -->
 					<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" />
 				</div>
--- a/phpbb/theme/mcs/template/report_body.html
+++ b/phpbb/theme/mcs/template/report_body.html
@@ -1,15 +1,16 @@
 <!-- INCLUDE overall_header.html -->
 
 <h1><!-- IF S_REPORT_POST -->{L_REPORT_POST}<!-- ELSE -->{L_REPORT_MESSAGE}<!-- ENDIF --></h1>
 
 <p class="panel"><!-- IF S_REPORT_POST -->{L_REPORT_POST_EXPLAIN}<!-- ELSE -->{L_REPORT_MESSAGE_EXPLAIN}<!-- ENDIF --></p>
 <form method="post" action="{S_REPORT_ACTION}" id="report">
 	<div class="panel">
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<dl class="kvlist">
 			<dt><label for="reason_id">{L_REASON}:</label></dt>
 			<dd><select name="reason_id" id="reason_id">
 				<!-- BEGIN reason --><option value="{reason.ID}"<!-- IF reason.S_SELECTED --> selected="selected"<!-- ENDIF -->>{reason.DESCRIPTION}</option><!-- END reason -->
 			</select></dd>
 			<!-- IF S_CAN_NOTIFY -->
 				<dt><label for="notify1">{L_REPORT_NOTIFY}:</label></dt>
 				<dd>
@@ -18,16 +19,19 @@
 					<div class="explain">{L_REPORT_NOTIFY_EXPLAIN}</div>
 				</dd>
 		<!-- ENDIF -->
 			<dt><label for="report_text">{L_MORE_INFO}:</label></dt>
 			<dd>
 				<textarea name="report_text" id="report_text" rows="10" cols="76">{REPORT_TEXT}</textarea>
 				<div class="explain">{L_CAN_LEAVE_BLANK}</div>
 			</dd>
+			<!-- IF CAPTCHA_TEMPLATE -->
+				<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
+			<!-- ENDIF -->
 		</dl>
 	</div>
 
 	<div>
 		<input type="submit" name="submit" value="{L_SUBMIT}" />
 		<input type="submit" name="cancel" value="{L_CANCEL}" />
 		{S_FORM_TOKEN}
 	</div>
--- a/phpbb/theme/mcs/template/search_results.html
+++ b/phpbb/theme/mcs/template/search_results.html
@@ -1,11 +1,12 @@
 <!-- INCLUDE overall_header.html -->
 
 <h1><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE -->{SEARCH_MATCHES}<!-- ENDIF --><!-- IF SEARCH_WORDS -->: <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h1>
+<!-- IF SEARCHED_QUERY --> <p>{L_SEARCHED_QUERY}: <strong>{SEARCHED_QUERY}</strong></p><!-- ENDIF -->
 <!-- IF IGNORED_WORDS --> <p>{L_IGNORED_TERMS}: <strong>{IGNORED_WORDS}</strong></p><!-- ENDIF -->
 
 <!-- IF SEARCH_TOPIC -->
 	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p>
 <!-- ELSE -->
 	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
--- a/phpbb/theme/mcs/template/ucp_groups_manage.html
+++ b/phpbb/theme/mcs/template/ucp_groups_manage.html
@@ -1,24 +1,22 @@
 <!-- INCLUDE ucp_header.html -->
 
 <h1<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{L_USERGROUPS}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h1>
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
+	<!-- IF S_ERROR -->
+		<p class="error">{ERROR_MSG}</p>
+	<!-- ENDIF -->
+
 <p class="panel">{L_GROUPS_EXPLAIN}</p>
 
 	<!-- IF S_EDIT -->
 		<h2>{L_GROUP_DETAILS}</h2>
-		<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h2>{L_WARNING}</h2>
-			<p class="panel">{ERROR_MSG}</p>
-		</div>
-		<!-- ENDIF -->
 	
 		<dl class="panel kvlist ucp-avatar">
 			<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
 			<dd>
 				<!-- IF S_SPECIAL_GROUP -->
 					<strong<!-- IF GROUP_COLOUR --> style="color: #{GROUP_COLOUR};"<!-- ENDIF -->>{GROUP_NAME}</strong>
 					<input name="group_name" type="hidden" value="{GROUP_INTERNAL_NAME}" />
 				<!-- ELSE -->
@@ -49,17 +47,17 @@
 		<!-- ENDIF -->
 
 
 <h2>{L_GROUP_SETTINGS_SAVE}</h2>
 
 	<dl class="panel kvlist ucp-avatar">
 		<dt><label for="group_colour">{L_GROUP_COLOR}:</label></dt>
 		<dd>
-			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="7" maxlength="7" />
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
 			<span style="background-color: #{GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span>
 			[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]
 			<div class="explain">{L_GROUP_COLOR_EXPLAIN}</div>
 		</dd>
 		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 
--- a/phpbb/theme/mcs/template/ucp_pm_history.html
+++ b/phpbb/theme/mcs/template/ucp_pm_history.html
@@ -15,17 +15,17 @@
 	<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
 		<ul class="linklist actionlist">
 			<li><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</a></li>
 		</ul>
 	<!-- ENDIF -->
 
 	<h2><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h2>    
 	<p class="author"><img src="{T_IMAGESET_PATH}/icon_post_target.gif" alt="{L_PRIVATE_MESSAGE}" title="{L_PRIVATE_MESSAGE}" /> {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL} &raquo;{history_row.SENT_DATE}</p>
-	<div class="content">{history_row.MESSAGE}</div>
+	<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div>
 	<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div>
 </div>
 
 		</div>
 		<!-- IF not history_row.S_LAST_ROW --><hr /><!-- ENDIF -->
 	<!-- END history_row -->
 </div>
 
--- a/phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
+++ b/phpbb/theme/mcs/template/ucp_pm_viewmessage_print.html
@@ -18,20 +18,19 @@
 </head>
 
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" name="top" accesskey="t"></a>
 
 	<div id="page-header">
 		<h1>{SITENAME}</h1>
-		<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
+		<p>{SITE_DESCRIPTION}</p>
 
-		<h2>{TOPIC_TITLE}</h2>
-		<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
+		<h2>{L_PRIVATE_MESSAGING}</h2>
 	</div>
 
 	<div id="page-body">
 		<div class="page-number">{PAGE_NUMBER}</div>
 			<div class="post">
 				<h3>{SUBJECT}</h3>
 				<div class="date">{L_SENT_AT} <strong>{SENT_DATE}</strong></div>
 				<div class="author">{L_PM_FROM} <strong>{MESSAGE_AUTHOR}</strong></div>
@@ -44,14 +43,14 @@
 				<hr />
 				<div class="content">{MESSAGE}</div>
 			</div>
 			<hr />
 	</div>
 
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</div>
 	</div>
 </div>
 
 </body>
 </html>
\ No newline at end of file
--- a/phpbb/theme/mcs/template/ucp_prefs_personal.html
+++ b/phpbb/theme/mcs/template/ucp_prefs_personal.html
@@ -45,19 +45,21 @@
 			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
 		<dd>
 			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-		<!-- IF S_STYLE_OPTIONS -->
+		<!-- IF S_MORE_LANGUAGES -->
+			<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
+			<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
+		<!-- ENDIF -->
+		<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
 			<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
 			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>
 		<!-- ENDIF -->
 		<dt><label for="timezone">{L_BOARD_TIMEZONE}:</label></dt>
 		<dd><select name="tz" id="timezone">{S_TZ_OPTIONS}</select></dd>
 		<dt><label for="dst1">{L_BOARD_DST}:</label></dt>
 		<dd>
 			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
--- a/phpbb/theme/mcs/template/viewtopic_print.html
+++ b/phpbb/theme/mcs/template/viewtopic_print.html
@@ -39,14 +39,14 @@
 				<div class="content">{postrow.MESSAGE}</div>
 			</div>
 			<hr />
 		<!-- END postrow -->
 	</div>
 
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />https://www.phpbb.com/</div>
 	</div>
 </div>
 
 </body>
 </html>
\ No newline at end of file