diff --git a/.gitignore b/.gitignore index 16dba4ad47..4093aeb56d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,18 @@ *~ -phpunit.xml -phpBB/cache/*.php -phpBB/cache/queue.php.lock -phpBB/config.php -phpBB/files/* -phpBB/images/avatars/gallery/* -phpBB/images/avatars/upload/* -phpBB/store/* -tests/phpbb_unit_tests.sqlite2 -tests/test_config.php -tests/tmp -tests/utf/data/*.txt +/phpunit.xml +/phpBB/cache/*.html +/phpBB/cache/*.php +/phpBB/cache/queue.php.lock +/phpBB/composer.phar +/phpBB/config.php +/phpBB/config_dev.php +/phpBB/config_test.php +/phpBB/ext/* +/phpBB/files/* +/phpBB/images/avatars/gallery/* +/phpBB/images/avatars/upload/* +/phpBB/store/* +/phpBB/vendor +/tests/phpbb_unit_tests.sqlite2 +/tests/test_config.php +/tests/tmp/* diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..f296f10230 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +language: php +php: + - 5.3.3 + - 5.3 + - 5.4 + +env: + - DB=mysql + - DB=postgres + +before_script: + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" + - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - pyrus set auto_discover 1 + - pyrus install --force phpunit/DbUnit + - phpenv rehash + - cd phpBB + - php ../composer.phar install --dev + - cd ../ + +script: + - phpunit --configuration travis/phpunit-$DB-travis.xml + +notifications: + email: + recipients: + - dev-team@phpbb.com + on_success: change + on_failure: change diff --git a/README.md b/README.md index 6b94f898a3..78aa306bed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) +[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com) ## ABOUT @@ -8,6 +8,14 @@ phpBB is a free bulletin board written in PHP. Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php). +## INSTALLING DEPENDENCIES + +To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies. + + cd phpBB + php ../composer.phar install --dev + + ## CONTRIBUTE 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register) @@ -15,6 +23,12 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev 3. [Read our Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git) 4. Send us a pull request +## AUTOMATED TESTING + +We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below. +develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3) +develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3) + ## LICENSE [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php) diff --git a/build/build.xml b/build/build.xml index 268f09d674..28dd36bea8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,18 +2,18 @@ - - - + + + - - - + + + @@ -43,25 +43,28 @@ - + + + + + + - - + + @@ -122,6 +125,29 @@ + + + + + + + + + + + + + + - - + + diff --git a/build/build_changelog.php b/build/build_changelog.php new file mode 100755 index 0000000000..1e80959adf --- /dev/null +++ b/build/build_changelog.php @@ -0,0 +1,53 @@ +#!/usr/bin/env php +xpath('//item') as $item) +{ + $key = (string) $item->key; + + $keyUrl = 'http://tracker.phpbb.com/browse/' . $key; + $keyLink = '' . $key . ''; + + $value = str_replace($key, $keyLink, htmlspecialchars($item->title)); + $value = str_replace(']', '] -', $value); + + $types[(string) $item->type][$key] = $value; +} + +ksort($types); +foreach ($types as $type => $tickets) +{ + echo "

$type

\n"; + echo "
    \n"; + + uksort($tickets, 'strnatcasecmp'); + + foreach ($tickets as $ticket) + { + echo "
  • $ticket
    • \n"; + } + echo "
\n"; +} diff --git a/build/build_diff.php b/build/build_diff.php index 2b13fc4995..74630232b3 100755 --- a/build/build_diff.php +++ b/build/build_diff.php @@ -3,9 +3,8 @@ /** * * @package build -* @version $Id$ * @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ @@ -388,7 +387,7 @@ function build_header($mode, $filenames, $header) $html .= "## {$filename['phpbb_filename']}\n"; } } - $html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n"; + $html .= "## License: http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 \n"; $html .= "############################################################## \n"; $html .= "\n"; diff --git a/build/build_helper.php b/build/build_helper.php index 94fc0ff3b5..d6169b913b 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -2,9 +2,8 @@ /** * * @package build -* @version $Id$ * @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ @@ -177,7 +176,7 @@ class build_package } // Is binary? - if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match)) + if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9._-]+\/\1 differ/i', $line, $match)) { $binary[] = trim($match[1]); } diff --git a/build/diff_class.php b/build/diff_class.php index 4625ffde24..2d8555400d 100644 --- a/build/diff_class.php +++ b/build/diff_class.php @@ -2,10 +2,9 @@ /** * * @package build -* @version $Id$ * @copyright (c) 2000 Geoffrey T. Dairiki * @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/build/package.php b/build/package.php index 4ce644e8ca..48f42b3572 100755 --- a/build/package.php +++ b/build/package.php @@ -3,9 +3,8 @@ /** * * @package build -* @version $Id$ * @copyright (c) 2010 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php b/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php index af267747d3..ba2b40ecba 100644 --- a/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php +++ b/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php @@ -4,7 +4,7 @@ * @package code_sniffer * @version $Id: $ * @copyright (c) 2007 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php b/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php index 925a9c4036..affa27b56c 100644 --- a/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php +++ b/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php @@ -4,7 +4,7 @@ * @package code_sniffer * @version $Id: $ * @copyright (c) 2007 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/code_sniffer/phpbb/phpbbCodingStandard.php b/code_sniffer/phpbb/phpbbCodingStandard.php index cd9b68846a..adbba9d915 100644 --- a/code_sniffer/phpbb/phpbbCodingStandard.php +++ b/code_sniffer/phpbb/phpbbCodingStandard.php @@ -4,7 +4,7 @@ * @package code_sniffer * @version $Id: $ * @copyright (c) 2007 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/composer.phar b/composer.phar new file mode 100755 index 0000000000..af7b8c1a67 Binary files /dev/null and b/composer.phar differ diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg index 4f6ae71d4b..b156d276df 100755 --- a/git-tools/hooks/commit-msg +++ b/git-tools/hooks/commit-msg @@ -11,14 +11,30 @@ # # ln -s ../../git-tools/hooks/commit-msg \\ # .git/hooks/commit-msg +# +# You can configure whether invalid commit messages abort commits: +# +# git config phpbb.hooks.commit-msg.fatal true (abort) +# git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort) +# +# The default is to warn only. +# +# Warning/error messages use color by default if the output is a terminal +# ("output" here is normally standard error when you run git commit). +# To force or disable the use of color: +# +# git config phpbb.hooks.commit-msg.color true (force color output) +# git config phpbb.hooks.commit-msg.color false (disable color output) config_ns="phpbb.hooks.commit-msg"; -if [ "$(git config --bool $config_ns.fatal)" = "false" ] +if [ "$(git config --bool $config_ns.fatal)" = "true" ] then - fatal=0; -else fatal=1; + severity=Error; +else + fatal=0; + severity=Warning; fi debug_level=$(git config --int $config_ns.debug || echo 0); @@ -47,14 +63,68 @@ debug() quit() { - if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ] + if [ $1 -eq 0 ] || [ $1 -eq $ERR_UNKNOWN ] then + # success + exit 0; + elif [ $fatal -eq 0 ] + then + # problems found but fatal is false + complain 'Please run `git commit --amend` and fix the problems mentioned.' 1>&2 exit 0; else + complain "Aborting commit." 1>&2 exit $1; fi } +use_color() +{ + if [ -z "$use_color_cached" ] + then + case $(git config --bool $config_ns.color) + in + false) + use_color_cached=1 + ;; + true) + use_color_cached=0 + ;; + *) + # tty detection in shell: + # http://hwi.ath.cx/jsh/list/shext/isatty.sh.html + tty 0>/dev/stdout >/dev/null 2>&1 + use_color_cached=$? + ;; + esac + fi + # return value is the flag inverted - + # if return value is 0, this means use color + return $use_color_cached +} + +complain() +{ + if use_color + then + # Careful: our argument may include arguments to echo like -n + # ANSI color codes: + # http://pueblo.sourceforge.net/doc/manual/ansi_color_codes.html + printf "\033[31m\033[1m" + if [ "$1" = "-n" ] + then + echo "$@" + printf "\033[0m" + else + # This will print one trailing space. + # Not sure how to avoid this at the moment. + echo "$@" $(printf "\033[0m") + fi + else + echo "$@" + fi +} + # Check for empty commit message if ! grep -qv '^#' "$1" then @@ -70,9 +140,9 @@ msg=$(grep -v '^#' "$1" |grep -nE '.{81,}') if [ $? -eq 0 ] then - echo "The following lines are greater than 80 characters long:" >&2; - echo >&2 - echo "$msg" >&2; + complain "The following lines are greater than 80 characters long:" >&2; + complain >&2 + complain "$msg" >&2; quit $ERR_LENGTH; fi @@ -126,9 +196,9 @@ do # Don't be too strict. # Commits may be temporary, intended to be squashed later. # Just issue a warning here. - echo "Warning: heading should be a sentence beginning with a capital letter." 1>&2 - echo "You entered:" 1>&2 - echo "$line" 1>&2 + complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2 + complain "You entered:" 1>&2 + complain "$line" 1>&2 fi # restore exit code (exit $result) @@ -160,7 +230,7 @@ do echo "$line" | grep -Eq "^#"; ;; *) - echo "Unrecognised token $expect" >&2; + complain "Unrecognised token $expect" >&2; quit $err; ;; esac @@ -231,7 +301,7 @@ do expecting="eof"; ;; *) - echo "Unrecognised token $expect" >&2; + complain "Unrecognised token $expect" >&2; quit 254; ;; esac @@ -245,11 +315,11 @@ do else # None of the expected line formats matched # Guess we'll call it a day here then - echo "Syntax error on line $i:" >&2; - echo ">> $line" >&2; - echo -n "Expecting: " >&2; - echo "$expecting" | sed 's/ /, /g' >&2; - exit $err; + complain "Syntax error on line $i:" >&2; + complain ">> $line" >&2; + complain -n "Expecting: " >&2; + complain "$expecting" | sed 's/ /, /g' >&2; + quit $err; fi i=$(( $i + 1 )); @@ -258,7 +328,7 @@ done # If EOF is expected exit cleanly echo "$expecting" | grep -q "eof" || ( # Unexpected EOF, error - echo "Unexpected EOF encountered" >&2; + complain "Unexpected EOF encountered" >&2; quit $ERR_EOF; ) && ( # Do post scan checks @@ -269,8 +339,8 @@ echo "$expecting" | grep -q "eof" || ( if [ ! -z "$dupes" ] then - echo "The following tickets are repeated:" >&2; - echo "$dupes" | sed 's/ /\n/g;s/^/* /g' >&2; + complain "The following tickets are repeated:" >&2; + complain "$dupes" | sed 's/ /\n/g;s/^/* /g' >&2; quit $ERR_FOOTER; fi fi @@ -278,8 +348,8 @@ echo "$expecting" | grep -q "eof" || ( if [ $ticket -gt 0 ] then echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || ( - echo "Ticket ID [$ticket] of branch missing from list of tickets:" >&2; - echo "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2; + complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2; + complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2; quit $ERR_FOOTER; ) || exit $?; fi diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit index 4d03359773..03babe47cd 100755 --- a/git-tools/hooks/pre-commit +++ b/git-tools/hooks/pre-commit @@ -12,8 +12,17 @@ # ln -s ../../git-tools/hooks/pre-commit \\ # .git/hooks/pre-commit -# NOTE: this is run through /usr/bin/env -PHP_BIN=php +if [ -z "$PHP_BIN" ] +then + PHP_BIN=php +fi + +if [ "$(echo -e test)" = test ] +then + echo_e="echo -e" +else + echo_e="echo" +fi # necessary check for initial commit if git rev-parse --verify HEAD >/dev/null 2>&1 @@ -27,7 +36,7 @@ fi error=0 errors="" -if ! which $PHP_BIN >/dev/null 2>&1 +if ! which "$PHP_BIN" >/dev/null 2>&1 then echo "PHP Syntax check failed:" echo "PHP binary does not exist or is not in path: $PHP_BIN" @@ -64,7 +73,13 @@ do # check the staged file content for syntax errors # using php -l (lint) - result=$(git cat-file -p $sha | /usr/bin/env $PHP_BIN -l 2>/dev/null) + # note: if display_errors=stderr in php.ini, + # parse errors are printed on stderr; otherwise + # they are printed on stdout. + # we filter everything other than parse errors + # with a grep below, therefore it should be safe + # to combine stdout and stderr in all circumstances + result=$(git cat-file -p $sha | "$PHP_BIN" -l 2>&1) if [ $? -ne 0 ] then error=1 @@ -76,7 +91,45 @@ unset IFS if [ $error -eq 1 ] then - echo -e "PHP Syntax check failed:"; - echo -e "$errors" | grep "^Parse error:" + echo "PHP Syntax check failed:" + # php "display errors" (display_errors php.ini value) + # and "log errors" (log_errors php.ini value). + # these are independent settings - see main/main.c in php source. + # the "log errors" setting produces output which + # starts with "PHP Parse error:"; the "display errors" + # setting produces output starting with "Parse error:". + # if both are turned on php dumps the parse error twice. + # therefore here we try to grep for one version and + # if that yields no results grep for the other version. + # + # other fun php facts: + # + # 1. in cli, display_errors and log_errors have different + # destinations by default. display_errors prints to + # standard output and log_errors prints to standard error. + # whether these destinations make sense is left + # as an exercise for the reader. + # 2. as mentioned above, with all output turned on + # php will print parse errors twice, one time on stdout + # and one time on stderr. + # 3. it is possible to set both display_errors and log_errors + # to off. if this is done php will print the text + # "Errors parsing " but will not say what + # the errors are. useful behavior, this. + # 4. on my system display_errors defaults to on and + # log_errors defaults to off, therefore providing + # by default one copy of messages. your mileage may vary. + # 5. by setting display_errors=stderr and log_errors=on, + # both sets of messages will be printed on stderr. + # 6. php-cgi binary, given display_errors=stderr and + # log_errors=on, still prints both sets of messages + # on stderr, but formats one set as an html fragment. + # 7. your entry here? ;) + $echo_e "$errors" | grep "^Parse error:" + if [ $? -ne 0 ] + then + # match failed + $echo_e "$errors" | grep "^PHP Parse error:" + fi exit 1 fi diff --git a/git-tools/merge.php b/git-tools/merge.php index cbd84b896f..034bd2032c 100755 --- a/git-tools/merge.php +++ b/git-tools/merge.php @@ -4,7 +4,7 @@ * * @package phpBB3 * @copyright (c) 2011 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php index e4e212eef6..5f2e1609a7 100755 --- a/git-tools/setup_github_network.php +++ b/git-tools/setup_github_network.php @@ -4,7 +4,7 @@ * * @package phpBB3 * @copyright (c) 2011 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png new file mode 100644 index 0000000000..79750a013c Binary files /dev/null and b/phpBB/adm/images/alert_close.png differ diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif deleted file mode 100644 index 239993182b..0000000000 Binary files a/phpBB/adm/images/phpbb_logo.gif and /dev/null differ diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png new file mode 100644 index 0000000000..c3f9248ed7 Binary files /dev/null and b/phpBB/adm/images/phpbb_logo.png differ diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 726cb1644c..e20bbe4bec 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -2,9 +2,8 @@ /** * * @package acp -* @version $Id$ * @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ @@ -51,13 +50,12 @@ $file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_up $module_id = request_var('i', ''); $mode = request_var('mode', ''); -// Set custom template for admin area -$template->set_custom_template($phpbb_admin_path . 'style', 'admin'); +// Set custom style for admin area +$phpbb_style->set_ext_dir_prefix('adm/'); +$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', ''); +$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); -// the acp template is never stored in the database -$user->theme['template_storedb'] = false; - // Instantiate new module $module = new p_master(); diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index d938135440..c69dedbcfb 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -1,6 +1,6 @@ - + « {L_BACK} @@ -248,7 +248,7 @@
» {L_ALLOWED_IN_PM_POST} {groups.CATEGORY} -  {ICON_EDIT}  {ICON_DELETE}  +  {ICON_EDIT}  {ICON_DELETE}  @@ -378,11 +378,16 @@
{L_TITLE} - + + {L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE} + + • + + • {S_ON_PAGE} + + @@ -421,7 +426,12 @@
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 2eeb748e4b..d564e89312 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -1,6 +1,6 @@ - +

{L_ACP_BAN_EXPLAIN}

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index c81c198fd5..5939af24ae 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -1,6 +1,6 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index bb16204801..781f5c6bce 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -1,6 +1,6 @@ - +

{L_TITLE}

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 7783356574..87679fc33a 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -1,6 +1,6 @@ - + @@ -76,9 +76,9 @@ - + - + diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 8eee370284..83314ab633 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -1,6 +1,6 @@ - +

{L_ACP_VC_SETTINGS}

diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index de02ac6dbe..28ac2db1b9 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -1,6 +1,6 @@ - +

{L_ACP_RESTORE}

diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index b68d3ab3c0..776f54d66c 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -1,6 +1,6 @@ - +

{L_ACP_DISALLOW_USERNAMES}

diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index ff52500dca..1339ac6529 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -1,6 +1,6 @@ - +

{L_ACP_MASS_EMAIL}

diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html new file mode 100644 index 0000000000..e7532691ad --- /dev/null +++ b/phpBB/adm/style/acp_ext_details.html @@ -0,0 +1,97 @@ + + + + + « {L_BACK} + +

{L_EXTENSIONS_ADMIN}

+ +
+ {L_EXT_DETAILS} + +
+
+
{META_DISPLAY_NAME}
+
+ +
+
+
{META_NAME}
+
+ +
+
+

{META_DESCRIPTION}

+
+ +
+
+

{META_VERSION}

+
+ +
+
+

{META_HOMEPAGE}

+
+ + +
+
+

{META_TIME}

+
+ +
+
+

{META_LICENCE}

+
+
+ + +
+ {L_REQUIREMENTS} + + class="requirements_not_met"> +
+

{META_REQUIRE_PHPBB}

+ + + + class="requirements_not_met"> +
+

{META_REQUIRE_PHP}

+ + +
+ + +
+ {L_AUTHOR_INFORMATION} + +
+
+
+
{meta_authors.AUTHOR_NAME}
+
+ +
+
+
{meta_authors.AUTHOR_EMAIL}
+
+ + +
+
+
{meta_authors.AUTHOR_HOMEPAGE}
+
+ + +
+
+
{meta_authors.AUTHOR_ROLE}
+
+ +
+ +
+ + diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html new file mode 100644 index 0000000000..7dc3f6ec97 --- /dev/null +++ b/phpBB/adm/style/acp_ext_disable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_DISABLE_EXPLAIN}

+ + +
+

{L_DISABLE_CONFIRM}

+
+ + +
+ {L_DISABLE} + + +
+ + +
+

{L_DISABLE_IN_PROGRESS}

+
+ +
+

{L_DISABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html new file mode 100644 index 0000000000..3f7be2c847 --- /dev/null +++ b/phpBB/adm/style/acp_ext_enable.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_ENABLE_EXPLAIN}

+ + +
+

{L_ENABLE_CONFIRM}

+
+ + +
+ {L_ENABLE} + + +
+ + +
+

{L_ENABLE_IN_PROGRESS}

+
+ +
+

{L_ENABLE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html new file mode 100644 index 0000000000..53de0b4d12 --- /dev/null +++ b/phpBB/adm/style/acp_ext_list.html @@ -0,0 +1,61 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+ +
{bbcodes.BBCODE_TAG}{ICON_EDIT} {ICON_DELETE}{ICON_EDIT} {ICON_DELETE}
{bots.BOT_NAME}  {bots.LAST_VISIT}  {bots.L_ACTIVATE_DEACTIVATE}  {bots.L_ACTIVATE_DEACTIVATE}   {L_EDIT}  {L_DELETE}  {L_DELETE} 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_EXTENSION_NAME}{L_EXTENSION_OPTIONS}{L_EXTENSION_ACTIONS}
+ {L_ENABLED} {L_EXTENSIONS} +
{enabled.META_DISPLAY_NAME}{L_DETAILS} + + {enabled.actions.L_ACTION} +  |  + +
{L_DISABLED} {L_EXTENSIONS}
{disabled.META_DISPLAY_NAME} + {L_DETAILS} + + + {disabled.actions.L_ACTION} +  |  + +
+ + diff --git a/phpBB/adm/style/acp_ext_purge.html b/phpBB/adm/style/acp_ext_purge.html new file mode 100644 index 0000000000..00a58721cb --- /dev/null +++ b/phpBB/adm/style/acp_ext_purge.html @@ -0,0 +1,34 @@ + + + + +

{L_EXTENSIONS_ADMIN}

+ +

{L_EXTENSIONS_EXPLAIN}

+

{L_PURGE_EXPLAIN}

+ + +
+

{L_PURGE_CONFIRM}

+
+ +
+
+ {L_PURGE} + + +
+
+ +
+

{L_PURGE_IN_PROGRESS}

+
+ +
+

{L_PURGE_SUCCESS}

+
+

{L_RETURN}

+
+ + + diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index d27cea28f7..e29cdcf2e9 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -1,6 +1,6 @@ - + @@ -140,6 +140,12 @@
+ +
+

{L_COPY_PERMISSIONS_EXPLAIN}
+
+
+
@@ -160,11 +166,11 @@

{L_FORUM_PASSWORD_EXPLAIN}
-
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-
+
@@ -176,12 +182,6 @@
- -
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
-
@@ -443,7 +443,7 @@ - + {forums.FOLDER_IMAGE}
{forums.FORUM_IMAGE}
@@ -453,17 +453,17 @@ - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} + {ICON_MOVE_UP_DISABLED} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} + {ICON_MOVE_UP} + {ICON_MOVE_DOWN} - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} + {ICON_MOVE_UP} + {ICON_MOVE_DOWN_DISABLED} - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} + {ICON_MOVE_UP_DISABLED} + {ICON_MOVE_DOWN_DISABLED} {ICON_EDIT} @@ -500,6 +500,14 @@ + + diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 2f812c443d..6e52880131 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -1,6 +1,6 @@ - + @@ -239,11 +239,11 @@ - + + +
@@ -350,7 +350,7 @@ {groups.TOTAL_MEMBERS} {L_SETTINGS} {L_MEMBERS} - {L_DELETE}{L_DELETE} + {L_DELETE}{L_DELETE} diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 49212a4408..3a03573756 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -1,6 +1,6 @@ - +

{L_MANAGE_LEGEND}

@@ -82,10 +82,11 @@
{L_TEAMPAGE_SETTINGS}
-

{L_TEAMPAGE_MULTIPLE_EXPLAIN}
+
- - +
+
+
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index eedf39b440..b9af20d5a2 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -1,6 +1,6 @@ - + @@ -74,7 +74,7 @@
{L_TITLE} - +
@@ -94,7 +94,7 @@ - + @@ -245,7 +245,7 @@ @@ -255,7 +255,11 @@
{L_CONFIG}{L_ORDER} {L_ADD}{L_ADD} ({L_MARK_ALL})
{ICON_MOVE_UP_DISABLED}{ICON_MOVE_UP}  {ICON_MOVE_DOWN_DISABLED}{ICON_MOVE_DOWN} -  {ICON_EDIT} {ICON_DELETE} +  {ICON_EDIT} {ICON_DELETE}
-
{PAGINATION}
+

   

diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index d7bf99f853..0b3b1b02d1 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -1,6 +1,6 @@ - +

{L_INACTIVE_USERS}

@@ -10,9 +10,9 @@
- + @@ -53,15 +53,15 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page: + {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page:
- + diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 0c4512ba98..2ba1424bda 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -1,6 +1,6 @@ - +

{L_ACP_JABBER_SETTINGS}

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 95ac1d5852..81276287c1 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -1,6 +1,6 @@ - + @@ -98,7 +98,7 @@

- +

{L_LANGUAGE_ENTRIES}

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index f2fa5dbc26..1e54f89afe 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -1,6 +1,6 @@ - +

{L_TITLE}

@@ -12,9 +12,9 @@ {L_SEARCH_KEYWORDS}:  
- + @@ -54,9 +54,9 @@ - + diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index f3a26305ef..d9f833d878 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -1,6 +1,6 @@ - + @@ -34,6 +34,36 @@ + + +
+

{L_ERROR_MBSTRING_FUNC_OVERLOAD}

+

{L_ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN}

+
+ + + +
+

{L_ERROR_MBSTRING_ENCODING_TRANSLATION}

+

{L_ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN}

+
+ + + +
+

{L_ERROR_MBSTRING_HTTP_INPUT}

+

{L_ERROR_MBSTRING_HTTP_INPUT_EXPLAIN}

+
+ + + +
+

{L_ERROR_MBSTRING_HTTP_OUTPUT}

+

{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}

+
+ + +

{L_WRITABLE_CONFIG}

@@ -122,35 +152,35 @@
{L_STATISTIC_RESYNC_OPTIONS} -
+

 
-
+

 
-
+

{L_RESYNC_STATS_EXPLAIN}
-
+

{L_RESYNC_POSTCOUNTS_EXPLAIN}
-
+

{L_RESYNC_POST_MARKING_EXPLAIN}
@@ -158,19 +188,20 @@ -
+

{L_PURGE_SESSIONS_EXPLAIN}
-
+ + +

{L_PURGE_CACHE_EXPLAIN}
-
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 5396e78557..6c4645e80c 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -1,6 +1,6 @@ - + @@ -164,7 +164,7 @@ {ICON_MOVE_DOWN_DISABLED} {ICON_EDIT} - {ICON_DELETE} + {ICON_DELETE} diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 54bee54c77..2ac77af25d 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -1,6 +1,6 @@ - + @@ -60,7 +60,7 @@

- + » {L_BACK_TO_TOP}


@@ -174,7 +174,7 @@ {ICON_MOVE_DOWN_DISABLED} {ICON_EDIT} - {ICON_DELETE} + {ICON_DELETE} @@ -189,7 +189,7 @@ - +

{L_ROLE_ASSIGNED_TO}

diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 6a6db11659..b44cca782e 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -1,6 +1,6 @@ - + diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html index 24648f0816..760cd0e9f6 100644 --- a/phpBB/adm/style/acp_php_info.html +++ b/phpBB/adm/style/acp_php_info.html @@ -1,6 +1,6 @@ - +

{L_ACP_PHP_INFO}

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 85d37568c2..5be69aa20b 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -1,6 +1,6 @@ - + @@ -55,6 +55,10 @@

{L_DISPLAY_AT_REGISTER_EXPLAIN}
checked="checked" />
+
+

{L_DISPLAY_ON_PM_EXPLAIN}
+
checked="checked" />
+

{L_DISPLAY_ON_VT_EXPLAIN}
checked="checked" />
@@ -63,6 +67,10 @@

{L_REQUIRED_FIELD_EXPLAIN}
checked="checked" />
+
+

{L_SHOW_NOVALUE_FIELD_EXPLAIN}
+
checked="checked" />
+

{L_HIDE_PROFILE_FIELD_EXPLAIN}
checked="checked" />
@@ -191,7 +199,7 @@ {fields.FIELD_IDENT} {fields.FIELD_TYPE} - {fields.L_ACTIVATE_DEACTIVATE} | {L_TRANSLATE} + {fields.L_ACTIVATE_DEACTIVATE} | {L_TRANSLATE} @@ -209,7 +217,7 @@ {ICON_EDIT_DISABLED} - {ICON_DELETE} + {ICON_DELETE} diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 069d2c91c3..dfc5827117 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -1,6 +1,6 @@ - + diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 5c4d89f794..4ca562fd32 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -1,6 +1,6 @@ - +

{L_ACP_PRUNE_USERS}

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 2ad8b3e8aa..7fb7da7095 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@
-
+
-
+
-

{L_CURRENT_PASSWORD_EXPLAIN}
+

{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}{L_CURRENT_PASSWORD_EXPLAIN}
-
+
- {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS}  {S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html index cf5a6c3229..574f61ed9f 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_signature.html +++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html @@ -6,17 +6,17 @@
-
+

{L_SIGNATURE_PREVIEW}

{SIGNATURE_PREVIEW}
-
+
-
+

{L_SIGNATURE_EXPLAIN}

@@ -36,7 +36,7 @@
- +
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index dd0e5ad02a..e14ca6493d 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -12,7 +12,7 @@ } - onload_functions.push('apply_onkeypress_event()'); + onload_functions.push(apply_onkeypress_event); // ]]> @@ -21,7 +21,7 @@
-
+

{SITENAME} - {L_REGISTRATION}

@@ -38,10 +38,6 @@
-
-
-
-

{L_PASSWORD_EXPLAIN}
@@ -57,10 +53,8 @@
-
-
-
-
+ +
{L_ITEMS_REQUIRED}
@@ -76,7 +70,7 @@
- + @@ -87,17 +81,17 @@
-
+

{L_COPPA_COMPLIANCE}

{L_COPPA_EXPLAIN}

-
+
-
+
{S_HIDDEN_FIELDS} @@ -106,8 +100,11 @@ {S_FORM_TOKEN}
-
+
+ + + diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index afc23b3f21..d480258209 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -3,7 +3,7 @@
-
+

{L_SEND_PASSWORD}

@@ -25,7 +25,7 @@
- + diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 0481c2a601..36e112863c 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -4,7 +4,7 @@
-
+

{L_UCP_RESEND}

@@ -25,7 +25,7 @@
-
+
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html index 8a2c9cbff5..7aceac74c3 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html @@ -5,7 +5,7 @@

{L_TITLE}

-
+

{L_FOES_EXPLAIN}

@@ -28,7 +28,7 @@ -
+
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html index 928ec1a881..8908e4ba69 100644 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html @@ -5,7 +5,7 @@

{L_TITLE}

-
+

{L_FRIENDS_EXPLAIN}

@@ -28,7 +28,7 @@
- +
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index b9e222bff1..373a172918 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -12,7 +12,7 @@
-
+
{L_FORUM_RULES} @@ -21,7 +21,7 @@ {FORUM_RULES} -
+
@@ -34,7 +34,7 @@ - +
style="margin-top: 2em;"> @@ -45,21 +45,24 @@
-
- + @@ -70,9 +73,9 @@
-
+
{L_NO_READ_ACCESS} -
+
@@ -80,7 +83,7 @@
-
+

{L_LOGIN_LOGOUT}  •  {L_REGISTER}

@@ -104,7 +107,7 @@
- + @@ -117,13 +120,13 @@ - +
-
+
-
+
-
+
{L_NO_TOPICS} -
+
@@ -193,13 +209,16 @@ - + diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index b111d743f9..9156090407 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -4,11 +4,17 @@

{TOTAL_GUEST_USERS_ONLINE} • {L_SWITCH_GUEST_DISPLAY}

    - +
-
-
+
+
@@ -38,7 +44,7 @@
-
+
@@ -50,7 +56,13 @@

{L_LEGEND}: {LEGEND}

    - +
diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html index 88a41a1a3f..8abd933efa 100644 --- a/phpBB/styles/prosilver/template/viewonline_whois.html +++ b/phpBB/styles/prosilver/template/viewonline_whois.html @@ -3,13 +3,13 @@

{L_WHOIS}

-
+ 
{WHOIS}
-
+
{L_CLOSE_WINDOW} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 05c2b91a2e..01b6a504a2 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -4,18 +4,15 @@
{FORUM_DESC}
- -

- - {L_MODERATOR}{L_MODERATORS}: {MODERATORS} - - -

+ +

+ {L_MODERATOR}{L_MODERATORS}: {MODERATORS} +

-
+
{L_FORUM_RULES} @@ -24,7 +21,7 @@ {FORUM_RULES} -
+
@@ -38,21 +35,24 @@
-
- + @@ -63,7 +63,7 @@
-
+

{POLL_QUESTION}

@@ -102,7 +102,7 @@
-
+
{S_FORM_TOKEN} {S_HIDDEN_FIELDS}
@@ -115,7 +115,7 @@
-
+
@@ -126,7 +126,7 @@
+
@@ -225,7 +245,7 @@ - +
@@ -248,20 +268,51 @@
- + +
+ {L_DOWNLOAD_ALL_ATTACHMENTS}: + +
+ + +
- - + +
- {S_TOPIC_MOD} + + + {S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 7b91ff4bc3..88d65ea407 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -1,13 +1,7 @@ - - + + - - - - - - - + @@ -19,7 +13,7 @@
- +

{SITENAME}

@@ -44,7 +38,7 @@
{S_TIMEZONE}
{PAGE_NUMBER}
-
Powered by phpBB © phpBB Group
http://www.phpbb.com/
+
Powered by phpBB® Forum Software © phpBB Group
https://www.phpbb.com/
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f441784d85..5cff0a811b 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -1,4 +1,4 @@ -/* proSilver RTL definitions +/* RTL definitions ---------------------------------------- */ /** @@ -491,7 +491,7 @@ /* Sub-header (navigation bar) --------------------------------------------- */ -.rtl a.print, .rtl a.sendemail, .rtl a.fontsize { +.rtl a.print, .rtl a.sendemail { text-align: right; } @@ -519,7 +519,7 @@ /** * cp.css */ -/* proSilver Control Panel Styles +/* Control Panel Styles ---------------------------------------- */ @@ -591,6 +591,19 @@ /* PM Styles ----------------------------------------*/ +/* PM panel adjustments */ +.rtl .reply-all a.right { + background-position: 5% 60%; +} + +.rtl .reply-all a.right:hover { + background-position: 3% 60%; +} + +.rtl .reply-all { + padding-left: 5px; +} + /* Defined rules list for PM options */ .rtl ol.def-rules { padding-right: 0; @@ -755,3 +768,33 @@ .rtl #wrap, .rtl .headerbar, .rtl #site-description, .rtl .navbar { position: relative; } + +/* Former imageset */ +.rtl .imageset.site_logo { + padding-right: 139px; + padding-left: 0; +} +.rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum, .rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread { + padding-right: 27px; + padding-left: 0; +} +.rtl .imageset.subforum_read, .rtl .imageset.subforum_unread, .rtl .imageset.icon_post_target, .rtl .imageset.icon_post_target_unread, .rtl .imageset.icon_topic_latest, .rtl .imageset.icon_topic_newest { + padding-right: 11px; + padding-left: 0; +} +.rtl .imageset.icon_back_top { + padding-right: 11px; + padding-left: 0; +} +.rtl .imageset.icon_contact_aim, .rtl .imageset.icon_contact_email, .rtl .imageset.icon_contact_icq, .rtl .imageset.icon_contact_jabber, .rtl .imageset.icon_contact_msnm, .rtl .imageset.icon_contact_www, .rtl .imageset.icon_contact_yahoo, .rtl .imageset.icon_post_delete, .rtl .imageset.icon_post_info, .rtl .imageset.icon_post_report, .rtl .imageset.icon_user_warn { + padding-right: 20px; + padding-left: 0; +} +.rtl .imageset.icon_topic_attach { + padding-right: 7px; + padding-left: 0; +} +.rtl .imageset.icon_topic_reported, .rtl .imageset.icon_topic_unapproved { + padding-right: 16px; + padding-left: 0; +} diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 6cffdc5930..e817380f8e 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -1,4 +1,4 @@ -/* proSilver Button Styles +/* Button Styles ---------------------------------------- */ /* Rollover buttons @@ -42,16 +42,16 @@ .forwardpm-icon span { background: none 0 0 no-repeat; } /* Set big button dimensions */ -.buttons div.reply-icon { width: {IMG_BUTTON_TOPIC_REPLY_WIDTH}px; height: {IMG_BUTTON_TOPIC_REPLY_HEIGHT}px; } -.buttons div.post-icon { width: {IMG_BUTTON_TOPIC_NEW_WIDTH}px; height: {IMG_BUTTON_TOPIC_NEW_HEIGHT}px; } -.buttons div.locked-icon { width: {IMG_BUTTON_TOPIC_LOCKED_WIDTH}px; height: {IMG_BUTTON_TOPIC_LOCKED_HEIGHT}px; } -.buttons div.pmreply-icon { width: {IMG_BUTTON_PM_REPLY_WIDTH}px; height: {IMG_BUTTON_PM_REPLY_HEIGHT}px; } -.buttons div.newpm-icon { width: {IMG_BUTTON_PM_NEW_WIDTH}px; height: {IMG_BUTTON_PM_NEW_HEIGHT}px; } -.buttons div.forwardpm-icon { width: {IMG_BUTTON_PM_FORWARD_WIDTH}px; height: {IMG_BUTTON_PM_FORWARD_HEIGHT}px; } +.buttons div.reply-icon { width: 96px; height: 25px; } +.buttons div.post-icon { width: 96px; height: 25px; } +.buttons div.locked-icon { width: 88px; height: 25px; } +.buttons div.pmreply-icon { width: 96px; height: 25px; } +.buttons div.newpm-icon { width: 84px; height: 25px; } +.buttons div.forwardpm-icon { width: 96px; height: 25px; } /* Sub-header (navigation bar) --------------------------------------------- */ -a.print, a.sendemail, a.fontsize { +a.print, a.sendemail { display: block; overflow: hidden; height: 18px; @@ -70,17 +70,6 @@ a.sendemail { width: 22px; } -a.fontsize { - background-image: none; - background-position: 0 -1px; - width: 29px; -} - -a.fontsize:hover { - background-position: 0 -20px; - text-decoration: none; -} - /* Icon images ---------------------------------------- */ .sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout, @@ -147,20 +136,20 @@ ul.profile-icons li a:hover { background: none; } .info-icon, .info-icon a { background: none top left no-repeat; } /* Set profile icon dimensions */ -ul.profile-icons li.email-icon { width: {IMG_ICON_CONTACT_EMAIL_WIDTH}px; height: {IMG_ICON_CONTACT_EMAIL_HEIGHT}px; } -ul.profile-icons li.aim-icon { width: {IMG_ICON_CONTACT_AIM_WIDTH}px; height: {IMG_ICON_CONTACT_AIM_HEIGHT}px; } -ul.profile-icons li.yahoo-icon { width: {IMG_ICON_CONTACT_YAHOO_WIDTH}px; height: {IMG_ICON_CONTACT_YAHOO_HEIGHT}px; } -ul.profile-icons li.web-icon { width: {IMG_ICON_CONTACT_WWW_WIDTH}px; height: {IMG_ICON_CONTACT_WWW_HEIGHT}px; } -ul.profile-icons li.msnm-icon { width: {IMG_ICON_CONTACT_MSNM_WIDTH}px; height: {IMG_ICON_CONTACT_MSNM_HEIGHT}px; } -ul.profile-icons li.icq-icon { width: {IMG_ICON_CONTACT_ICQ_WIDTH}px; height: {IMG_ICON_CONTACT_ICQ_HEIGHT}px; } -ul.profile-icons li.jabber-icon { width: {IMG_ICON_CONTACT_JABBER_WIDTH}px; height: {IMG_ICON_CONTACT_JABBER_HEIGHT}px; } -ul.profile-icons li.pm-icon { width: {IMG_ICON_CONTACT_PM_WIDTH}px; height: {IMG_ICON_CONTACT_PM_HEIGHT}px; } -ul.profile-icons li.quote-icon { width: {IMG_ICON_POST_QUOTE_WIDTH}px; height: {IMG_ICON_POST_QUOTE_HEIGHT}px; } -ul.profile-icons li.report-icon { width: {IMG_ICON_POST_REPORT_WIDTH}px; height: {IMG_ICON_POST_REPORT_HEIGHT}px; } -ul.profile-icons li.edit-icon { width: {IMG_ICON_POST_EDIT_WIDTH}px; height: {IMG_ICON_POST_EDIT_HEIGHT}px; } -ul.profile-icons li.delete-icon { width: {IMG_ICON_POST_DELETE_WIDTH}px; height: {IMG_ICON_POST_DELETE_HEIGHT}px; } -ul.profile-icons li.info-icon { width: {IMG_ICON_POST_INFO_WIDTH}px; height: {IMG_ICON_POST_INFO_HEIGHT}px; } -ul.profile-icons li.warn-icon { width: {IMG_ICON_USER_WARN_WIDTH}px; height: {IMG_ICON_USER_WARN_HEIGHT}px; } +ul.profile-icons li.email-icon { width: 20px; height: 20px; } +ul.profile-icons li.aim-icon { width: 20px; height: 20px; } +ul.profile-icons li.yahoo-icon { width: 20px; height: 20px; } +ul.profile-icons li.web-icon { width: 20px; height: 20px; } +ul.profile-icons li.msnm-icon { width: 20px; height: 20px; } +ul.profile-icons li.icq-icon { width: 20px; height: 20px; } +ul.profile-icons li.jabber-icon { width: 20px; height: 20px; } +ul.profile-icons li.pm-icon { width: 28px; height: 20px; } +ul.profile-icons li.quote-icon { width: 54px; height: 20px; } +ul.profile-icons li.report-icon { width: 20px; height: 20px; } +ul.profile-icons li.edit-icon { width: 42px; height: 20px; } +ul.profile-icons li.delete-icon { width: 20px; height: 20px; } +ul.profile-icons li.info-icon { width: 20px; height: 20px; } +ul.profile-icons li.warn-icon { width: 20px; height: 20px; } /* Fix profile icon default margins */ ul.profile-icons li.edit-icon { margin: 0 0 0 3px; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index c1c0711fb2..d7ce9a7622 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -26,10 +26,6 @@ hr { border-top-color: #CCCCCC; } -hr.dashed { - border-top-color: #CCCCCC; -} - /* Search box --------------------------------------------- */ @@ -49,7 +45,7 @@ hr.dashed { ---------------------------------------- */ .headerbar { background-color: #12A3EB; - background-image: url("{T_THEME_PATH}/images/bg_header.gif"); + background-image: url("./images/bg_header.gif"); color: #FFFFFF; } @@ -59,17 +55,17 @@ hr.dashed { .forabg { background-color: #0076b1; - background-image: url("{T_THEME_PATH}/images/bg_list.gif"); + background-image: url("./images/bg_list.gif"); } .forumbg { background-color: #12A3EB; - background-image: url("{T_THEME_PATH}/images/bg_header.gif"); + background-image: url("./images/bg_header.gif"); } .panel { background-color: #ECF1F3; - color: #28313F; + color: #28313F; } .post:target .content { @@ -92,22 +88,6 @@ hr.dashed { background-color: #E7E8EA; } -span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left.png"); -} - -span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right.png"); -} - -span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left.png"); -} - -span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right.png"); -} - /* Horizontal lists ----------------------------------------*/ @@ -165,25 +145,30 @@ dl.details dd { /* Pagination ---------------------------------------- */ -.pagination span strong { - color: #FFFFFF; - background-color: #4692BF; - border-color: #4692BF; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited { +.pagination li a, .pagination li a:link, .pagination li a:visited { color: #5C758C; background-color: #ECEDEE; border-color: #B4BAC0; } -.pagination span a:hover { - border-color: #368AD2; - background-color: #368AD2; - color: #FFF; +.pagination li.ellipsis span { + background-color: transparent; + color: #000000; } -.pagination span a:active { +.pagination li.active span { + color: #FFFFFF; + background-color: #4692BF; + border-color: #4692BF; +} + +.pagination li a:hover, .pagination .active a:hover { + border-color: #368AD2; + background-color: #368AD2; + color: #FFFFFF; +} + +.pagination li a:active, .pagination li.active a:active { color: #5C758C; background-color: #ECEDEE; border-color: #B4BAC0; @@ -191,7 +176,7 @@ dl.details dd { /* Pagination in viewforum for multipage topics */ .row .pagination { - background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); + background-image: url("./images/icon_pages.gif"); } .row .pagination span a, li.pagination span a { @@ -298,7 +283,7 @@ a.topictitle:active { .postlink:visited { color: #5D8FBD; - border-bottom-color: #666666; + border-bottom-color: #5D8FBD; } .postlink:active { @@ -338,18 +323,18 @@ a.topictitle:active { /* Back to top of page */ a.top { - background-image: url("{IMG_ICON_BACK_TOP_SRC}"); + background-image: url("./images/icon_back_top.gif"); } a.top2 { - background-image: url("{IMG_ICON_BACK_TOP_SRC}"); + background-image: url("./images/icon_back_top.gif"); } /* Arrow links */ -a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif") } -a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif") } -a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif") } -a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif") } +a.up { background-image: url("./images/arrow_up.gif") } +a.down { background-image: url("./images/arrow_down.gif") } +a.left { background-image: url("./images/arrow_left.gif") } +a.right { background-image: url("./images/arrow_right.gif") } a.up:hover { background-color: transparent; @@ -371,7 +356,7 @@ Colours and backgrounds for content.css ul.forums { background-color: #eef5f9; - background-image: url("{T_THEME_PATH}/images/gradient.gif"); + background-image: url("./images/gradient.gif"); } ul.topiclist li { @@ -388,11 +373,11 @@ ul.topiclist dd { } ul.topiclist li.row dt a.subforum.read { - background-image: url("{IMG_SUBFORUM_READ_SRC}"); + background-image: url("./images/subforum_read.gif"); } ul.topiclist li.row dt a.subforum.unread { - background-image: url("{IMG_SUBFORUM_UNREAD_SRC}"); + background-image: url("./images/subforum_unread.gif"); } li.row { @@ -452,6 +437,10 @@ dl.faq dt { color: #BC2A4D; } +.announce, .unreadpost { + /* Highlight the announcements & unread posts box */ +} + /* Post signature */ .signature { border-top-color: #CCCCCC; @@ -467,12 +456,12 @@ dl.faq dt { /* Quote block */ blockquote { background-color: #EBEADD; - background-image: url("{T_THEME_PATH}/images/quote.gif"); + background-image: url("./images/quote.gif"); border-color:#DBDBCE; } .rtl blockquote { - background-image: url("{T_THEME_PATH}/images/quote_rtl.gif"); + background-image: url("./images/quote_rtl.gif"); } blockquote blockquote { @@ -652,7 +641,7 @@ fieldset.polls dd div { } .online { - background-image: url("{IMG_ICON_USER_ONLINE_SRC}"); + background-image: url("./en/icon_user_online.gif"); } /* @@ -661,111 +650,107 @@ Colours and backgrounds for buttons.css -------------------------------------------------------------- */ /* Big button images */ -.reply-icon span { background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); } -.post-icon span { background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}"); } -.locked-icon span { background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); } -.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;} -.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;} -.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;} +.reply-icon span { background-image: url("./en/button_topic_reply.gif"); } +.post-icon span { background-image: url("./en/button_topic_new.gif"); } +.locked-icon span { background-image: url("./en/button_topic_locked.gif"); } +.pmreply-icon span { background-image: url("./en/button_pm_reply.gif") ;} +.newpm-icon span { background-image: url("./en/button_pm_new.gif") ;} +.forwardpm-icon span { background-image: url("./en/button_pm_forward.gif") ;} a.print { - background-image: url("{T_THEME_PATH}/images/icon_print.gif"); + background-image: url("./images/icon_print.gif"); } a.sendemail { - background-image: url("{T_THEME_PATH}/images/icon_sendemail.gif"); -} - -a.fontsize { - background-image: url("{T_THEME_PATH}/images/icon_fontsize.gif"); + background-image: url("./images/icon_sendemail.gif"); } /* Icon images ---------------------------------------- */ -.sitehome { background-image: url("{T_THEME_PATH}/images/icon_home.gif"); } -.icon-faq { background-image: url("{T_THEME_PATH}/images/icon_faq.gif"); } -.icon-members { background-image: url("{T_THEME_PATH}/images/icon_members.gif"); } -.icon-home { background-image: url("{T_THEME_PATH}/images/icon_home.gif"); } -.icon-ucp { background-image: url("{T_THEME_PATH}/images/icon_ucp.gif"); } -.icon-register { background-image: url("{T_THEME_PATH}/images/icon_register.gif"); } -.icon-logout { background-image: url("{T_THEME_PATH}/images/icon_logout.gif"); } -.icon-bookmark { background-image: url("{T_THEME_PATH}/images/icon_bookmark.gif"); } -.icon-bump { background-image: url("{T_THEME_PATH}/images/icon_bump.gif"); } -.icon-subscribe { background-image: url("{T_THEME_PATH}/images/icon_subscribe.gif"); } -.icon-unsubscribe { background-image: url("{T_THEME_PATH}/images/icon_unsubscribe.gif"); } -.icon-pages { background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); } -.icon-search { background-image: url("{T_THEME_PATH}/images/icon_search.gif"); } +.sitehome { background-image: url("./images/icon_home.gif"); } +.icon-faq { background-image: url("./images/icon_faq.gif"); } +.icon-members { background-image: url("./images/icon_members.gif"); } +.icon-home { background-image: url("./images/icon_home.gif"); } +.icon-ucp { background-image: url("./images/icon_ucp.gif"); } +.icon-register { background-image: url("./images/icon_register.gif"); } +.icon-logout { background-image: url("./images/icon_logout.gif"); } +.icon-bookmark { background-image: url("./images/icon_bookmark.gif"); } +.icon-bump { background-image: url("./images/icon_bump.gif"); } +.icon-subscribe { background-image: url("./images/icon_subscribe.gif"); } +.icon-unsubscribe { background-image: url("./images/icon_unsubscribe.gif"); } +.icon-pages { background-image: url("./images/icon_pages.gif"); } +.icon-search { background-image: url("./images/icon_search.gif"); } /* Profile & navigation icons */ -.email-icon, .email-icon a { background-image: url("{IMG_ICON_CONTACT_EMAIL_SRC}"); } -.aim-icon, .aim-icon a { background-image: url("{IMG_ICON_CONTACT_AIM_SRC}"); } -.yahoo-icon, .yahoo-icon a { background-image: url("{IMG_ICON_CONTACT_YAHOO_SRC}"); } -.web-icon, .web-icon a { background-image: url("{IMG_ICON_CONTACT_WWW_SRC}"); } -.msnm-icon, .msnm-icon a { background-image: url("{IMG_ICON_CONTACT_MSNM_SRC}"); } -.icq-icon, .icq-icon a { background-image: url("{IMG_ICON_CONTACT_ICQ_SRC}"); } -.jabber-icon, .jabber-icon a { background-image: url("{IMG_ICON_CONTACT_JABBER_SRC}"); } -.pm-icon, .pm-icon a { background-image: url("{IMG_ICON_CONTACT_PM_SRC}"); } -.quote-icon, .quote-icon a { background-image: url("{IMG_ICON_POST_QUOTE_SRC}"); } +.email-icon, .email-icon a { background-image: url("./images/icon_contact_email.gif"); } +.aim-icon, .aim-icon a { background-image: url("./images/icon_contact_aim.gif"); } +.yahoo-icon, .yahoo-icon a { background-image: url("./images/icon_contact_yahoo.gif"); } +.web-icon, .web-icon a { background-image: url("./images/icon_contact_www.gif"); } +.msnm-icon, .msnm-icon a { background-image: url("./images/icon_contact_msnm.gif"); } +.icq-icon, .icq-icon a { background-image: url("./images/icon_contact_icq.gif"); } +.jabber-icon, .jabber-icon a { background-image: url("./images/icon_contact_jabber.gif"); } +.pm-icon, .pm-icon a { background-image: url("./en/icon_contact_pm.gif"); } +.quote-icon, .quote-icon a { background-image: url("./en/icon_post_quote.gif"); } /* Moderator icons */ -.report-icon, .report-icon a { background-image: url("{IMG_ICON_POST_REPORT_SRC}"); } -.edit-icon, .edit-icon a { background-image: url("{IMG_ICON_POST_EDIT_SRC}"); } -.delete-icon, .delete-icon a { background-image: url("{IMG_ICON_POST_DELETE_SRC}"); } -.info-icon, .info-icon a { background-image: url("{IMG_ICON_POST_INFO_SRC}"); } -.warn-icon, .warn-icon a { background-image: url("{IMG_ICON_USER_WARN_SRC}"); } /* Need updated warn icon */ +.report-icon, .report-icon a { background-image: url("./images/icon_post_report.gif"); } +.edit-icon, .edit-icon a { background-image: url("./en/icon_post_edit.gif"); } +.delete-icon, .delete-icon a { background-image: url("./images/icon_post_delete.gif"); } +.info-icon, .info-icon a { background-image: url("./images/icon_post_info.gif"); } +.warn-icon, .warn-icon a { background-image: url("./images/icon_user_warn.gif"); } /* Need updated warn icon */ /* Forum icons & Topic icons */ -.global_read { background-image: url("{IMG_GLOBAL_READ_SRC}"); } -.global_read_mine { background-image: url("{IMG_GLOBAL_READ_MINE_SRC}"); } -.global_read_locked { background-image: url("{IMG_GLOBAL_READ_LOCKED_SRC}"); } -.global_read_locked_mine { background-image: url("{IMG_GLOBAL_READ_LOCKED_MINE_SRC}"); } -.global_unread { background-image: url("{IMG_GLOBAL_UNREAD_SRC}"); } -.global_unread_mine { background-image: url("{IMG_GLOBAL_UNREAD_MINE_SRC}"); } -.global_unread_locked { background-image: url("{IMG_GLOBAL_UNREAD_LOCKED_SRC}"); } -.global_unread_locked_mine { background-image: url("{IMG_GLOBAL_UNREAD_LOCKED_MINE_SRC}"); } +.global_read { background-image: url("./images/announce_read.gif"); } +.global_read_mine { background-image: url("./images/announce_read_mine.gif"); } +.global_read_locked { background-image: url("./images/announce_read_locked.gif"); } +.global_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } +.global_unread { background-image: url("./images/announce_unread.gif"); } +.global_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } +.global_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } +.global_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } -.announce_read { background-image: url("{IMG_ANNOUNCE_READ_SRC}"); } -.announce_read_mine { background-image: url("{IMG_ANNOUNCE_READ_MINE_SRC}"); } -.announce_read_locked { background-image: url("{IMG_ANNOUNCE_READ_LOCKED_SRC}"); } -.announce_read_locked_mine { background-image: url("{IMG_ANNOUNCE_READ_LOCKED_MINE_SRC}"); } -.announce_unread { background-image: url("{IMG_ANNOUNCE_UNREAD_SRC}"); } -.announce_unread_mine { background-image: url("{IMG_ANNOUNCE_UNREAD_MINE_SRC}"); } -.announce_unread_locked { background-image: url("{IMG_ANNOUNCE_UNREAD_LOCKED_SRC}"); } -.announce_unread_locked_mine { background-image: url("{IMG_ANNOUNCE_UNREAD_LOCKED_MINE_SRC}"); } +.announce_read { background-image: url("./images/announce_read.gif"); } +.announce_read_mine { background-image: url("./images/announce_read_mine.gif"); } +.announce_read_locked { background-image: url("./images/announce_read_locked.gif"); } +.announce_read_locked_mine { background-image: url("./images/announce_read_locked_mine.gif"); } +.announce_unread { background-image: url("./images/announce_unread.gif"); } +.announce_unread_mine { background-image: url("./images/announce_unread_mine.gif"); } +.announce_unread_locked { background-image: url("./images/announce_unread_locked.gif"); } +.announce_unread_locked_mine { background-image: url("./images/announce_unread_locked_mine.gif"); } -.forum_link { background-image: url("{IMG_FORUM_LINK_SRC}"); } -.forum_read { background-image: url("{IMG_FORUM_READ_SRC}"); } -.forum_read_locked { background-image: url("{IMG_FORUM_READ_LOCKED_SRC}"); } -.forum_read_subforum { background-image: url("{IMG_FORUM_READ_SUBFORUM_SRC}"); } -.forum_unread { background-image: url("{IMG_FORUM_UNREAD_SRC}"); } -.forum_unread_locked { background-image: url("{IMG_FORUM_UNREAD_LOCKED_SRC}"); } -.forum_unread_subforum { background-image: url("{IMG_FORUM_UNREAD_SUBFORUM_SRC}"); } +.forum_link { background-image: url("./images/forum_link.gif"); } +.forum_read { background-image: url("./images/forum_read.gif"); } +.forum_read_locked { background-image: url("./images/forum_read_locked.gif"); } +.forum_read_subforum { background-image: url("./images/forum_read_subforum.gif"); } +.forum_unread { background-image: url("./images/forum_unread.gif"); } +.forum_unread_locked { background-image: url("./images/forum_unread_locked.gif"); } +.forum_unread_subforum { background-image: url("./images/forum_unread_subforum.gif"); } -.sticky_read { background-image: url("{IMG_STICKY_READ_SRC}"); } -.sticky_read_mine { background-image: url("{IMG_STICKY_READ_MINE_SRC}"); } -.sticky_read_locked { background-image: url("{IMG_STICKY_READ_LOCKED_SRC}"); } -.sticky_read_locked_mine { background-image: url("{IMG_STICKY_READ_LOCKED_MINE_SRC}"); } -.sticky_unread { background-image: url("{IMG_STICKY_UNREAD_SRC}"); } -.sticky_unread_mine { background-image: url("{IMG_STICKY_UNREAD_MINE_SRC}"); } -.sticky_unread_locked { background-image: url("{IMG_STICKY_UNREAD_LOCKED_SRC}"); } -.sticky_unread_locked_mine { background-image: url("{IMG_STICKY_UNREAD_LOCKED_MINE_SRC}"); } +.sticky_read { background-image: url("./images/sticky_read.gif"); } +.sticky_read_mine { background-image: url("./images/sticky_read_mine.gif"); } +.sticky_read_locked { background-image: url("./images/sticky_read_locked.gif"); } +.sticky_read_locked_mine { background-image: url("./images/sticky_read_locked_mine.gif"); } +.sticky_unread { background-image: url("./images/sticky_unread.gif"); } +.sticky_unread_mine { background-image: url("./images/sticky_unread_mine.gif"); } +.sticky_unread_locked { background-image: url("./images/sticky_unread_locked.gif"); } +.sticky_unread_locked_mine { background-image: url("./images/sticky_unread_locked_mine.gif"); } -.topic_moved { background-image: url("{IMG_TOPIC_MOVED_SRC}"); } -.topic_read { background-image: url("{IMG_TOPIC_READ_SRC}"); } -.topic_read_mine { background-image: url("{IMG_TOPIC_READ_MINE_SRC}"); } -.topic_read_hot { background-image: url("{IMG_TOPIC_READ_HOT_SRC}"); } -.topic_read_hot_mine { background-image: url("{IMG_TOPIC_READ_HOT_MINE_SRC}"); } -.topic_read_locked { background-image: url("{IMG_TOPIC_READ_LOCKED_SRC}"); } -.topic_read_locked_mine { background-image: url("{IMG_TOPIC_READ_LOCKED_MINE_SRC}"); } -.topic_unread { background-image: url("{IMG_TOPIC_UNREAD_SRC}"); } -.topic_unread_mine { background-image: url("{IMG_TOPIC_UNREAD_MINE_SRC}"); } -.topic_unread_hot { background-image: url("{IMG_TOPIC_UNREAD_HOT_SRC}"); } -.topic_unread_hot_mine { background-image: url("{IMG_TOPIC_UNREAD_HOT_MINE_SRC}"); } -.topic_unread_locked { background-image: url("{IMG_TOPIC_UNREAD_LOCKED_SRC}"); } -.topic_unread_locked_mine { background-image: url("{IMG_TOPIC_UNREAD_LOCKED_MINE_SRC}"); } +.topic_moved { background-image: url("./images/topic_moved.gif"); } +.topic_read { background-image: url("./images/topic_read.gif"); } +.topic_read_mine { background-image: url("./images/topic_read_mine.gif"); } +.topic_read_hot { background-image: url("./images/topic_read_hot.gif"); } +.topic_read_hot_mine { background-image: url("./images/topic_read_hot_mine.gif"); } +.topic_read_locked { background-image: url("./images/topic_read_locked.gif"); } +.topic_read_locked_mine { background-image: url("./images/topic_read_locked_mine.gif"); } +.topic_unread { background-image: url("./images/topic_unread.gif"); } +.topic_unread_mine { background-image: url("./images/topic_unread_mine.gif"); } +.topic_unread_hot { background-image: url("./images/topic_unread_hot.gif"); } +.topic_unread_hot_mine { background-image: url("./images/topic_unread_hot_mine.gif"); } +.topic_unread_locked { background-image: url("./images/topic_unread_locked.gif"); } +.topic_unread_locked_mine { background-image: url("./images/topic_unread_locked_mine.gif"); } -.pm_read { background-image: url("{IMG_TOPIC_READ_SRC}"); } -.pm_unread { background-image: url("{IMG_TOPIC_UNREAD_SRC}"); } +.pm_read { background-image: url("./images/topic_read.gif"); } +.pm_unread { background-image: url("./images/topic_unread.gif"); } /* -------------------------------------------------------------- @@ -805,11 +790,11 @@ ul.cplist { /* CP tabbed menu ----------------------------------------*/ #tabs a { - background-image: url("{T_THEME_PATH}/images/bg_tabs1.gif"); + background-image: url("./images/bg_tabs1.gif"); } #tabs a span { - background-image: url("{T_THEME_PATH}/images/bg_tabs2.gif"); + background-image: url("./images/bg_tabs2.gif"); color: #536482; } @@ -850,11 +835,11 @@ ul.cplist { #navigation a { color: #333; background-color: #B2C2CF; - background-image: url("{T_THEME_PATH}/images/bg_menu.gif"); + background-image: url("./images/bg_menu.gif"); } .rtl #navigation a { - background-image: url("{T_THEME_PATH}/images/bg_menu_rtl.gif"); + background-image: url("./images/bg_menu_rtl.gif"); background-position: 0 100%; } @@ -888,39 +873,6 @@ ul.cplist { background-color: #FFFFFF; } -#cp-main span.corners-top, #cp-menu span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left2.gif"); -} - -#cp-main span.corners-top span, #cp-menu span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right2.gif"); -} - -#cp-main span.corners-bottom, #cp-menu span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left2.gif"); -} - -#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right2.gif"); -} - -/* Topicreview */ -#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left.gif"); -} - -#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right.gif"); -} - -#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left.gif"); -} - -#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right.gif"); -} - /* Friends list */ .cp-mini { background-color: #eef5f9; @@ -937,12 +889,6 @@ dl.mini dt { color: #000000 !important; } -/* PM panel adjustments */ -.pm-panel-header, -#cp-main .pm-message-nav { - border-bottom-color: #A4B3BF; -} - /* PM marking colours */ .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { border-left-color: #BC2A4D; @@ -967,7 +913,7 @@ dl.mini dt { /* Avatar gallery */ #gallery label { - background-color: #FFFFFF; + background: #FFFFFF; border-color: #CCC; } @@ -1002,6 +948,10 @@ dd label { color: #333; } +fieldset.fields1 { + background-color: transparent; +} + /* Hover effects */ fieldset dl:hover dt label { color: #000000; @@ -1046,7 +996,7 @@ fieldset.quick-login input.inputbox { a.button1, input.button1, input.button3, a.button2, input.button2 { color: #000; background-color: #FAFAFA; - background-image: url("{T_THEME_PATH}/images/bg_button.gif"); + background-image: url("./images/bg_button.gif"); } a.button1, input.button1 { @@ -1074,9 +1024,23 @@ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, inpu } input.search { - background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif"); + background-image: url("./images/icon_textbox_search.gif"); } input.disabled { color: #666666; } + +/* jQuery popups +---------------------------------------- */ +.phpbb_alert { + background-color: #FFFFFF; + border-color: #999999; +} +.phpbb_alert .alert_close { + background-image: url("./images/alert_close.png"); +} +#darken { + background-color: #000000; +} + diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a86f723f81..50b22f44df 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1,12 +1,51 @@ -/* General proSilver Markup Styles +/* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 ---------------------------------------- */ - -* { - /* Reset browsers default margin, padding and font sizes */ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { margin: 0; padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; } +/* General Markup Styles +---------------------------------------- */ html { font-size: 100%; /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ @@ -16,10 +55,9 @@ html { body { /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ font-family: Verdana, Helvetica, Arial, sans-serif; - color: #828282; - background-color: #FFFFFF; /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */ font-size: 10px; + line-height: normal; margin: 0; padding: 12px 0; } @@ -28,7 +66,6 @@ h1 { /* Forum name */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; margin-right: 200px; - color: #FFFFFF; margin-top: 15px; font-weight: bold; font-size: 2em; @@ -38,7 +75,6 @@ h2 { /* Forum header titles */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-weight: normal; - color: #3f3f3f; font-size: 2em; margin: 0.8em 0 0.2em 0; } @@ -52,11 +88,10 @@ h3 { font-family: Arial, Helvetica, sans-serif; font-weight: bold; text-transform: uppercase; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid transparent; margin-bottom: 3px; padding-bottom: 2px; font-size: 1.05em; - color: #989898; margin-top: 20px; } @@ -78,8 +113,8 @@ img { hr { /* Also see tweaks.css */ - border: 0 none #FFFFFF; - border-top: 1px solid #CCCCCC; + border: 0 solid transparent; + border-top-width: 1px; height: 1px; margin: 5px 0; display: block; @@ -87,7 +122,7 @@ hr { } hr.dashed { - border-top: 1px dashed #CCCCCC; + border-top-style: dashed; margin: 10px 0; } @@ -99,6 +134,39 @@ p.right { text-align: right; } +b, strong { + font-weight: bold; +} + +i, em { + font-style: italic; +} + +u { + text-decoration: underline; +} + +ul { + list-style-type: disc; +} + +ol { + list-style-type: decimal; +} + +li { + display: list-item; +} + +ul ul, ol ul { + list-style-type: circle; +} + +ol ol ul, ol ul ul, ul ol ul, ul ul ul { + list-style-type: square; +} + + /* Main blocks ---------------------------------------- */ #wrap { @@ -136,7 +204,6 @@ a#logo:hover { /* Search box --------------------------------------------- */ #search-box { - color: #FFFFFF; position: relative; margin-top: 30px; margin-right: 5px; @@ -148,11 +215,10 @@ a#logo:hover { #search-box #keywords { width: 95px; - background-color: #FFF; } #search-box input { - border: 1px solid #b0b0b0; + border: 1px solid transparent; } /* .button1 style defined later, just a few tweaks for the search button version */ @@ -183,122 +249,69 @@ a#logo:hover { /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - background: #ebebeb none repeat-x 0 0; - color: #FFFFFF; + background: transparent none repeat-x 0 0; margin-bottom: 4px; - padding: 0 5px; + padding: 5px; + border-radius: 7px; } .navbar { - background-color: #ebebeb; padding: 0 10px; + padding: 5px 10px 5px 10px; + border-radius: 7px; } .forabg { - background: #b1b1b1 none repeat-x 0 0; + background: transparent none repeat-x 0 0; margin-bottom: 4px; - padding: 0 5px; + padding: 5px; clear: both; + border-radius: 7px; } .forumbg { - background: #ebebeb none repeat-x 0 0; + background: transparent none repeat-x 0 0; margin-bottom: 4px; - padding: 0 5px; + padding: 5px; clear: both; + border-radius: 7px; } .panel { margin-bottom: 4px; - padding: 0 10px; - background-color: #f3f3f3; - color: #3f3f3f; + padding: 5px 10px; + border-radius: 7px; } .post { - padding: 0 10px; + padding: 5px 10px; margin-bottom: 4px; background-repeat: no-repeat; background-position: 100% 0; + border-radius: 7px; } -.post:target .content { - color: #000000; +.inner:after { + content: ''; + clear: both; + display: block; } -.post:target h3 a { - color: #000000; -} - -.bg1 { background-color: #f7f7f7;} -.bg2 { background-color: #f2f2f2; } -.bg3 { background-color: #ebebeb; } - .rowbg { margin: 5px 5px 2px 5px; } -.ucprowbg { - background-color: #e2e2e2; -} - -.fieldsbg { - /*border: 1px #DBDEE2 solid;*/ - background-color: #eaeaea; -} - -span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { - font-size: 1px; - line-height: 1px; - display: block; - height: 5px; - background-repeat: no-repeat; -} - -span.corners-top { - background-image: none; - background-position: 0 0; - margin: 0 -5px; -} - -span.corners-top span { - background-image: none; - background-position: 100% 0; -} - -span.corners-bottom { - background-image: none; - background-position: 0 100%; - margin: 0 -5px; - clear: both; -} - -span.corners-bottom span { - background-image: none; - background-position: 100% 100%; -} - -.headbg span.corners-bottom { - margin-bottom: -1px; -} - -.post span.corners-top, .post span.corners-bottom, .panel span.corners-top, .panel span.corners-bottom, .navbar span.corners-top, .navbar span.corners-bottom { - margin: 0 -10px; -} - -.rules span.corners-top { - margin: 0 -10px 5px -10px; -} - -.rules span.corners-bottom { - margin: 5px -10px 0 -10px; -} - /* Horizontal lists ----------------------------------------*/ ul.linklist { display: block; margin: 0; + height: 4%; + overflow: hidden; +} + +#cp-main .panel { + padding: 5px 10px; } ul.linklist li { @@ -321,7 +334,7 @@ ul.linklist li.rightside, p.rightside { ul.navlinks { padding-bottom: 1px; margin-bottom: 1px; - border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid transparent; font-weight: bold; } @@ -342,7 +355,7 @@ ul.rightside { /* Table styles ----------------------------------------*/ table.table1 { - /* See tweaks.css */ + width: 100%; } #ucp-main table.table1 { @@ -352,7 +365,6 @@ table.table1 { table.table1 thead th { font-weight: normal; text-transform: uppercase; - color: #FFFFFF; line-height: 1.3em; font-size: 1em; padding: 0 0 4px 3px; @@ -363,30 +375,22 @@ table.table1 thead th span { } table.table1 tbody tr { - border: 1px solid #cfcfcf; -} - -table.table1 tbody tr:hover, table.table1 tbody tr.hover { - background-color: #f6f6f6; - color: #000; + border: 1px solid transparent; } table.table1 td { - color: #6a6a6a; font-size: 1.1em; } table.table1 tbody td { padding: 5px; - border-top: 1px solid #FAFAFA; + border-top: 1px solid transparent; } table.table1 tbody th { padding: 5px; - border-bottom: 1px solid #000000; + border-bottom: 1px solid transparent; text-align: left; - color: #333333; - background-color: #FFFFFF; } /* Specific column styles */ @@ -413,17 +417,20 @@ table.info tbody th { padding: 3px; text-align: right; vertical-align: top; - color: #000000; font-weight: normal; } .forumbg table.table1 { - margin: 0 -2px -1px -1px; + margin: 0; +} + +.forumbg-table > .inner { + margin: 0 -1px; } /* Misc layout styles ---------------------------------------- */ -/* column[1-2] styles are containers for two column layouts +/* column[1-2] styles are containers for two column layouts Also see tweaks.css */ .column1 { float: left; @@ -460,7 +467,6 @@ dl.details dt { clear: left; width: 30%; text-align: right; - color: #000000; display: block; } @@ -468,11 +474,16 @@ dl.details dd { margin-left: 0; padding-left: 5px; margin-bottom: 5px; - color: #828282; float: left; width: 65%; } +.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls { + height: 1%; + overflow: hidden; +} + + /* Pagination ---------------------------------------- */ .pagination { @@ -483,68 +494,99 @@ dl.details dd { float: right; } -.pagination span.page-sep { - display: none; -} - li.pagination { margin-top: 0; } -.pagination strong, .pagination b { - font-weight: normal; -} - -.pagination span strong { - padding: 0 2px; - margin: 0 2px; - font-weight: normal; - color: #FFFFFF; - background-color: #bfbfbf; - border: 1px solid #bfbfbf; - font-size: 0.9em; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { - font-weight: normal; - text-decoration: none; - color: #747474; - margin: 0 2px; - padding: 0 2px; - background-color: #eeeeee; - border: 1px solid #bababa; - font-size: 0.9em; - line-height: 1.5em; -} - -.pagination span a:hover { - border-color: #d2d2d2; - background-color: #d2d2d2; - color: #FFF; - text-decoration: none; -} - .pagination img { vertical-align: middle; } +.pagination ul { + display: inline-block; + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; + margin-left: 0; + margin-bottom: 0; +} + +li.pagination ul { + margin-top: -2px; + vertical-align: middle; +} + +.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li { + display: inline; + padding: 0; + font-size: 100%; + line-height: normal; +} + +.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span { + font-weight: normal; + text-decoration: none; + padding: 0 2px; + border: 1px solid transparent; + font-size: 0.9em; + line-height: 1.5em; +} + /* Pagination in viewforum for multipage topics */ .row .pagination { display: block; float: right; width: auto; margin-top: 0; - padding: 1px 0 1px 15px; + padding: 1px 0 1px 8px; font-size: 0.9em; background: none 0 50% no-repeat; } -.row .pagination span a, li.pagination span a { - background-color: #FFFFFF; +/* jQuery popups +---------------------------------------- */ +.phpbb_alert { + border: 1px solid transparent; + position: fixed; + display: none; + top: 40%; + left: 35%; + width: 30%; + z-index: 50; + padding: 25px; + padding: 0 25px 20px 25px; } -.row .pagination span a:hover, li.pagination span a:hover { - background-color: #d2d2d2; +.phpbb_alert .alert_close { + display: block; + float: right; + width: 16px; + height: 16px; + overflow: hidden; + text-decoration: none !important; + background: transparent none 0 0 no-repeat; + margin-top: -7px; + margin-right: -31px; +} +.phpbb_alert .alert_close:hover { + background-position: 0 -16px; +} + +.phpbb_alert p { + margin: 8px 0; + padding-bottom: 8px; +} + +#darkenwrapper { + display: none; +} + +#darken { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + opacity: 0.5; } /* Miscellaneous styles @@ -561,7 +603,6 @@ li.pagination { .copyright { padding: 5px; text-align: center; - color: #555555; } .small { @@ -577,25 +618,15 @@ li.pagination { } .error { - color: #bcbcbc; font-weight: bold; font-size: 1em; } -.reported { - background-color: #f7f7f7; -} - -li.reported:hover { - background-color: #ececec; -} - div.rules { - background-color: #ececec; - color: #bcbcbc; - padding: 0 10px; margin: 10px 0; font-size: 1.1em; + padding: 5px 10px; + border-radius: 7px; } div.rules ul, div.rules ol { @@ -603,13 +634,16 @@ div.rules ul, div.rules ol { } p.rules { - background-color: #ececec; background-image: none; padding: 5px; } p.rules img { vertical-align: middle; +} + +p.rules strong { + vertical-align: middle; padding-top: 5px; } @@ -630,3 +664,11 @@ p.rules a { line-height: 1px; background: transparent; } + +.hidden { + display: none; +} + +.smilies { + vertical-align: text-bottom; +} diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 955a4a79c0..b6012f8a63 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -1,4 +1,4 @@ -/* proSilver Content Styles +/* Content Styles ---------------------------------------- */ ul.topiclist { @@ -8,13 +8,12 @@ ul.topiclist { } ul.forums { - background: #f9f9f9 none repeat-x 0 0; + background: transparent none repeat-x 0 0; } ul.topiclist li { display: block; list-style-type: none; - color: #777777; margin: 0; } @@ -38,7 +37,7 @@ ul.topiclist dt { ul.topiclist dd { display: block; float: left; - border-left: 1px solid #FFFFFF; + border-left: 1px solid transparent; padding: 4px 0; } @@ -65,28 +64,18 @@ ul.topiclist li.row dt a.subforum { } li.row { - border-top: 1px solid #FFFFFF; - border-bottom: 1px solid #8f8f8f; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; } li.row strong { font-weight: normal; - color: #000000; -} - -li.row:hover { - background-color: #f6f6f6; -} - -li.row:hover dd { - border-left-color: #CCCCCC; } li.header dt, li.header dd { line-height: 1em; border-left-width: 0; margin: 2px 0 4px 0; - color: #FFFFFF; padding-top: 2px; padding-bottom: 2px; font-size: 1em; @@ -205,7 +194,6 @@ ul.topiclist dd.searchextra { margin-left: 5px; padding: 0.2em 0; font-size: 1.1em; - color: #333333; border-left: none; clear: both; width: 98%; @@ -228,7 +216,6 @@ div[class].topic-actions { .postbody { padding: 0; line-height: 1.48em; - color: #333333; width: 76%; float: left; clear: both; @@ -320,14 +307,12 @@ div[class].topic-actions { line-height: 1.4em; font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; font-size: 1em; - color: #333333; padding-bottom: 1px; } .content h2, .panel h2 { font-weight: normal; - color: #989898; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid transparent; font-size: 1.6em; margin-top: 0.5em; margin-bottom: 0.5em; @@ -351,6 +336,10 @@ div[class].topic-actions { line-height: 1.4em; } +span.corners-top, span.corners-bottom { + display: none; +} + dl.faq { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; font-size: 1.1em; @@ -361,7 +350,6 @@ dl.faq { dl.faq dt { font-weight: bold; - color: #333333; } .content dl.faq { @@ -379,17 +367,9 @@ dl.faq dt { } .posthilit { - background-color: #f3f3f3; - color: #BCBCBC; padding: 0 2px 1px 2px; } -.announce, .unreadpost { - /* Highlight the announcements & unread posts box */ - border-left-color: #BCBCBC; - border-right-color: #BCBCBC; -} - /* Post author */ p.author { margin: 0 15em 0.6em 0; @@ -404,7 +384,7 @@ p.author { margin-top: 1.5em; padding-top: 0.2em; font-size: 1.1em; - border-top: 1px solid #CCCCCC; + border-top: 1px solid transparent; clear: left; line-height: 140%; overflow: hidden; @@ -434,7 +414,7 @@ dd .signature { margin-top: 1.5em; padding-top: 0.2em; font-size: 1em; - border-top: 1px dashed #CCCCCC; + border-top: 1px dashed transparent; clear: left; line-height: 130%; } @@ -450,8 +430,8 @@ ul.searchresults { ----------------------------------------*/ /* Quote block */ blockquote { - background: #ebebeb none 6px 8px no-repeat; - border: 1px solid #dbdbdb; + background: transparent none 6px 8px no-repeat; + border: 1px solid transparent; font-size: 0.95em; margin: 0.5em 1px 0 25px; overflow: hidden; @@ -460,16 +440,10 @@ blockquote { blockquote blockquote { /* Nested quotes */ - background-color: #bababa; font-size: 1em; margin: 0.5em 1px 0 15px; } -blockquote blockquote blockquote { - /* Nested quotes */ - background-color: #e4e4e4; -} - blockquote cite { /* Username/source of quoter */ font-style: normal; @@ -490,14 +464,13 @@ blockquote.uncited { /* Code block */ dl.codebox { padding: 3px; - background-color: #FFFFFF; - border: 1px solid #d8d8d8; + border: 1px solid transparent; font-size: 1em; } dl.codebox dt { text-transform: uppercase; - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid transparent; margin-bottom: 3px; font-size: 0.8em; font-weight: bold; @@ -518,17 +491,9 @@ dl.codebox code { padding-top: 5px; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono; line-height: 1.3em; - color: #8b8b8b; margin: 2px 0; } -.syntaxbg { color: #FFFFFF; } -.syntaxcomment { color: #000000; } -.syntaxdefault { color: #bcbcbc; } -.syntaxhtml { color: #000000; } -.syntaxkeyword { color: #585858; } -.syntaxstring { color: #a7a7a7; } - /* Attachments ----------------------------------------*/ .attachbox { @@ -536,15 +501,10 @@ dl.codebox code { width: auto; margin: 5px 5px 5px 0; padding: 6px; - background-color: #FFFFFF; - border: 1px dashed #d8d8d8; + border: 1px dashed transparent; clear: left; } -.pm-message .attachbox { - background-color: #f3f3f3; -} - .attachbox dt { font-family: Arial, Helvetica, sans-serif; text-transform: uppercase; @@ -554,7 +514,7 @@ dl.codebox code { margin-top: 4px; padding-top: 4px; clear: left; - border-top: 1px solid #d8d8d8; + border-top: 1px solid transparent; } .attachbox dd dd { @@ -563,7 +523,6 @@ dl.codebox code { .attachbox p { line-height: 110%; - color: #666666; font-weight: normal; clear: left; } @@ -571,7 +530,6 @@ dl.codebox code { .attachbox p.stats { line-height: 110%; - color: #666666; font-weight: normal; clear: left; } @@ -584,7 +542,7 @@ dl.codebox code { } .attach-image img { - border: 1px solid #999999; + border: 1px solid transparent; /* cursor: move; */ cursor: default; } @@ -613,19 +571,16 @@ dl.file dt { } dl.file dd { - color: #666666; margin: 0; padding: 0; } dl.thumbnail img { padding: 3px; - border: 1px solid #666666; - background-color: #FFF; + border: 1px solid transparent; } dl.thumbnail dd { - color: #666666; font-style: italic; font-family: Verdana, Arial, Helvetica, sans-serif; } @@ -634,12 +589,8 @@ dl.thumbnail dd { font-size: 100%; } -dl.thumbnail dt a:hover { - background-color: #EEEEEE; -} - dl.thumbnail dt a:hover img { - border: 1px solid #d2d2d2; + border: 1px solid transparent; } /* Post poll styles @@ -650,15 +601,13 @@ fieldset.polls { fieldset.polls dl { margin-top: 5px; - border-top: 1px solid #e2e2e2; + border-top: 1px solid transparent; padding: 5px 0 0 0; line-height: 120%; - color: #666666; } fieldset.polls dl.voted { font-weight: bold; - color: #000000; } fieldset.polls dt { @@ -692,41 +641,15 @@ fieldset.polls dd input { fieldset.polls dd div { text-align: right; font-family: Arial, Helvetica, sans-serif; - color: #FFFFFF; font-weight: bold; padding: 0 2px; overflow: visible; min-width: 2%; } -.pollbar1 { - background-color: #aaaaaa; - border-bottom: 1px solid #747474; - border-right: 1px solid #747474; -} - -.pollbar2 { - background-color: #bebebe; - border-bottom: 1px solid #8c8c8c; - border-right: 1px solid #8c8c8c; -} - -.pollbar3 { - background-color: #D1D1D1; - border-bottom: 1px solid #aaaaaa; - border-right: 1px solid #aaaaaa; -} - -.pollbar4 { - background-color: #e4e4e4; - border-bottom: 1px solid #bebebe; - border-right: 1px solid #bebebe; -} - -.pollbar5 { - background-color: #f8f8f8; - border-bottom: 1px solid #D1D1D1; - border-right: 1px solid #D1D1D1; +.pollbar1, .pollbar2, .pollbar3, .pollbar4, .pollbar5 { + border-bottom: 1px solid transparent; + border-right: 1px solid transparent; } /* Poster profile block @@ -735,15 +658,11 @@ fieldset.polls dd div { /* Also see tweaks.css */ margin: 5px 0 10px 0; min-height: 80px; - color: #666666; - border-left: 1px solid #FFFFFF; + border-left: 1px solid transparent; width: 22%; float: right; display: inline; } -.pm .postprofile { - border-left: 1px solid #DDDDDD; -} .postprofile dd, .postprofile dt { line-height: 1.2em; @@ -752,7 +671,6 @@ fieldset.polls dd div { .postprofile strong { font-weight: normal; - color: #000000; } .avatar { @@ -784,3 +702,26 @@ dl.pmlist dd { margin-left: 61% !important; margin-bottom: 2px; } + +.topic-actions div.dl_links { + padding: 10px 0 0 10px; +} + +div.dl_links { + display: inline-block; + text-transform: none; +} + +.dl_links strong { + font-weight: bold; +} + +.dl_links ul { + list-style-type: none; + margin: 0; + display: inline-block; +} + +.dl_links li { + display: inline-block; +} diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 1e0edc616f..da3ec1736e 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -1,4 +1,4 @@ -/* proSilver Control Panel Styles +/* Control Panel Styles ---------------------------------------- */ @@ -20,10 +20,6 @@ padding: 0; } -#cp-main h3, #cp-main hr, #cp-menu hr { - border-color: #bfbfbf; -} - #cp-main .panel p { font-size: 1.1em; } @@ -34,17 +30,16 @@ } #cp-main .panel li.row { - border-bottom: 1px solid #cbcbcb; - border-top: 1px solid #F9F9F9; + border-bottom: 1px solid transparent; + border-top: 1px solid transparent; } ul.cplist { margin-bottom: 5px; - border-top: 1px solid #cbcbcb; + border-top: 1px solid transparent; } #cp-main .panel li.header dd, #cp-main .panel li.header dt { - color: #000000; margin-bottom: 2px; } @@ -53,9 +48,8 @@ ul.cplist { } #cp-main table.table1 thead th { - color: #333333; font-weight: bold; - border-bottom: 1px solid #333333; + border-bottom: 1px solid transparent; padding: 5px; } @@ -76,9 +70,8 @@ ul.cplist { } #cp-main .pm-message { - border: 1px solid #e2e2e2; + border: 1px solid transparent; margin: 10px 0; - background-color: #FFFFFF; width: auto; float: none; } @@ -104,6 +97,22 @@ ul.cplist { width: 100%; } +.tabs-container h2 { + float: left; + margin-bottom: 0px; +} + +.tabs-container #minitabs { + float: right; + margin-top: 19px; +} + +.tabs-container:after { + display: block; + clear: both; + content: ''; +} + /* CP tabbed menu ----------------------------------------*/ #tabs { @@ -141,23 +150,17 @@ ul.cplist { display: block; background: none no-repeat 100% -35px; padding: 6px 10px 6px 5px; - color: #828282; white-space: nowrap; } -#tabs a:hover span { - color: #bcbcbc; -} - #tabs .activetab a { background-position: 0 0; - border-bottom: 1px solid #ebebeb; + border-bottom: 1px solid transparent; } #tabs .activetab a span { background-position: 100% 0; padding-bottom: 7px; - color: #333333; } #tabs a:hover { @@ -173,7 +176,6 @@ ul.cplist { } #tabs .activetab a:hover span { - color: #000000; background-position: 100% 0; } @@ -193,10 +195,11 @@ ul.cplist { #minitabs li { display: block; float: right; - padding: 0 10px 4px 10px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + padding: 5px 10px 4px 10px; font-size: 1em; font-weight: bold; - background-color: #f2f2f2; margin-left: 2px; } @@ -207,14 +210,6 @@ ul.cplist { text-decoration: none; } -#minitabs li.activetab { - background-color: #F9F9F9; -} - -#minitabs li.activetab a, #minitabs li.activetab a:hover { - color: #333333; -} - /* UCP navigation menu ----------------------------------------*/ /* Container for sub-navigation list */ @@ -242,92 +237,36 @@ ul.cplist { margin: 1px 0; text-decoration: none; font-weight: bold; - color: #333; - background: #cfcfcf none repeat-y 100% 0; + background: transparent none repeat-y 100% 0; } #navigation a:hover { text-decoration: none; - background-color: #c6c6c6; - color: #bcbcbc; background-image: none; } #navigation #active-subsection a { display: block; - color: #d3d3d3; - background-color: #F9F9F9; background-image: none; } -#navigation #active-subsection a:hover { - color: #d3d3d3; -} - /* Preferences pane layout ----------------------------------------*/ #cp-main h2 { border-bottom: none; padding: 0; margin-left: 10px; - color: #333333; -} - -#cp-main .panel { - background-color: #F9F9F9; -} - -#cp-main .pm { - background-color: #FFFFFF; -} - -#cp-main span.corners-top, #cp-menu span.corners-top { - background-image: none; -} - -#cp-main span.corners-top span, #cp-menu span.corners-top span { - background-image: none; -} - -#cp-main span.corners-bottom, #cp-menu span.corners-bottom { - background-image: none; -} - -#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span { - background-image: none; -} - -/* Topicreview */ -#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span { - background-image: none; } /* Friends list */ .cp-mini { - background-color: #f9f9f9; - padding: 0 5px; margin: 10px 15px 10px 5px; -} - -.cp-mini span.corners-top, .cp-mini span.corners-bottom { - margin: 0 -5px; + padding: 5px 10px; + border-radius: 7px; } dl.mini dt { font-weight: bold; - color: #676767; } dl.mini dd { @@ -349,36 +288,17 @@ dl.mini dd { } /* PM panel adjustments */ -.pm-panel-header { - margin: 0; - padding-bottom: 10px; - border-bottom: 1px dashed #A4B3BF; +.reply-all a.left { + background-position: 3px 60%; +} + +.reply-all a.left:hover { + background-position: 0px 60%; } .reply-all { - display: block; - padding-top: 4px; - clear: both; - float: left; -} - -.pm-panel-message { - padding-top: 10px; -} - -.pm-return-to { - padding-top: 23px; -} - -#cp-main .pm-message-nav { - margin: 0; - padding: 2px 10px 5px 10px; - border-bottom: 1px dashed #A4B3BF; -} - -/* PM Message history */ -.current { - color: #999999; + font-size: 11px; + padding-top: 5px; } /* Defined rules list for PM options */ @@ -393,37 +313,24 @@ ol.def-rules li { /* PM marking colours */ .pmlist li.bg1 { - border: solid 3px transparent; - border-width: 0 3px; + padding: 0 3px; } .pmlist li.bg2 { - border: solid 3px transparent; - border-width: 0 3px; + padding: 0 3px; } .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { - border-left-color: #bcbcbc; - border-right-color: #bcbcbc; -} - -.pmlist li.pm_marked_colour, .pm_marked_colour { - border: solid 3px #ffffff; - border-width: 0 3px; -} - -.pmlist li.pm_replied_colour, .pm_replied_colour { - border: solid 3px #c2c2c2; - border-width: 0 3px; -} - -.pmlist li.pm_friend_colour, .pm_friend_colour { - border: solid 3px #bdbdbd; - border-width: 0 3px; + border-left-color: transparent; + border-right-color: transparent; } +.pmlist li.pm_marked_colour, .pm_marked_colour, +.pmlist li.pm_replied_colour, .pm_replied_colour, +.pmlist li.pm_friend_colour, .pm_friend_colour, .pmlist li.pm_foe_colour, .pm_foe_colour { - border: solid 3px #000000; + padding: 0; + border: solid 3px transparent; border-width: 0 3px; } @@ -442,11 +349,6 @@ ol.def-rules li { margin: 10px; padding: 5px; width: auto; - background: #FFFFFF; - border: 1px solid #CCC; + border: 1px solid transparent; text-align: center; } - -#gallery label:hover { - background-color: #EEE; -} diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif b/phpBB/styles/prosilver/theme/en/button_pm_forward.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_pm_forward.gif rename to phpBB/styles/prosilver/theme/en/button_pm_forward.gif diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_new.gif b/phpBB/styles/prosilver/theme/en/button_pm_new.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_pm_new.gif rename to phpBB/styles/prosilver/theme/en/button_pm_new.gif diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif b/phpBB/styles/prosilver/theme/en/button_pm_reply.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_pm_reply.gif rename to phpBB/styles/prosilver/theme/en/button_pm_reply.gif diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif b/phpBB/styles/prosilver/theme/en/button_topic_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_topic_locked.gif rename to phpBB/styles/prosilver/theme/en/button_topic_locked.gif diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_new.gif b/phpBB/styles/prosilver/theme/en/button_topic_new.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_topic_new.gif rename to phpBB/styles/prosilver/theme/en/button_topic_new.gif diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif b/phpBB/styles/prosilver/theme/en/button_topic_reply.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/button_topic_reply.gif rename to phpBB/styles/prosilver/theme/en/button_topic_reply.gif diff --git a/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif b/phpBB/styles/prosilver/theme/en/icon_contact_pm.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif rename to phpBB/styles/prosilver/theme/en/icon_contact_pm.gif diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif b/phpBB/styles/prosilver/theme/en/icon_post_edit.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/icon_post_edit.gif rename to phpBB/styles/prosilver/theme/en/icon_post_edit.gif diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif b/phpBB/styles/prosilver/theme/en/icon_post_quote.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/icon_post_quote.gif rename to phpBB/styles/prosilver/theme/en/icon_post_quote.gif diff --git a/phpBB/styles/prosilver/imageset/en/icon_user_online.gif b/phpBB/styles/prosilver/theme/en/icon_user_online.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/en/icon_user_online.gif rename to phpBB/styles/prosilver/theme/en/icon_user_online.gif diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css new file mode 100644 index 0000000000..d17f9a5be4 --- /dev/null +++ b/phpBB/styles/prosilver/theme/en/stylesheet.css @@ -0,0 +1,80 @@ +/* Set big button dimensions */ +.buttons div.reply-icon { width: 96px; height: 25px; } +.buttons div.post-icon { width: 96px; height: 25px; } +.buttons div.locked-icon { width: 88px; height: 25px; } +.buttons div.pmreply-icon { width: 96px; height: 25px; } +.buttons div.newpm-icon { width: 84px; height: 25px; } +.buttons div.forwardpm-icon { width: 96px; height: 25px; } + +/* Set profile icon dimensions */ +ul.profile-icons li.pm-icon { width: 28px; height: 20px; } +ul.profile-icons li.quote-icon { width: 54px; height: 20px; } +ul.profile-icons li.edit-icon { width: 42px; height: 20px; } + +/* Online image */ +.online { background-image: url("./icon_user_online.gif"); } + +/* Big button images */ +.reply-icon span { background-image: url("./button_topic_reply.gif"); } +.post-icon span { background-image: url("./button_topic_new.gif"); } +.locked-icon span { background-image: url("./button_topic_locked.gif"); } +.pmreply-icon span { background-image: url("./button_pm_reply.gif") ;} +.newpm-icon span { background-image: url("./button_pm_new.gif") ;} +.forwardpm-icon span { background-image: url("./button_pm_forward.gif") ;} + +/* Icon images */ +.pm-icon, .pm-icon a { background-image: url("./icon_contact_pm.gif"); } +.quote-icon, .quote-icon a { background-image: url("./icon_post_quote.gif"); } +.edit-icon, .edit-icon a { background-image: url("./icon_post_edit.gif"); } + +/* EN Language Pack */ +.imageset.icon_contact_pm { + background-image: url("./icon_contact_pm.gif"); + padding-left: 28px; + padding-top: 20px; +} +.imageset.icon_post_edit { + background-image: url("./icon_post_edit.gif"); + padding-left: 42px; + padding-top: 20px; +} +.imageset.icon_post_quote { + background-image: url("./icon_post_quote.gif"); + padding-left: 54px; + padding-top: 20px; +} +.imageset.icon_user_online { + background-image: url("./icon_user_online.gif"); + padding-left: 58px; + padding-top: 58px; +} +.imageset.button_pm_forward { + background-image: url("./button_pm_forward.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_pm_new { + background-image: url("./button_pm_new.gif"); + padding-left: 84px; + padding-top: 25px; +} +.imageset.button_pm_reply { + background-image: url("./button_pm_reply.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_topic_locked { + background-image: url("./button_topic_locked.gif"); + padding-left: 88px; + padding-top: 25px; +} +.imageset.button_topic_new { + background-image: url("./button_topic_new.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_topic_reply { + background-image: url("./button_topic_reply.gif"); + padding-left: 96px; + padding-top: 25px; +} diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 4e48a93a55..8829211934 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -1,4 +1,4 @@ -/* proSilver Form Styles +/* Form Styles ---------------------------------------- */ /* General form styles @@ -23,17 +23,18 @@ select { font-weight: normal; cursor: pointer; vertical-align: middle; - border: 1px solid #666666; + border: 1px solid transparent; padding: 1px; - background-color: #FAFAFA; + font-size: 1em; } option { padding-right: 1em; } -option.disabled-option { - color: graytext; +select optgroup option { + padding-right: 1em; + font-family: Verdana, Helvetica, Arial, sans-serif; } textarea { @@ -47,7 +48,6 @@ textarea { label { cursor: default; padding-right: 5px; - color: #676767; } label input { @@ -88,10 +88,6 @@ fieldset.fields1 dd { border-left-width: 0; } -fieldset.fields1 { - background-color: transparent; -} - fieldset.fields1 div { margin-bottom: 3px; } @@ -120,7 +116,6 @@ dt label { dd label { white-space: nowrap; - color: #333; } dd input, dd textarea { @@ -136,22 +131,10 @@ dd textarea { } /* Hover effects */ -fieldset dl:hover dt label { - color: #000000; -} - -fieldset.fields2 dl:hover dt label { - color: inherit; -} - #timezone { width: 95%; } -* html #timezone { - width: 50%; -} - /* Quick-login on index page */ fieldset.quick-login { margin-top: 5px; @@ -165,7 +148,6 @@ fieldset.quick-login input.inputbox { width: 15%; vertical-align: middle; margin-right: 5px; - background-color: #f3f3f3; } fieldset.quick-login label { @@ -262,9 +244,11 @@ fieldset.submit-buttons input { #message-box textarea { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - width: 100%; + width: 450px; + height: 270px; + min-width: 100%; + max-width: 100%; font-size: 1.2em; - color: #333333; } /* Emoticons panel */ @@ -280,20 +264,13 @@ fieldset.submit-buttons input { /* Input field styles ---------------------------------------- */ .inputbox { - background-color: #FFFFFF; - border: 1px solid #c0c0c0; - color: #333333; + border: 1px solid transparent; padding: 2px; cursor: text; } -.inputbox:hover { - border: 1px solid #eaeaea; -} - -.inputbox:focus { - border: 1px solid #eaeaea; - color: #4b4b4b; +.inputbox:hover, .inputbox:focus { + border: 1px solid transparent; } input.inputbox { width: 85%; } @@ -320,13 +297,12 @@ a.button1, input.button1, input.button3, a.button2, input.button2 { padding-top: 1px; padding-bottom: 1px; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000; - background: #FAFAFA none repeat-x top left; + background: transparent none repeat-x top left; } a.button1, input.button1 { font-weight: bold; - border: 1px solid #666666; + border: 1px solid transparent; } input.button3 { @@ -340,13 +316,12 @@ input.button3 { /* Alternative button */ a.button2, input.button2, input.button3 { - border: 1px solid #666666; + border: 1px solid transparent; } /* button in the style of the form buttons */ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active { text-decoration: none; - color: #000000; padding: 2px 8px; line-height: 250%; vertical-align: text-bottom; @@ -355,14 +330,12 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but /* Hover states */ a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { - border: 1px solid #BCBCBC; + border: 1px solid transparent; background-position: 0 100%; - color: #BCBCBC; } input.disabled { font-weight: normal; - color: #666666; } /* Topic and forum Search */ diff --git a/phpBB/styles/prosilver/theme/images/alert_close.png b/phpBB/styles/prosilver/theme/images/alert_close.png new file mode 100644 index 0000000000..79750a013c Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/alert_close.png differ diff --git a/phpBB/styles/prosilver/imageset/announce_read.gif b/phpBB/styles/prosilver/theme/images/announce_read.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_read.gif rename to phpBB/styles/prosilver/theme/images/announce_read.gif diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_read_locked.gif rename to phpBB/styles/prosilver/theme/images/announce_read_locked.gif diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/announce_read_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_read_mine.gif rename to phpBB/styles/prosilver/theme/images/announce_read_mine.gif diff --git a/phpBB/styles/prosilver/imageset/announce_unread.gif b/phpBB/styles/prosilver/theme/images/announce_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_unread.gif rename to phpBB/styles/prosilver/theme/images/announce_unread.gif diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_unread_locked.gif rename to phpBB/styles/prosilver/theme/images/announce_unread_locked.gif diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/announce_unread_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/announce_unread_mine.gif rename to phpBB/styles/prosilver/theme/images/announce_unread_mine.gif diff --git a/phpBB/styles/prosilver/theme/images/corners_left.gif b/phpBB/styles/prosilver/theme/images/corners_left.gif deleted file mode 100644 index 206e50368d..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_left.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_left.png b/phpBB/styles/prosilver/theme/images/corners_left.png deleted file mode 100644 index 256bde3daa..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_left.png and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_right.gif b/phpBB/styles/prosilver/theme/images/corners_right.gif deleted file mode 100644 index 0ba66d50b2..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_right.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_right.png b/phpBB/styles/prosilver/theme/images/corners_right.png deleted file mode 100644 index df41823b4c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_right.png and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_link.gif b/phpBB/styles/prosilver/theme/images/forum_link.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_link.gif rename to phpBB/styles/prosilver/theme/images/forum_link.gif diff --git a/phpBB/styles/prosilver/imageset/forum_read.gif b/phpBB/styles/prosilver/theme/images/forum_read.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_read.gif rename to phpBB/styles/prosilver/theme/images/forum_read.gif diff --git a/phpBB/styles/prosilver/imageset/forum_read_locked.gif b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_read_locked.gif rename to phpBB/styles/prosilver/theme/images/forum_read_locked.gif diff --git a/phpBB/styles/prosilver/imageset/forum_read_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_read_subforum.gif rename to phpBB/styles/prosilver/theme/images/forum_read_subforum.gif diff --git a/phpBB/styles/prosilver/imageset/forum_unread.gif b/phpBB/styles/prosilver/theme/images/forum_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_unread.gif rename to phpBB/styles/prosilver/theme/images/forum_unread.gif diff --git a/phpBB/styles/prosilver/imageset/forum_unread_locked.gif b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_unread_locked.gif rename to phpBB/styles/prosilver/theme/images/forum_unread_locked.gif diff --git a/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/forum_unread_subforum.gif rename to phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif diff --git a/phpBB/styles/prosilver/imageset/icon_back_top.gif b/phpBB/styles/prosilver/theme/images/icon_back_top.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_back_top.gif rename to phpBB/styles/prosilver/theme/images/icon_back_top.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_aim.gif b/phpBB/styles/prosilver/theme/images/icon_contact_aim.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_aim.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_aim.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_email.gif b/phpBB/styles/prosilver/theme/images/icon_contact_email.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_email.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_email.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_icq.gif b/phpBB/styles/prosilver/theme/images/icon_contact_icq.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_icq.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_icq.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif b/phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_jabber.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_jabber.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif b/phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_msnm.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_msnm.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_www.gif b/phpBB/styles/prosilver/theme/images/icon_contact_www.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_www.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_www.gif diff --git a/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif b/phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif rename to phpBB/styles/prosilver/theme/images/icon_contact_yahoo.gif diff --git a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif b/phpBB/styles/prosilver/theme/images/icon_fontsize.gif deleted file mode 100644 index 1c7d83527c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_offline.gif b/phpBB/styles/prosilver/theme/images/icon_offline.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_offline.gif rename to phpBB/styles/prosilver/theme/images/icon_offline.gif diff --git a/phpBB/styles/prosilver/imageset/icon_online.gif b/phpBB/styles/prosilver/theme/images/icon_online.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_online.gif rename to phpBB/styles/prosilver/theme/images/icon_online.gif diff --git a/phpBB/styles/prosilver/imageset/icon_post_delete.gif b/phpBB/styles/prosilver/theme/images/icon_post_delete.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_post_delete.gif rename to phpBB/styles/prosilver/theme/images/icon_post_delete.gif diff --git a/phpBB/styles/prosilver/imageset/icon_post_info.gif b/phpBB/styles/prosilver/theme/images/icon_post_info.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_post_info.gif rename to phpBB/styles/prosilver/theme/images/icon_post_info.gif diff --git a/phpBB/styles/prosilver/imageset/icon_post_report.gif b/phpBB/styles/prosilver/theme/images/icon_post_report.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_post_report.gif rename to phpBB/styles/prosilver/theme/images/icon_post_report.gif diff --git a/phpBB/styles/prosilver/imageset/icon_post_target.gif b/phpBB/styles/prosilver/theme/images/icon_post_target.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_post_target.gif rename to phpBB/styles/prosilver/theme/images/icon_post_target.gif diff --git a/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif b/phpBB/styles/prosilver/theme/images/icon_post_target_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_post_target_unread.gif rename to phpBB/styles/prosilver/theme/images/icon_post_target_unread.gif diff --git a/phpBB/styles/prosilver/imageset/icon_rate_bad.gif b/phpBB/styles/prosilver/theme/images/icon_rate_bad.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_rate_bad.gif rename to phpBB/styles/prosilver/theme/images/icon_rate_bad.gif diff --git a/phpBB/styles/prosilver/imageset/icon_rate_good.gif b/phpBB/styles/prosilver/theme/images/icon_rate_good.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_rate_good.gif rename to phpBB/styles/prosilver/theme/images/icon_rate_good.gif diff --git a/phpBB/styles/prosilver/imageset/icon_topic_attach.gif b/phpBB/styles/prosilver/theme/images/icon_topic_attach.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_topic_attach.gif rename to phpBB/styles/prosilver/theme/images/icon_topic_attach.gif diff --git a/phpBB/styles/prosilver/imageset/icon_topic_latest.gif b/phpBB/styles/prosilver/theme/images/icon_topic_latest.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_topic_latest.gif rename to phpBB/styles/prosilver/theme/images/icon_topic_latest.gif diff --git a/phpBB/styles/prosilver/imageset/icon_topic_newest.gif b/phpBB/styles/prosilver/theme/images/icon_topic_newest.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_topic_newest.gif rename to phpBB/styles/prosilver/theme/images/icon_topic_newest.gif diff --git a/phpBB/styles/prosilver/imageset/icon_topic_reported.gif b/phpBB/styles/prosilver/theme/images/icon_topic_reported.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_topic_reported.gif rename to phpBB/styles/prosilver/theme/images/icon_topic_reported.gif diff --git a/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif b/phpBB/styles/prosilver/theme/images/icon_topic_unapproved.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif rename to phpBB/styles/prosilver/theme/images/icon_topic_unapproved.gif diff --git a/phpBB/styles/prosilver/imageset/icon_user_warn.gif b/phpBB/styles/prosilver/theme/images/icon_user_warn.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/icon_user_warn.gif rename to phpBB/styles/prosilver/theme/images/icon_user_warn.gif diff --git a/phpBB/styles/prosilver/theme/images/site_logo.gif b/phpBB/styles/prosilver/theme/images/site_logo.gif new file mode 100644 index 0000000000..2517fbedd6 Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/site_logo.gif differ diff --git a/phpBB/styles/prosilver/imageset/sticky_read.gif b/phpBB/styles/prosilver/theme/images/sticky_read.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_read.gif rename to phpBB/styles/prosilver/theme/images/sticky_read.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_read_locked.gif rename to phpBB/styles/prosilver/theme/images/sticky_read_locked.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_read_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_read_mine.gif rename to phpBB/styles/prosilver/theme/images/sticky_read_mine.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_unread.gif b/phpBB/styles/prosilver/theme/images/sticky_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_unread.gif rename to phpBB/styles/prosilver/theme/images/sticky_unread.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_unread_locked.gif rename to phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/sticky_unread_mine.gif rename to phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif diff --git a/phpBB/styles/prosilver/imageset/subforum_read.gif b/phpBB/styles/prosilver/theme/images/subforum_read.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/subforum_read.gif rename to phpBB/styles/prosilver/theme/images/subforum_read.gif diff --git a/phpBB/styles/prosilver/imageset/subforum_unread.gif b/phpBB/styles/prosilver/theme/images/subforum_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/subforum_unread.gif rename to phpBB/styles/prosilver/theme/images/subforum_unread.gif diff --git a/phpBB/styles/prosilver/imageset/topic_moved.gif b/phpBB/styles/prosilver/theme/images/topic_moved.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_moved.gif rename to phpBB/styles/prosilver/theme/images/topic_moved.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read.gif b/phpBB/styles/prosilver/theme/images/topic_read.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read.gif rename to phpBB/styles/prosilver/theme/images/topic_read.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read_hot.gif rename to phpBB/styles/prosilver/theme/images/topic_read_hot.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read_locked.gif rename to phpBB/styles/prosilver/theme/images/topic_read_locked.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/topic_read_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_read_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_read_mine.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread.gif b/phpBB/styles/prosilver/theme/images/topic_unread.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread.gif rename to phpBB/styles/prosilver/theme/images/topic_unread.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread_hot.gif rename to phpBB/styles/prosilver/theme/images/topic_unread_hot.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread_locked.gif rename to phpBB/styles/prosilver/theme/images/topic_unread_locked.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif diff --git a/phpBB/styles/prosilver/imageset/topic_unread_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif similarity index 100% rename from phpBB/styles/prosilver/imageset/topic_unread_mine.gif rename to phpBB/styles/prosilver/theme/images/topic_unread_mine.gif diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css new file mode 100644 index 0000000000..cb99e9e715 --- /dev/null +++ b/phpBB/styles/prosilver/theme/imageset.css @@ -0,0 +1,405 @@ +/* Former imageset */ +span.imageset { + display: inline-block !important; + background: transparent none 0 0 no-repeat; + margin: 0; + padding: 0; + width: 0; + height: 0; + overflow: hidden; +} + +/* Global imageset items */ +.imageset.site_logo { + background-image: url("./images/site_logo.gif"); + padding-left: 149px; + padding-top: 52px; +} +.imageset.forum_link { + background-image: url("./images/forum_link.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_read { + background-image: url("./images/forum_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_read_locked { + background-image: url("./images/forum_read_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_read_subforum { + background-image: url("./images/forum_read_subforum.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_unread { + background-image: url("./images/forum_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_unread_locked { + background-image: url("./images/forum_unread_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.forum_unread_subforum { + background-image: url("./images/forum_unread_subforum.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_moved { + background-image: url("./images/topic_moved.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read { + background-image: url("./images/topic_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read_mine { + background-image: url("./images/topic_read_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read_hot { + background-image: url("./images/topic_read_hot.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read_hot_mine { + background-image: url("./images/topic_read_hot_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read_locked { + background-image: url("./images/topic_read_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_read_locked_mine { + background-image: url("./images/topic_read_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread { + background-image: url("./images/topic_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread_mine { + background-image: url("./images/topic_unread_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread_hot { + background-image: url("./images/topic_unread_hot.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread_hot_mine { + background-image: url("./images/topic_unread_hot_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread_locked { + background-image: url("./images/topic_unread_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.topic_unread_locked_mine { + background-image: url("./images/topic_unread_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_read { + background-image: url("./images/sticky_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_read_mine { + background-image: url("./images/sticky_read_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_read_locked { + background-image: url("./images/sticky_read_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_read_locked_mine { + background-image: url("./images/sticky_read_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_unread { + background-image: url("./images/sticky_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_unread_mine { + background-image: url("./images/sticky_unread_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_unread_locked { + background-image: url("./images/sticky_unread_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.sticky_unread_locked_mine { + background-image: url("./images/sticky_unread_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_read { + background-image: url("./images/announce_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_read_mine { + background-image: url("./images/announce_read_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_read_locked { + background-image: url("./images/announce_read_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_read_locked_mine { + background-image: url("./images/announce_read_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_unread { + background-image: url("./images/announce_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_unread_mine { + background-image: url("./images/announce_unread_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_unread_locked { + background-image: url("./images/announce_unread_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.announce_unread_locked_mine { + background-image: url("./images/announce_unread_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_read { + background-image: url("./images/announce_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_read_mine { + background-image: url("./images/announce_read_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_read_locked { + background-image: url("./images/announce_read_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_read_locked_mine { + background-image: url("./images/announce_read_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_unread { + background-image: url("./images/announce_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_unread_mine { + background-image: url("./images/announce_unread_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_unread_locked { + background-image: url("./images/announce_unread_locked.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.global_unread_locked_mine { + background-image: url("./images/announce_unread_locked_mine.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.subforum_read { + background-image: url("./images/subforum_read.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.subforum_unread { + background-image: url("./images/subforum_unread.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.pm_read { + background-image: url("./images/topic_read.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.pm_unread { + background-image: url("./images/topic_unread.gif"); + padding-left: 27px; + padding-top: 27px; +} +.imageset.icon_back_top { + background-image: url("./images/icon_back_top.gif"); + padding-left: 11px; + padding-top: 11px; +} +.imageset.icon_contact_aim { + background-image: url("./images/icon_contact_aim.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_email { + background-image: url("./images/icon_contact_email.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_icq { + background-image: url("./images/icon_contact_icq.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_jabber { + background-image: url("./images/icon_contact_jabber.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_msnm { + background-image: url("./images/icon_contact_msnm.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_www { + background-image: url("./images/icon_contact_www.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_contact_yahoo { + background-image: url("./images/icon_contact_yahoo.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_post_delete { + background-image: url("./images/icon_post_delete.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_post_info { + background-image: url("./images/icon_post_info.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_post_report { + background-image: url("./images/icon_post_report.gif"); + padding-left: 20px; + padding-top: 20px; +} +.imageset.icon_post_target { + background-image: url("./images/icon_post_target.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.icon_post_target_unread { + background-image: url("./images/icon_post_target_unread.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.icon_topic_attach { + background-image: url("./images/icon_topic_attach.gif"); + padding-left: 7px; + padding-top: 10px; +} +.imageset.icon_topic_latest { + background-image: url("./images/icon_topic_latest.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.icon_topic_newest { + background-image: url("./images/icon_topic_newest.gif"); + padding-left: 11px; + padding-top: 9px; +} +.imageset.icon_topic_reported { + background-image: url("./images/icon_topic_reported.gif"); + padding-left: 16px; + padding-top: 14px; +} +.imageset.icon_topic_unapproved { + background-image: url("./images/icon_topic_unapproved.gif"); + padding-left: 16px; + padding-top: 14px; +} +.imageset.icon_user_warn { + background-image: url("./images/icon_user_warn.gif"); + padding-left: 20px; + padding-top: 20px; +} + + +/* English images for fallback */ +.imageset.icon_contact_pm { + background-image: url("./en/icon_contact_pm.gif"); + padding-left: 28px; + padding-top: 20px; +} +.imageset.icon_post_edit { + background-image: url("./en/icon_post_edit.gif"); + padding-left: 42px; + padding-top: 20px; +} +.imageset.icon_post_quote { + background-image: url("./en/icon_post_quote.gif"); + padding-left: 54px; + padding-top: 20px; +} +.imageset.icon_user_online { + background-image: url("./en/icon_user_online.gif"); + padding-left: 58px; + padding-top: 58px; +} +.imageset.button_pm_forward { + background-image: url("./en/button_pm_forward.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_pm_new { + background-image: url("./en/button_pm_new.gif"); + padding-left: 84px; + padding-top: 25px; +} +.imageset.button_pm_reply { + background-image: url("./en/button_pm_reply.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_topic_locked { + background-image: url("./en/button_topic_locked.gif"); + padding-left: 88px; + padding-top: 25px; +} +.imageset.button_topic_new { + background-image: url("./en/button_topic_new.gif"); + padding-left: 96px; + padding-top: 25px; +} +.imageset.button_topic_reply { + background-image: url("./en/button_topic_reply.gif"); + padding-left: 96px; + padding-top: 25px; +} diff --git a/phpBB/styles/prosilver/theme/large.css b/phpBB/styles/prosilver/theme/large.css deleted file mode 100644 index 1c3eb42b5d..0000000000 --- a/phpBB/styles/prosilver/theme/large.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 12px; -} diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index a406114054..66c3aed03e 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -1,4 +1,4 @@ -/* proSilver Link Styles +/* Link Styles ---------------------------------------- */ /* Links adjustment to correctly display an order of rtl/ltr mixed content */ @@ -7,10 +7,17 @@ a { unicode-bidi: embed; } -a:link { color: #898989; text-decoration: none; } -a:visited { color: #898989; text-decoration: none; } -a:hover { color: #d3d3d3; text-decoration: underline; } -a:active { color: #d2d2d2; text-decoration: none; } +a:link, a:visited { + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +a:active { + text-decoration: none; +} /* Coloured usernames */ .username-coloured { @@ -21,22 +28,18 @@ a:active { color: #d2d2d2; text-decoration: none; } /* Links on gradient backgrounds */ #search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link { - color: #FFFFFF; text-decoration: none; } #search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited { - color: #FFFFFF; text-decoration: none; } #search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover { - color: #ffffff; text-decoration: underline; } #search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active { - color: #ffffff; text-decoration: none; } @@ -45,100 +48,74 @@ a.forumtitle { font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; font-size: 1.2em; font-weight: bold; - color: #898989; text-decoration: none; } -/* a.forumtitle:visited { color: #898989; } */ - a.forumtitle:hover { - color: #bcbcbc; text-decoration: underline; } -a.forumtitle:active { - color: #898989; -} - a.topictitle { font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; font-size: 1.2em; font-weight: bold; - color: #898989; text-decoration: none; } -/* a.topictitle:visited { color: #d2d2d2; } */ - a.topictitle:hover { - color: #bcbcbc; text-decoration: underline; } -a.topictitle:active { - color: #898989; +a.lastsubject { + font-weight: bold; + text-decoration: none; +} + +a.lastsubject:hover { + text-decoration: underline; } /* Post body links */ .postlink { text-decoration: none; - color: #d2d2d2; - border-bottom: 1px solid #d2d2d2; + border-bottom: 1px solid transparent; padding-bottom: 0; } -.postlink:visited { - color: #bdbdbd; - border-bottom-style: dotted; - border-bottom-color: #666666; -} - -.postlink:active { - color: #d2d2d2; -} - .postlink:hover { - background-color: #f6f6f6; text-decoration: none; - color: #404040; } .signature a, .signature a:visited, .signature a:hover, .signature a:active { border: none; text-decoration: underline; - background-color: transparent; } /* Profile links */ .postprofile a:link, .postprofile a:visited, .postprofile dt.author a { font-weight: bold; - color: #898989; text-decoration: none; } .postprofile a:hover, .postprofile dt.author a:hover { text-decoration: underline; - color: #d3d3d3; } /* CSS spec requires a:link, a:visited, a:hover and a:active rules to be specified in this order. */ /* See http://www.phpbb.com/bugs/phpbb3/59685 */ .postprofile a:active { font-weight: bold; - color: #898989; text-decoration: none; } /* Profile searchresults */ .search .postprofile a { - color: #898989; text-decoration: none; font-weight: normal; } .search .postprofile a:hover { - color: #d3d3d3; text-decoration: underline; } @@ -152,8 +129,8 @@ a.topictitle:active { a.top { background: none no-repeat top left; text-decoration: none; - width: {IMG_ICON_BACK_TOP_WIDTH}px; - height: {IMG_ICON_BACK_TOP_HEIGHT}px; + width: 11px; + height: 11px; display: block; float: right; overflow: hidden; @@ -181,7 +158,6 @@ a.up, a.up:link, a.up:active, a.up:visited { a.up:hover { background-position: left top; - background-color: transparent; } a.down, a.down:link, a.down:active, a.down:visited { @@ -198,7 +174,6 @@ a.left, a.left:active, a.left:visited { } a.left:hover { - color: #d2d2d2; text-decoration: none; background-position: 0 60%; } @@ -208,7 +183,6 @@ a.right, a.right:active, a.right:visited { } a.right:hover { - color: #d2d2d2; text-decoration: none; background-position: 100% 60%; } diff --git a/phpBB/styles/prosilver/theme/medium.css b/phpBB/styles/prosilver/theme/medium.css deleted file mode 100644 index e3b932b61d..0000000000 --- a/phpBB/styles/prosilver/theme/medium.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 11px; -} diff --git a/phpBB/styles/prosilver/theme/normal.css b/phpBB/styles/prosilver/theme/normal.css deleted file mode 100644 index d842feb31b..0000000000 --- a/phpBB/styles/prosilver/theme/normal.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 10px; -} diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css index 2cfcd4da20..bc3ca80fdc 100644 --- a/phpBB/styles/prosilver/theme/print.css +++ b/phpBB/styles/prosilver/theme/print.css @@ -1,10 +1,5 @@ -/* proSilver Print Style Sheet -------------------------------------------------- - Author: subBlue ( http://www.subBlue.com/ ) - Version: 25 August 2004 - - Copyright 2004 phpBB Group --------------------------------------------------*/ +/* Print Style Sheet +---------------------------------------- */ /* Lots still TODO here! */ diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index c7db605bbb..48a00c6803 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -1,11 +1,9 @@ -/* phpBB 3.0 Style Sheet +/* phpBB3 Style Sheet -------------------------------------------------------------- - Style name: proSilver - Based on style: proSilver (this is the default phpBB 3 style) - Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: - - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) + Style name: prosilver (the default phpBB 3.1.x style) + Based on style: + Original author: Tom Beddard ( http://www.subblue.com/ ) + Modified by: phpBB Group ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ @@ -15,5 +13,5 @@ @import url("buttons.css"); @import url("cp.css"); @import url("forms.css"); -@import url("tweaks.css"); @import url("colours.css"); +@import url("imageset.css"); diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg deleted file mode 100644 index 4f23159d8c..0000000000 --- a/phpBB/styles/prosilver/theme/theme.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# phpBB Theme Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# Available and used values: -# parse_css_file -# - -# General Information about this theme -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.1.0-dev - -# Some configuration options - -# -# You have to turn this option on if you want to use the -# path template variables ({T_IMAGESET_PATH} for example) within -# your css file. -# This is mostly the case if you want to use language specific -# images within your css file. -# -parse_css_file = 1 diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 30fe5fb986..cd6865f66f 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -1,101 +1,32 @@ -/* proSilver Style Sheet Tweaks +/* Style Sheet Tweaks -These style definitions are mainly IE specific +These style definitions are IE 7 and 8 specific tweaks required due to its poor CSS support. -------------------------------------------------*/ -* html table, * html select, * html input { font-size: 100%; } -* html hr { margin: 0; } -* html span.corners-top, * html span.corners-bottom { background-image: url("{T_THEME_PATH}/images/corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("{T_THEME_PATH}/images/corners_right.gif"); } - -table.table1 { - width: 99%; /* IE < 6 browsers */ - /* Tantek hack */ - voice-family: "\"}\""; - voice-family: inherit; - width: 100%; -} -html>body table.table1 { width: 100%; } /* Reset 100% for opera */ - -* html ul.topiclist li { position: relative; } -* html .postbody h3 img { vertical-align: middle; } - -/* Form styles */ -html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/radio buttons nicely */ - -* html input.button1, * html input.button2 { - padding-bottom: 0; - margin-bottom: 1px; +/* Clear float fix for IE7 */ +.inner { + zoom: 1; } -/* Misc layout styles */ -* html .column1, * html .column2 { width: 45%; } - -/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above) - From http://www.positioniseverything.net/easyclearing.html -#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -}*/ - -.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls { - height: 1%; - overflow: hidden; +/* Align checkboxes/radio buttons nicely */ +dd label input { + vertical-align: text-bottom; + *vertical-align: middle; } -/* viewtopic fix */ -* html .post { - height: 25%; - overflow: hidden; -} - -/* navbar fix */ -* html .clearfix, * html .navbar, ul.linklist { - height: 4%; - overflow: hidden; -} - -/* Simple fix so forum and topic lists always have a min-height set, even in IE6 - From http://www.dustindiaz.com/min-height-fast-hack */ +/* Simple fix so forum and topic lists always have a height set */ dl.icon { - min-height: 35px; - height: auto !important; - height: 35px; -} - -* html li.row dl.icon dt { - height: 35px; - overflow: visible; -} - -* html #search-box { - width: 25%; + *height: 35px; } /* Correctly clear floating for details on profile view */ -*:first-child+html dl.details dd { - margin-left: 30%; - float: none; +dl.details dd { + *margin-left: 30%; + *float: none; } -* html dl.details dd { - margin-left: 30%; - float: none; -} - -* html .forumbg table.table1 { - margin: 0 -2px 0px -1px; -} - -/* Headerbar height fix for IE7 and below */ -* html #site-description p { - margin-bottom: 1.0em; -} - -*:first-child+html #site-description p { - margin-bottom: 1.0em; +/* Headerbar height fix for IE7 */ +#site-description p { + *margin-bottom: 1.0em; } \ No newline at end of file diff --git a/phpBB/styles/subsilver2/imageset/en/imageset.cfg b/phpBB/styles/subsilver2/imageset/en/imageset.cfg deleted file mode 100644 index c0cc699737..0000000000 --- a/phpBB/styles/subsilver2/imageset/en/imageset.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# Images -img_icon_contact_aim = icon_contact_aim.gif -img_icon_contact_email = icon_contact_email.gif -img_icon_contact_icq = icon_contact_icq.gif -img_icon_contact_jabber = icon_contact_jabber.gif -img_icon_contact_msnm = icon_contact_msnm.gif -img_icon_contact_pm = icon_contact_pm.gif -img_icon_contact_yahoo = icon_contact_yahoo.gif -img_icon_contact_www = icon_contact_www.gif - -img_icon_post_delete = icon_post_delete.gif -img_icon_post_edit = icon_post_edit.gif -img_icon_post_info = icon_post_info.gif -img_icon_post_quote = icon_post_quote.gif -img_icon_post_report = icon_post_report.gif - -img_icon_user_online = icon_user_online.gif -img_icon_user_offline = icon_user_offline.gif -img_icon_user_profile = icon_user_profile.gif -img_icon_user_search = icon_user_search.gif -img_icon_user_warn = icon_user_warn.gif - -img_button_pm_forward = -img_button_pm_new = button_pm_new.gif -img_button_pm_reply = button_pm_reply.gif -img_button_topic_locked = button_topic_locked.gif -img_button_topic_new = button_topic_new.gif -img_button_topic_reply = button_topic_reply.gif - diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg deleted file mode 100644 index 99c34d098f..0000000000 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ /dev/null @@ -1,100 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = subsilver2 -copyright = © phpBB Group, 2003 -version = 3.1.0-dev - -# Images -img_site_logo = site_logo.gif*94*170 -img_upload_bar = upload_bar.gif*16*280 -img_poll_left = poll_left.gif*12*4 -img_poll_center = poll_center.gif*12*1 -img_poll_right = poll_right.gif*12*4 -img_icon_friend = -img_icon_foe = - -img_forum_link = forum_link.gif*25*46 -img_forum_read = forum_read.gif*25*46 -img_forum_read_locked = forum_read_locked.gif*25*46 -img_forum_read_subforum = forum_read_subforum.gif*25*46 -img_forum_unread = forum_unread.gif*25*46 -img_forum_unread_locked = forum_unread_locked.gif*25*46 -img_forum_unread_subforum = forum_unread_subforum.gif*25*46 - -img_topic_moved = topic_moved.gif*18*19 - -img_topic_read = topic_read.gif*18*19 -img_topic_read_mine = topic_read_mine.gif*18*19 -img_topic_read_hot = topic_read_hot.gif*18*19 -img_topic_read_hot_mine = topic_read_hot_mine.gif*18*19 -img_topic_read_locked = topic_read_locked.gif*18*19 -img_topic_read_locked_mine = topic_read_locked_mine.gif*18*19 - -img_topic_unread = topic_unread.gif*18*19 -img_topic_unread_mine = topic_unread_mine.gif*18*19 -img_topic_unread_hot = topic_unread_hot.gif*18*19 -img_topic_unread_hot_mine = topic_unread_hot_mine.gif*18*19 -img_topic_unread_locked = topic_unread_locked.gif*18*19 -img_topic_unread_locked_mine = topic_unread_locked_mine.gif*18*19 - -img_sticky_read = sticky_read.gif*18*19 -img_sticky_read_mine = sticky_read_mine.gif*18*19 -img_sticky_read_locked = sticky_read_locked.gif*18*19 -img_sticky_read_locked_mine = sticky_read_locked_mine.gif*18*19 -img_sticky_unread = sticky_unread.gif*18*19 -img_sticky_unread_mine = sticky_unread_mine.gif*18*19 -img_sticky_unread_locked = sticky_unread_locked.gif*18*19 -img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*18*19 - -img_announce_read = announce_read.gif*18*19 -img_announce_read_mine = announce_read_mine.gif*18*19 -img_announce_read_locked = announce_read_locked.gif*18*19 -img_announce_read_locked_mine = announce_read_locked_mine.gif*18*19 -img_announce_unread = announce_unread.gif*18*19 -img_announce_unread_mine = announce_unread_mine.gif*18*19 -img_announce_unread_locked = announce_unread_locked.gif*18*19 -img_announce_unread_locked_mine = announce_unread_locked_mine.gif*18*19 - -img_global_read = announce_read.gif*18*19 -img_global_read_mine = announce_read_mine.gif*18*19 -img_global_read_locked = announce_read_locked.gif*18*19 -img_global_read_locked_mine = announce_read_locked_mine.gif*18*19 -img_global_unread = announce_unread.gif*18*19 -img_global_unread_mine = announce_unread_mine.gif*18*19 -img_global_unread_locked = announce_unread_locked.gif*18*19 -img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19 - -img_subforum_read = -img_subforum_unread = - -img_pm_read = topic_read.gif*18*19 -img_pm_unread = topic_unread.gif*18*19 - -img_icon_back_top = - -img_icon_post_target = icon_post_target.gif*9*12 -img_icon_post_target_unread = icon_post_target_unread.gif*9*12 - -img_icon_topic_attach = icon_topic_attach.gif*18*14 -img_icon_topic_latest = icon_topic_latest.gif*9*18 -img_icon_topic_newest = icon_topic_newest.gif*9*18 -img_icon_topic_reported = icon_topic_reported.gif*18*19 -img_icon_topic_unapproved = icon_topic_unapproved.gif*18*19 - diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index fc76c884e0..ca81337d17 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -3,12 +3,11 @@ # # @package phpBB3 # @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 # # # At the left is the name, please do not change this # At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false # # Values get trimmed, if you want to add a space in front or at the end of # the value, then enclose the value with single or double quotes. @@ -19,4 +18,12 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -version = 3.1.0-dev +style_version = 3.1.0-dev +phpbb_version = 3.1.0-dev + +# Defining a different template bitfield +# template_bitfield = lNg= + +# Parent style +# Set value to empty or to this style's name if this style does not have a parent style +parent = subsilver2 diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html index b5b547b2e6..fca620b481 100644 --- a/phpBB/styles/subsilver2/template/attachment.html +++ b/phpBB/styles/subsilver2/template/attachment.html @@ -72,7 +72,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html index f8476ec37a..73386ed851 100644 --- a/phpBB/styles/subsilver2/template/breadcrumbs.html +++ b/phpBB/styles/subsilver2/template/breadcrumbs.html @@ -1,7 +1,7 @@ diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html index 4c65f81643..e2edf0b810 100644 --- a/phpBB/styles/subsilver2/template/captcha_default.html +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -12,6 +12,6 @@ - diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html index 23d2a92f68..acc9cdcdfb 100644 --- a/phpBB/styles/subsilver2/template/captcha_qa.html +++ b/phpBB/styles/subsilver2/template/captcha_qa.html @@ -3,6 +3,6 @@ - + diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index 1f0c81fb69..151cf53ff1 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -151,8 +151,10 @@ function insert_text(text, spaces, popup) { text = ' ' + text + ' '; } - - if (!isNaN(textarea.selectionStart)) + + // Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. + // Therefore we simply add a !is_ie here until IE fixes the text-selection completely. + if (!isNaN(textarea.selectionStart) && !is_ie) { var sel_start = textarea.selectionStart; var sel_end = textarea.selectionEnd; @@ -218,11 +220,12 @@ function addquote(post_id, username, l_wrote) } // Get text selection - not only the post content :( - if (window.getSelection) + // IE9 must use the document.selection method but has the *.getSelection so we just force no IE + if (window.getSelection && !is_ie && !window.opera) { theSelection = window.getSelection().toString(); } - else if (document.getSelection) + else if (document.getSelection && !is_ie) { theSelection = document.getSelection(); } diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html index 607fee1c95..22c4145a20 100644 --- a/phpBB/styles/subsilver2/template/faq_body.html +++ b/phpBB/styles/subsilver2/template/faq_body.html @@ -13,7 +13,7 @@ {faq_block.BLOCK_TITLE}
- {faq_block.faq_row.FAQ_QUESTION}
+ {faq_block.faq_row.FAQ_QUESTION}

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html index 55ae288854..521eaf3c16 100644 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ b/phpBB/styles/subsilver2/template/forumlist_body.html @@ -48,17 +48,24 @@

{forumrow.L_MODERATOR_STR}: {forumrow.MODERATORS}

- -

{forumrow.L_SUBFORUM_STR} {forumrow.SUBFORUMS}

+ +

{forumrow.L_SUBFORUM_STR} + + {forumrow.subforum.SUBFORUM_NAME}, + +

- +
-

{L_INDEX} » {navlinks.FORUM_NAME}

+

{L_SITE_HOME} » {L_INDEX} » {navlinks.FORUM_NAME}

{S_TIMEZONE}
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}		 + tabindex="{$CAPTCHA_TAB_INDEX}" />
{QA_CONFIRM_QUESTION}:
{L_CONFIRM_QUESTION_EXPLAIN}		 tabindex="{$CAPTCHA_TAB_INDEX}" />

{forumrow.TOPICS}

{forumrow.POSTS}

 -

{UNAPPROVED_IMG} {forumrow.LAST_POST_TIME}

+ +

{forumrow.LAST_POST_SUBJECT_TRUNCATED}

+ +

{UNAPPROVED_IMG} {forumrow.LAST_POST_TIME}

{forumrow.LAST_POSTER_FULL} - {LAST_POST_IMG} + {LAST_POST_IMG}

{L_NO_POSTS}

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index e52e357564..100199c209 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -50,7 +50,7 @@
{L_BIRTHDAYS}

{L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

{L_CONGRATULATIONS}: {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 262341e0c0..ba316517a9 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -68,7 +68,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html index b48c244653..280920b148 100644 --- a/phpBB/styles/subsilver2/template/mcp_footer.html +++ b/phpBB/styles/subsilver2/template/mcp_footer.html @@ -3,7 +3,7 @@
- + diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html index 10c124b0e1..5d69e85391 100644 --- a/phpBB/styles/subsilver2/template/mcp_forum.html +++ b/phpBB/styles/subsilver2/template/mcp_forum.html @@ -31,10 +31,10 @@

{NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE} - {topicrow.UNAPPROVED_IMG}  + {topicrow.UNAPPROVED_IMG}  - {REPORTED_IMG}  + {REPORTED_IMG}  [ {L_DELETE_SHADOW_TOPIC} ]  diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html index ad8b776628..7c17e13c52 100644 --- a/phpBB/styles/subsilver2/template/mcp_front.html +++ b/phpBB/styles/subsilver2/template/mcp_front.html @@ -19,21 +19,15 @@

- + - - - - - - @@ -66,20 +60,14 @@ - + - - - - - -
 {PAGE_NUMBER}
{unapproved.FORUM_NAME}{unapproved.FORUM_NAME}
[ {L_MODERATE} ]		 {unapproved.TOPIC_TITLE}
[ {L_MODERATE} ]		{unapproved.SUBJECT}
[ {L_VIEW_DETAILS} ]		{unapproved.ATTACH_ICON_IMG} {unapproved.SUBJECT}
[ {L_VIEW_DETAILS} ]		 {unapproved.AUTHOR_FULL} {unapproved.POST_TIME}
{L_UNAPPROVED_POSTS_ZERO_TOTAL}
{L_UNAPPROVED_TOTAL}
{S_HIDDEN_FIELDS}  
{report.FORUM_NAME}{report.FORUM_NAME}
[ {L_MODERATE} ]		 {report.TOPIC_TITLE}
[ {L_MODERATE} ]		{report.SUBJECT}
[ {L_VIEW_DETAILS} ]		{report.ATTACH_ICON_IMG} {report.SUBJECT}
[ {L_VIEW_DETAILS} ]		 {report.REPORTER_FULL} {report.REPORT_TIME}
{L_REPORTS_ZERO_TOTAL}
{L_REPORTS_TOTAL}


@@ -100,23 +88,17 @@ - {pm_report.PM_SUBJECT}
[ {L_VIEW_DETAILS} ] + {pm_report.ATTACH_ICON_IMG} {pm_report.PM_SUBJECT}
[ {L_VIEW_DETAILS} ] {pm_report.PM_AUTHOR_FULL} {pm_report.RECIPIENTS} {pm_report.PM_TIME} {pm_report.REPORTER_FULL} {pm_report.REPORT_TIME} - - - {L_PM_REPORTS_ZERO_TOTAL} - - {L_PM_REPORTS_TOTAL} -

diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html index c1027cdbf3..b8958187e6 100644 --- a/phpBB/styles/subsilver2/template/mcp_move.html +++ b/phpBB/styles/subsilver2/template/mcp_move.html @@ -17,10 +17,10 @@
{L_SELECT_DESTINATION_FORUM}  
- {L_LEAVE_SHADOW}
+ {L_LEAVE_SHADOW}
- {L_LOCK_TOPIC}
+ {L_LOCK_TOPIC}

{S_HIDDEN_FIELDS}{MESSAGE_TEXT}

   diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 771b1bc9e1..24d8682876 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -98,7 +98,7 @@ -
{EDIT_IMG}
+
{EDIT_IMG}
{POST_PREVIEW}
@@ -173,7 +173,7 @@ {userrow.USERNAME}{userrow.USERNAME} [ {userrow.NUM_POSTS} {userrow.L_POST_S} ] - {SEARCH_IMG} + {SEARCH_IMG} diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html index 7a35cc8044..d13af91888 100644 --- a/phpBB/styles/subsilver2/template/mcp_queue.html +++ b/phpBB/styles/subsilver2/template/mcp_queue.html @@ -18,7 +18,7 @@ -

{postrow.POST_SUBJECT}

+

{postrow.ATTACH_ICON_IMG} {postrow.POST_SUBJECT}

{L_FORUM}: {postrow.FORUM_NAME}{postrow.FORUM_NAME} {postrow.POST_AUTHOR_FULL}
[ {L_VIEW_DETAILS} ] @@ -27,7 +27,7 @@ - {L_NO_TOPICS_QUEUE}{L_UNAPPROVED_POSTS_ZERO_TOTAL} + {L_NO_TOPICS_QUEUE}{L_NO_POSTS_QUEUE} diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html index 2e26a3e4cf..cfbd713321 100644 --- a/phpBB/styles/subsilver2/template/mcp_reports.html +++ b/phpBB/styles/subsilver2/template/mcp_reports.html @@ -25,12 +25,12 @@ -

{postrow.PM_SUBJECT}

+

{postrow.ATTACH_ICON_IMG} {postrow.PM_SUBJECT}

{L_PM_FROM}: {postrow.PM_AUTHOR_FULL} {postrow.RECIPIENTS}
{L_SENT_AT}: {postrow.PM_TIME} -

{postrow.POST_SUBJECT}

+

{postrow.ATTACH_ICON_IMG} {postrow.POST_SUBJECT}

{L_FORUM}: {postrow.FORUM_NAME}{postrow.FORUM_NAME} {postrow.POST_AUTHOR_FULL}
{postrow.POST_TIME} diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index 12c0f73b97..6bbf13e12c 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -12,7 +12,7 @@ {L_SPLIT_SUBJECT} - + {L_SPLIT_FORUM} @@ -35,7 +35,7 @@ - {L_MERGE_TOPIC} + {L_MERGE_POSTS} {L_MERGE_TOPIC_EXPLAIN} @@ -79,7 +79,7 @@ - {INFO_IMG} + {INFO_IMG} @@ -135,6 +135,7 @@ +   diff --git a/phpBB/styles/subsilver2/template/mcp_viewlogs.html b/phpBB/styles/subsilver2/template/mcp_viewlogs.html deleted file mode 100644 index 64e51ba498..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_viewlogs.html +++ /dev/null @@ -1,52 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_DISPLAY_OPTIONS}
{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
{L_USERNAME}{L_IP}{L_TIME}{L_ACTION}
{L_LOGS_CURRENT_TOPIC} {TOPIC_NAME}
{log.USERNAME}{log.IP}{log.TIME}{log.ACTION}{L_VIEW_TOPIC} | {L_VIEW_TOPIC_LOGS}
{L_NO_ENTRIES}
-{S_FORM_TOKEN} -
- - - - - - -
{PAGE_NUMBER}
- - diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html index 417355d537..020a79f419 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html @@ -38,7 +38,7 @@ - {L_WARNINGS_ZERO_TOTAL} + {L_NO_WARNINGS} @@ -64,7 +64,7 @@ - {L_WARNINGS_ZERO_TOTAL} + {L_NO_WARNINGS} diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html index 6ed0b68bd5..0b0cfa8a45 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_list.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html @@ -21,7 +21,7 @@ - {L_WARNINGS_ZERO_TOTAL} + {L_NO_WARNINGS} diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html index 7a63154daf..4c7af75ae5 100644 --- a/phpBB/styles/subsilver2/template/memberlist_body.html +++ b/phpBB/styles/subsilver2/template/memberlist_body.html @@ -14,7 +14,12 @@
- + @@ -65,9 +70,9 @@ - - - + + + diff --git a/phpBB/styles/subsilver2/template/memberlist_group.html b/phpBB/styles/subsilver2/template/memberlist_group.html index 650868f810..f48b9811f0 100644 --- a/phpBB/styles/subsilver2/template/memberlist_group.html +++ b/phpBB/styles/subsilver2/template/memberlist_group.html @@ -7,7 +7,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/memberlist_leaders.html b/phpBB/styles/subsilver2/template/memberlist_leaders.html index 75fff9f98a..a4f38aafc4 100644 --- a/phpBB/styles/subsilver2/template/memberlist_leaders.html +++ b/phpBB/styles/subsilver2/template/memberlist_leaders.html @@ -27,7 +27,7 @@   - + diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index 96ffad00d6..ab1ecca2ee 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -43,11 +43,7 @@ */ function marklist(id, name, state) { - var parent = document.getElementById(id); - if (!parent) - { - eval('parent = document.' + id); - } + var parent = document.getElementById(id) || document[id]; if (!parent) { diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index c24c93a8fa..5d866214ce 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -89,11 +89,11 @@ - + - +
{L_USERNAME_BEGINS_WITH}:  {L_USERNAME_BEGINS_WITH}: +   {L_FIND_USERNAME}  {memberrow.JOINED}  {memberrow.POSTS} {memberrow.RANK_IMG}{memberrow.RANK_TITLE} {PM_IMG}  {EMAIL_IMG}  {WWW_IMG}  {PM_IMG}  {EMAIL_IMG}  {WWW_IMG}   {memberrow.PROFILE_FIELD1_VALUE}{L_GROUP_NAME}: style="color:#{GROUP_COLOR}">{GROUP_NAME} {AVATAR_IMG}
{RANK_IMG}{GROUP_RANK}

{PM_IMG}		{AVATAR_IMG}
{RANK_IMG}{GROUP_RANK}

{PM_IMG}
{group.user.RANK_IMG}{group.user.RANK_TITLE} {PM_IMG}  {PM_IMG} 
{L_ACTIVE_IN_FORUM}: {ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-		{ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-
{L_ACTIVE_IN_TOPIC}: {ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-		{ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-
@@ -108,33 +108,33 @@ - + - + - + - + - + - + - +
{L_EMAIL_ADDRESS}: {EMAIL_IMG}{EMAIL_IMG}
{L_PM}: {PM_IMG}{PM_IMG}
{L_MSNM}: {MSN_IMG}{USER_MSN}{MSN_IMG}{USER_MSN}
{L_YIM}: {YIM_IMG}{USER_YIM}{YIM_IMG}{USER_YIM}
{L_AIM}: {AIM_IMG}{USER_AIM}{AIM_IMG}{USER_AIM}
{L_ICQ}: {ICQ_IMG}{USER_ICQ}{ICQ_IMG}{USER_ICQ}
{L_JABBER}: {JABBER_IMG}{USER_JABBER_IMG}{JABBER_IMG}{USER_JABBER_IMG}
@@ -148,10 +148,10 @@ {L_LOCATION}: {LOCATION} - + {L_AGE}: - {AGE} - + {AGE} diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index d82e01b888..24c6f8105c 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -3,10 +3,14 @@
[ {L_ACP} ]

- Powered by phpBB © phpBB Group + {CREDIT_LINE}
{TRANSLATION_INFO}
[ {DEBUG_OUTPUT} ]
+ + +{SCRIPTS} + diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index b9c7a604ce..8bedec4c9e 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -1,16 +1,9 @@ - - + + - - - - - - - + - {META} <!-- 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 --> @@ -25,6 +18,7 @@ + + +{SCRIPTS} + diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index 9fcca4eb30..43ca16ed87 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -1,19 +1,14 @@ - - + + - - - - - - - + {META} {SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} + diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg deleted file mode 100644 index 29361a59ff..0000000000 --- a/phpBB/styles/subsilver2/template/template.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# -# phpBB Template Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this template -name = subsilver2 -copyright = © phpBB Group, 2003 -version = 3.1.0-dev - diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js new file mode 100644 index 0000000000..da0a2b0bfd --- /dev/null +++ b/phpBB/styles/subsilver2/template/timezone.js @@ -0,0 +1,19 @@ +(function($) { // Avoid conflicts with other libraries + +$('#tz_date').change(function() { + phpbb.timezone_switch_date(false); +}); + +$('#tz_select_date_suggest').click(function(){ + phpbb.timezone_preselect_select(true); +}); + +$(document).ready( + phpbb.timezone_enable_date_selection +); + +$(document).ready( + phpbb.timezone_preselect_select($('#tz_select_date_suggest').attr('data-is-registration') == 'true') +); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html new file mode 100644 index 0000000000..c7e47a8ee4 --- /dev/null +++ b/phpBB/styles/subsilver2/template/timezone_option.html @@ -0,0 +1,20 @@ + + {L_BOARD_TIMEZONE}: + + + + + + + + + diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html index ac678895a6..decd40a6de 100644 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html @@ -185,7 +185,7 @@