Created
March 7, 2016 16:18
-
-
Save Nicofuma/1c741408f5a98e719365 to your computer and use it in GitHub Desktop.
prosilver_changes_3.2.0-b1_to_3.2.0-b2 whitespace changes ignored
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg | |
index ec7d8d2..dd77b75 100644 | |
--- a/phpBB/styles/prosilver/style.cfg | |
+++ b/phpBB/styles/prosilver/style.cfg | |
@@ -21,8 +21,8 @@ | |
# General Information about this style | |
name = prosilver | |
copyright = © phpBB Limited, 2007 | |
-style_version = 3.2.0-b1 | |
-phpbb_version = 3.2.0-b1 | |
+style_version = 3.2.0-b2 | |
+phpbb_version = 3.2.0-b2 | |
# Defining a different template bitfield | |
# template_bitfield = lNg= | |
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html | |
index 8ecca49..a7439bc 100644 | |
--- a/phpBB/styles/prosilver/template/memberlist_view.html | |
+++ b/phpBB/styles/prosilver/template/memberlist_view.html | |
@@ -36,11 +36,14 @@ | |
<!-- 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> </dt> <dd class="zebra"><a href="{U_REMOVE_FRIEND}" data-ajax="zebra"><strong>{L_REMOVE_FRIEND}</strong></a></dd> | |
@@ -55,6 +58,7 @@ | |
<!-- ENDIF --> | |
<!-- ENDIF --> | |
<!-- ENDIF --> | |
+ <!-- EVENT memberlist_view_zebra_after --> | |
</dl> | |
</div> | |
@@ -71,6 +75,7 @@ | |
<!-- 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> | |
@@ -81,6 +86,7 @@ | |
<!-- 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/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html | |
index a7864e3..4e3d1e2 100644 | |
--- a/phpBB/styles/prosilver/template/navbar_footer.html | |
+++ b/phpBB/styles/prosilver/template/navbar_footer.html | |
@@ -4,18 +4,22 @@ | |
<ul id="nav-footer" class="nav-footer linklist" role="menubar"> | |
<li class="breadcrumbs"> | |
<!-- IF U_SITE_HOME --> | |
+ {% spaceless %} | |
<span class="crumb"> | |
<a href="{U_SITE_HOME}" data-navbar-reference="home"> | |
<i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span> | |
</a> | |
</span> | |
+ {% endspaceless %} | |
<!-- ENDIF --> | |
<!-- EVENT overall_footer_breadcrumb_prepend --> | |
+ {% spaceless %} | |
<span class="crumb"> | |
<a href="{U_INDEX}" data-navbar-reference="index"> | |
<!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span> | |
</a> | |
</span> | |
+ {% endspaceless %} | |
<!-- EVENT overall_footer_breadcrumb_append --> | |
</li> | |
<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment