Last active
August 2, 2018 18:05
-
-
Save marc1706/e53313e6b38bb7ab8280c8e7e8c72c40 to your computer and use it in GitHub Desktop.
prosilver changes 3.2.2 to 3.2.3-RC2 & 3.2.3-RC1 to 3.2.3-RC2
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/theme/common.css b/phpBB/styles/prosilver/theme/common.css | |
index 348355e..6223b22 100644 | |
--- a/phpBB/styles/prosilver/theme/common.css | |
+++ b/phpBB/styles/prosilver/theme/common.css | |
@@ -981,8 +981,15 @@ fieldset.fields1 dl.pmlist dd.recipients { | |
/* Miscellaneous styles | |
---------------------------------------- */ | |
.copyright { | |
- padding: 5px; | |
+ font-size: 10px; | |
text-align: center; | |
+ padding: 10px; | |
+} | |
+ | |
+.footer-row { | |
+ font-size: 10px; | |
+ line-height: 1.8; | |
+ margin: 0; | |
} | |
.small { |
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/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html | |
index 97a21f9..2c2094c 100644 | |
--- a/phpBB/styles/prosilver/template/overall_footer.html | |
+++ b/phpBB/styles/prosilver/template/overall_footer.html | |
@@ -8,11 +8,34 @@ | |
<div class="copyright"> | |
<!-- EVENT overall_footer_copyright_prepend --> | |
- {CREDIT_LINE} | |
- <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> | |
+ <p class="footer-row"> | |
+ <span class="footer-copyright">{{ CREDIT_LINE }}</span> | |
+ </p> | |
+ <!-- IF TRANSLATION_INFO --> | |
+ <p class="footer-row"> | |
+ <span class="footer-copyright">{{ TRANSLATION_INFO }}</span> | |
+ </p> | |
+ <!-- ENDIF --> | |
<!-- EVENT overall_footer_copyright_append --> | |
- <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> | |
- <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> | |
+ <p class="footer-row"> | |
+ <a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem"> | |
+ <span class="footer-link-text">Privacy</span> | |
+ </a> | |
+ | | |
+ <a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem"> | |
+ <span class="footer-link-text">Terms</span> | |
+ </a> | |
+ </p> | |
+ <!-- IF DEBUG_OUTPUT --> | |
+ <p class="footer-row"> | |
+ <span class="footer-info">{{ DEBUG_OUTPUT }}</span> | |
+ </p> | |
+ <!-- ENDIF --> | |
+ <!-- IF U_ACP --> | |
+ <p class="footer-row"> | |
+ <a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a> | |
+ </p> | |
+ <!-- ENDIF --> | |
</div> | |
<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> | |
@@ -62,6 +85,7 @@ | |
<!-- IF S_COOKIE_NOTICE --> | |
<script src="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.js?assets_version={T_ASSETS_VERSION}"></script> | |
<script> | |
+ if (typeof window.cookieconsent === "object") { | |
window.addEventListener("load", function(){ | |
window.cookieconsent.initialise({ | |
"palette": { | |
@@ -77,9 +101,11 @@ | |
"message": "{LA_COOKIE_CONSENT_MSG}", | |
"dismiss": "{LA_COOKIE_CONSENT_OK}", | |
"link": "{LA_COOKIE_CONSENT_INFO}", | |
- "href": "{LA_COOKIE_CONSENT_HREF}" | |
+ "href": "{UA_PRIVACY}" | |
+ } | |
+ }); | |
+ }); | |
} | |
- })}); | |
</script> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
index 4295867..2ed0189 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | |
@@ -91,28 +91,28 @@ | |
<!-- IF U_EDIT --> | |
<li> | |
<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only"> | |
- <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_EDIT_PM}</span> | |
+ <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF U_DELETE --> | |
<li> | |
<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only"> | |
- <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_MESSAGE}</span> | |
+ <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF U_REPORT --> | |
<li> | |
<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only"> | |
- <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_PM}</span> | |
+ <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF U_QUOTE --> | |
<li> | |
<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only"> | |
- <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_QUOTE_PM}</span> | |
+ <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html | |
index 40249f2..a9136e1 100644 | |
--- a/phpBB/styles/prosilver/template/viewtopic_body.html | |
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html | |
@@ -242,35 +242,35 @@ | |
<!-- IF postrow.U_DELETE --> | |
<li> | |
<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only"> | |
- <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_POST}</span> | |
+ <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_DELETE}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF postrow.U_REPORT --> | |
<li> | |
<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only"> | |
- <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_POST}</span> | |
+ <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_REPORT}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF postrow.U_WARN --> | |
<li> | |
<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only"> | |
- <i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_WARN_USER}</span> | |
+ <i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_WARN}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF postrow.U_INFO --> | |
<li> | |
<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only"> | |
- <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_INFORMATION}</span> | |
+ <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_INFORMATION}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
<!-- IF postrow.U_QUOTE --> | |
<li> | |
<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only"> | |
- <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE}</span> | |
+ <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_QUOTE}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html | |
index 397c807..272a434 100644 | |
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html | |
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html | |
@@ -11,7 +11,7 @@ | |
<!-- IF U_WATCH_TOPIC --> | |
<li> | |
<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="icon <!-- IF S_WATCHING_TOPIC -->fa-check-square-o<!-- ELSE -->fa-square-o<!-- ENDIF --> fa-fw" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link"> | |
- <i class="icon <!-- IF S_WATCHING_FORUM -->fa-square-o<!-- ELSE -->fa-check-square-o<!-- ENDIF --> fa-fw" aria-hidden="true"></i><span>{S_WATCH_TOPIC_TITLE}</span> | |
+ <i class="icon <!-- IF S_WATCHING_TOPIC -->fa-square-o<!-- ELSE -->fa-check-square-o<!-- ENDIF --> fa-fw" aria-hidden="true"></i><span>{S_WATCH_TOPIC_TITLE}</span> | |
</a> | |
</li> | |
<!-- ENDIF --> |
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/theme/common.css b/phpBB/styles/prosilver/theme/common.css | |
index 348355e..6223b22 100644 | |
--- a/phpBB/styles/prosilver/theme/common.css | |
+++ b/phpBB/styles/prosilver/theme/common.css | |
@@ -981,8 +981,15 @@ fieldset.fields1 dl.pmlist dd.recipients { | |
/* Miscellaneous styles | |
---------------------------------------- */ | |
.copyright { | |
- padding: 5px; | |
+ font-size: 10px; | |
text-align: center; | |
+ padding: 10px; | |
+} | |
+ | |
+.footer-row { | |
+ font-size: 10px; | |
+ line-height: 1.8; | |
+ margin: 0; | |
} | |
.small { |
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/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html | |
index b01b0bb..2c2094c 100644 | |
--- a/phpBB/styles/prosilver/template/overall_footer.html | |
+++ b/phpBB/styles/prosilver/template/overall_footer.html | |
@@ -8,11 +8,34 @@ | |
<div class="copyright"> | |
<!-- EVENT overall_footer_copyright_prepend --> | |
- {CREDIT_LINE} | |
- <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> | |
+ <p class="footer-row"> | |
+ <span class="footer-copyright">{{ CREDIT_LINE }}</span> | |
+ </p> | |
+ <!-- IF TRANSLATION_INFO --> | |
+ <p class="footer-row"> | |
+ <span class="footer-copyright">{{ TRANSLATION_INFO }}</span> | |
+ </p> | |
+ <!-- ENDIF --> | |
<!-- EVENT overall_footer_copyright_append --> | |
- <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> | |
- <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> | |
+ <p class="footer-row"> | |
+ <a class="footer-link" href="{{ U_PRIVACY }}" title="{{ lang('PRIVACY_LINK') }}" role="menuitem"> | |
+ <span class="footer-link-text">Privacy</span> | |
+ </a> | |
+ | | |
+ <a class="footer-link" href="{{ U_TERMS_USE }}" title="{{ lang('TERMS_LINK') }}" role="menuitem"> | |
+ <span class="footer-link-text">Terms</span> | |
+ </a> | |
+ </p> | |
+ <!-- IF DEBUG_OUTPUT --> | |
+ <p class="footer-row"> | |
+ <span class="footer-info">{{ DEBUG_OUTPUT }}</span> | |
+ </p> | |
+ <!-- ENDIF --> | |
+ <!-- IF U_ACP --> | |
+ <p class="footer-row"> | |
+ <a class="footer-link text-strong" href="{{ U_ACP }}">{{ lang('ACP') }}</a> | |
+ </p> | |
+ <!-- ENDIF --> | |
</div> | |
<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> | |
@@ -78,7 +101,7 @@ | |
"message": "{LA_COOKIE_CONSENT_MSG}", | |
"dismiss": "{LA_COOKIE_CONSENT_OK}", | |
"link": "{LA_COOKIE_CONSENT_INFO}", | |
- "href": "{LA_COOKIE_CONSENT_HREF}" | |
+ "href": "{UA_PRIVACY}" | |
} | |
}); | |
}); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment