diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 12:32:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 12:32:41 +0000 |
| commit | 021fec01b291e37a1ddec27628522c62f6a86521 (patch) | |
| tree | 6658708aa0ce1716443c0da5c3087135ffb8701c /phpBB | |
| parent | c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa (diff) | |
| download | forums-021fec01b291e37a1ddec27628522c62f6a86521.tar forums-021fec01b291e37a1ddec27628522c62f6a86521.tar.gz forums-021fec01b291e37a1ddec27628522c62f6a86521.tar.bz2 forums-021fec01b291e37a1ddec27628522c62f6a86521.tar.xz forums-021fec01b291e37a1ddec27628522c62f6a86521.zip | |
- IE6 is not able to correctly cope with gzip compression
- hopefully fixed the rtl icon issue in FF without breaking ltr display.
git-svn-id: file:///svn/phpbb/trunk@8040 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/style.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 39 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 24 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/buttons.css | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 16 |
6 files changed, 65 insertions, 23 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3dcb7057e1..3b82d57c1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -222,6 +222,8 @@ p a { <li>[Fix] If sending PM's to groups only include activated member (Bug #14040)</li> <li>[Fix] Correctly wrap words in emails containing utf8 characters (Bug #14109)</li> <li>[Change] For new posts or editing the first post topic titles have a maxlength of 60 characters. For any subsequent posts the length is extended to 64 to make room for the Re: part, but cutting at 60 characters. The maxlength need to be 64, else users using opera are unable to post (opera does not allow pre-filling a field with more characters than specified within the maxlength attribute)</li> + <li>[Fix] Disable gzip compression for cached stylesheet for Internet Explorer 6 or empty browser (IE6 is not able to properly display the compressed stylesheet) (Bug #14054)</li> + <li>[Fix] Header icons fixed in FF for RTL languages (Bug #14084)</li> </ul> </div> diff --git a/phpBB/style.php b/phpBB/style.php index 0ce5460dac..c82ff764b3 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -129,7 +129,10 @@ if ($id) // gzip_compression if ($config['gzip_compress']) { - if (@extension_loaded('zlib') && !headers_sent()) + // IE6 is not able to compress the style (do not ask us why!) + $browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? strtolower(htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT'])) : ''; + + if ($browser && strpos($browser, 'msie 6.0') === false && @extension_loaded('zlib') && !headers_sent()) { ob_start('ob_gzhandler'); } diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 7b578d2c1d..202b50fe5d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -124,7 +124,7 @@ <div class="inner"><span class="corners-top"><span></span></span> <ul class="linklist navlinks"> - <li><a class="icon-home" href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li> + <li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li> <li class="rightside"><a href="#" onclick="fontsizeup(); return false;" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li> @@ -134,28 +134,27 @@ <!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF --> </ul> - <ul class="linklist"> - <!-- IF not S_IS_BOT --> - <!-- IF S_USER_LOGGED_IN --> - <li> - <a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u" class="icon-ucp">{L_PROFILE}</a> - <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> • - <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> - <!-- IF U_RESTORE_PERMISSIONS --> • - <a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a> - <!-- ENDIF --> - </li> - <!-- ENDIF --> - <!-- ENDIF --> - <li class="rightside"> - <a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}" class="icon-faq">{L_FAQ}</a> - <!-- IF not S_IS_BOT --> - <!-- IF S_DISPLAY_MEMBERLIST --><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" class="icon-members">{L_MEMBERLIST}</a> <!-- ENDIF --> - <!-- IF not S_USER_LOGGED_IN --><a href="{U_REGISTER}" class="icon-register">{L_REGISTER}</a> <!-- ENDIF --> - <a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l" class="icon-logout">{L_LOGIN_LOGOUT}</a> + <!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> + <ul class="linklist leftside"> + <li class="icon-ucp"> + <a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a> + <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> • + <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> + <!-- IF U_RESTORE_PERMISSIONS --> • + <a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a> <!-- ENDIF --> </li> </ul> + <!-- ENDIF --> + + <ul class="linklist rightside"> + <li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> + <!-- IF not S_IS_BOT --> + <!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF --> + <!-- IF not S_USER_LOGGED_IN --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF --> + <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l">{L_LOGIN_LOGOUT}</a></li> + <!-- ENDIF --> + </ul> <span class="corners-bottom"><span></span></span></div> </div> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 17c0baf006..f54f0fc3ba 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -13,6 +13,11 @@ text-align: left; } +.rtl div.rules ul { + margin-left: 0; + margin-right: 20px; +} + /* Main blocks ---------------------------------------- */ .rtl #logo { @@ -67,6 +72,24 @@ text-align: left; } +.rtl ul.leftside li, .rtl ul.rightside li { + float: left; +} + +.rtl ul.leftside { + float: right; + margin-left: 5px; + margin-right: 0; + text-align: right; +} + +.rtl ul.rightside { + float: left; + margin-left: -5px; + margin-right: 5px; + text-align: left; +} + /* Table styles ----------------------------------------*/ .rtl table.table1 thead th { @@ -445,6 +468,7 @@ .rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, .rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search { background-position: 100% 50%; + padding: 0 17px 0 0; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 6d07dd3511..662b588d30 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -84,7 +84,7 @@ a.fontsize:hover { background-position: 0 50%; background-repeat: no-repeat; background-image: none; - padding: 1px 0 0 17px; + padding: 0 0 0 17px; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 9ba258b7df..0a2f418aa8 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -326,6 +326,20 @@ ul.navlinks { font-weight: bold; } +ul.leftside { + float: left; + margin-left: 0; + margin-right: 5px; + text-align: left; +} + +ul.rightside { + float: right; + margin-left: 5px; + margin-right: -5px; + text-align: right; +} + /* Table styles ----------------------------------------*/ table.table1 { @@ -584,7 +598,7 @@ div.rules { font-size: 1.1em; } -div.rules li { +div.rules ul { margin-left: 20px; } |