Merge pull request #7 from inventea/develop

Jarosław Pustuła · Jarosław Pustuła · commit 339b5385141a · 2016-04-27T18:12:35.000+02:00
Add changes from phpBB 3.1.9 prosilver
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+2.1.1
+-----
+
+- Update for phpBB 3.1.9
+
+
 2.1.0
 -----
 
diff --git a/we_clearblue/style.cfg b/we_clearblue/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = we_clearblue
 copyright = © INVENTEA
-style_version = 2.1.0
-phpbb_version = 3.1.8
+style_version = 2.1.1
+phpbb_version = 3.1.9
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/we_clearblue/template/memberlist_view.html b/we_clearblue/template/memberlist_view.html
@@ -48,11 +48,14 @@ <h2 class="memberlist-title">{PAGE_TITLE}</h2>
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
 		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
+		<!-- EVENT memberlist_view_non_contact_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
 			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
 				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt> <dd>{custom_fields.PROFILE_FIELD_VALUE}</dd>
 			<!-- ENDIF -->
 		<!-- END custom_fields -->
+		<!-- EVENT memberlist_view_non_contact_custom_fields_after -->
+		<!-- EVENT memberlist_view_zebra_before -->
 		<!-- IF S_USER_LOGGED_IN and S_ZEBRA -->
 			<!-- IF U_REMOVE_FRIEND -->
 				<dt>&nbsp;</dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd>
@@ -67,6 +70,7 @@ <h2 class="memberlist-title">{PAGE_TITLE}</h2>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 		<!-- ENDIF -->
+		<!-- EVENT memberlist_view_zebra_after -->
 	</dl>
 
 	</div>
@@ -83,6 +87,7 @@ <h3>{L_CONTACT_USER}</h3>
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}{L_COLON}</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER}</a></dd><!-- ENDIF -->
 		<!-- IF U_PM --><dt>{L_PM}{L_COLON}</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
 		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}{L_COLON}</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 750, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}{L_COLON}</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
+		<!-- EVENT memberlist_view_contact_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
 			<!-- IF custom_fields.S_PROFILE_CONTACT -->
 				<dt>{custom_fields.PROFILE_FIELD_NAME}{L_COLON}</dt>
@@ -93,6 +98,7 @@ <h3>{L_CONTACT_USER}</h3>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 		<!-- END custom_fields -->
+		<!-- EVENT memberlist_view_contact_custom_fields_after -->
 		<!-- IF S_PROFILE_FIELD1 -->
 			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
 			<dt>{PROFILE_FIELD1_NAME}{L_COLON}</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>
diff --git a/we_clearblue/template/overall_header.html b/we_clearblue/template/overall_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 {META}
 <title><!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
diff --git a/we_clearblue/template/simple_header.html b/we_clearblue/template/simple_header.html
@@ -2,6 +2,7 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>

-Original file line number
+Diff line change
 +2.1.1
 +-----
++
 +- Update for phpBB 3.1.9
++
++
 .1.0
 -----