Skip to content

Instantly share code, notes, and snippets.

@marc1706
Last active August 28, 2024 19:46
Show Gist options
  • Save marc1706/5bc56614413946a013b9769692c88f93 to your computer and use it in GitHub Desktop.
Save marc1706/5bc56614413946a013b9769692c88f93 to your computer and use it in GitHub Desktop.
prosilver changes for phpBB 3.3.12 to 3.3.13 (no changes after 3.3.13-RC1)
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index e1d9e757f9..693a5147ba 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -731,6 +731,10 @@ table.info tbody th {
max-width: 100%;
}
+.avatar-rank-container {
+ max-width: 20%;
+}
+
.left-box.profile-details {
width: 80%;
}
@@ -780,12 +784,6 @@ fieldset.fields1 dd.recipients {
margin-left: 1em;
}
-fieldset.fields1 ul.recipients input.button2 {
- font-size: 0.8em;
- margin-right: 0;
- padding: 0;
-}
-
fieldset.fields1 dl.pmlist > dt {
width: auto !important;
}
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 5a3041fe0c..78897be19c 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -412,6 +412,10 @@
clear: both;
}
+ .avatar-rank-container {
+ max-width: 100%;
+ }
+
/* Polls
----------------------------------------*/
fieldset.polls dt {
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index e866175bf7..0171d646da 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -10,7 +10,7 @@
@import url("normalize.css?hash=48eb3f89");
@import url("base.css?hash=7c5543be");
@import url("utilities.css?hash=d8f72c42");
-@import url("common.css?hash=a9741ba1");
+@import url("common.css?hash=843d5d5f");
@import url("links.css?hash=18286e16");
@import url("content.css?hash=d0e24377");
@import url("buttons.css?hash=56f0d25f");
@@ -18,4 +18,4 @@
@import url("forms.css?hash=9016b55c");
@import url("icons.css?hash=64da33ce");
@import url("colours.css?hash=fcb2f289");
-@import url("responsive.css?hash=91525545");
+@import url("responsive.css?hash=c9d32cba");
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index b62ed1ad5b..7efe2da968 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -78,6 +78,7 @@
<p class="author"><span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{MINI_POST_IMG}</span></span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
<!-- ENDIF -->
+ {% if S_CAN_APPROVE %}
<!-- IF S_POST_UNAPPROVED -->
<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
@@ -101,6 +102,7 @@
</p>
</form>
<!-- ENDIF -->
+ {% endif %}
{% if S_POST_REPORTED and not S_MCP_REPORT %}
<p class="post-notice reported">
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index debf64cba2..0ad1c80edb 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -9,7 +9,7 @@
<div class="inner">
<!-- IF AVATAR_IMG -->
- <dl class="left-box">
+ <dl class="left-box avatar-rank-container">
<dt class="profile-avatar">{AVATAR_IMG}</dt>
<!-- EVENT memberlist_view_rank_avatar_before -->
<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index d3b2ecd68e..12790360d6 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -100,7 +100,7 @@
<!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
<div class="panel bg2">
<div class="inner">
- <fieldset class="submit-buttons" data-prevent-flood>
+ <fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
<!-- EVENT posting_editor_submit_buttons -->
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html
index 2fee21fd97..6b03febeec 100644
--- a/phpBB/styles/prosilver/template/posting_pm_header.html
+++ b/phpBB/styles/prosilver/template/posting_pm_header.html
@@ -31,7 +31,11 @@
<ul class="recipients">
<!-- BEGIN to_recipient -->
<li>
- <!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+ <!-- IF not S_EDIT_POST -->
+ <button type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]">
+ <i class="icon fa-times icon-red" aria-hidden="true"></i><span class="sr-only">{L_REMOVE}</span>
+ </button>
+ <!-- ENDIF -->
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}" style="color: {{ to_recipient.COLOUR }}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
</li>
<!-- END to_recipient -->
@@ -48,7 +52,11 @@
<ul class="recipients">
<!-- BEGIN bcc_recipient -->
<li>
- <!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+ <!-- IF not S_EDIT_POST -->
+ <button type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]">
+ <i class="icon fa-times icon-red" aria-hidden="true"></i><span class="sr-only">{L_REMOVE}</span>
+ </button>
+ <!-- ENDIF -->
<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}" style="color: {{ bcc_recipient.COLOUR }}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
</li>
<!-- END bcc_recipient -->
@@ -69,8 +77,12 @@
<ul class="recipients">
<!-- BEGIN to_recipient -->
<li>
- <!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
- <!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+ <!-- IF not S_EDIT_POST -->
+ <button type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]">
+ <i class="icon fa-times icon-red" aria-hidden="true"></i><span class="sr-only">{L_REMOVE}</span>
+ </button>
+ <!-- ENDIF -->
+ <!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
</li>
<!-- END to_recipient -->
</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 63b9560a7a..e592d12928 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -52,6 +52,7 @@
<h3>{L_GROUP_SETTINGS_SAVE}</h3>
<fieldset>
+ <!-- EVENT ucp_group_settings_before -->
<dl>
<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
<dd>
@@ -65,6 +66,7 @@
<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
</dl>
+ <!-- EVENT ucp_group_settings_after -->
</fieldset>
</div>
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html
index 39197c5062..4a7e789667 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_post.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html
@@ -23,6 +23,7 @@
<label for="smilies0"><input type="radio" name="smilies" id="smilies0" value="0"<!-- IF not S_SMILIES --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
</dd>
</dl>
+ {% if S_SIG_ALLOWED %}
<dl>
<dt><label for="sig1">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
<dd>
@@ -30,6 +31,7 @@
<label for="sig0"><input type="radio" name="sig" id="sig0" value="0"<!-- IF not S_SIG --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
</dd>
</dl>
+ {% endif %}
<dl>
<dt><label for="notify1">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
<dd>
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index e01e7eb4d4..dc3f08e450 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -337,30 +337,6 @@ $('[data-ajax]').each(function() {
}
});
-// Prevent accidental double submission of form
-$('[data-prevent-flood] input[type=submit]').click(function(event) {
- const $submitButton = $(this); // Store the button element
- const $form = $submitButton.closest('form');
-
- // Always add the disabled class for visual feedback
- $submitButton.addClass('disabled');
-
- // Submit form if it hasn't been submitted yet
- if (!$form.prop('data-form-submitted')) {
- $form.prop('data-form-submitted', true);
-
- return;
- }
-
- // Prevent default submission for subsequent clicks within 5 seconds
- event.preventDefault();
-
- setTimeout(() => {
- $form.prop('removeProp', 'data-form-submitted');
- $submitButton.removeClass('disabled'); // Re-enable after 5 seconds
- }, 5000);
-});
-
/**
* This simply appends #preview to the action of the
* QR action when you click the Full Editor & Preview button
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 60a2fd8faa..009a9de621 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -329,17 +329,6 @@ function parseDocument($container) {
}, 100);
});
- /**
- * Adjust HTML code for IE8 and older versions
- */
- // if (oldBrowser) {
- // // Fix .linklist.bulletin lists
- // $container
- // .find('ul.linklist.bulletin > li')
- // .filter(':first-child, .rightside:last-child')
- // .addClass('no-bulletin');
- // }
-
/**
* Resize navigation (breadcrumbs) block to keep all links on same line
*/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment