diff options
38 files changed, 203 insertions, 139 deletions
diff --git a/.travis.yml b/.travis.yml index ae61235c72..4f9734a19a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: php matrix: include: - - php: 5.3 - env: DB=mysqli # MyISAM - php: 5.4 - env: DB=mysqli + env: DB=none;NOTESTS=1 + - php: 5.4 + env: DB=mysqli # MyISAM - php: 5.4 env: DB=mysql - php: 5.4 @@ -33,19 +33,18 @@ services: - redis-server install: - - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION + - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS before_script: - - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION + - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - phantomjs --webdriver=8910 > /dev/null & script: - - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION - - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION - - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ + - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS + - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./ - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi" - - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - + - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/phpBB/composer.json b/phpBB/composer.json index bcf359a53b..b96e6cacf6 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -29,7 +29,7 @@ "lusitanian/oauth": "0.2.*", "marc1706/fast-image-size": "1.1.*", "patchwork/utf8": "1.1.*", - "php": ">=5.3.9", + "php": ">=5.4", "s9e/text-formatter": "dev-release/php5.3", "symfony/config": "2.8.*@dev", "symfony/console": "2.8.*@dev", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index accd4a55f6..bd08a36fdc 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "983770c26a0dcd7399ebd488846ade9a", + "hash": "3a1fb55478d50b5b7b5888f3a07e0b43", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -254,7 +254,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/fb39bdd38f6706b96422a7583b89c9283a58960f", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/c065d0e81e7e4666cd13ba4414f4dc7fe8d33dd9", "reference": "beee0e5693f7ca8ed16a94294acf53b6e6207e7c", "shasum": "" }, @@ -313,7 +313,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/a3aa17e2dcec2dc1c764bedd21e69fdf888b8b55", + "url": "https://api.github.com/repos/symfony/Config/zipball/546b5c41f8e0c3b18e55e4450ec51444adf3e61e", "reference": "a3aa17e2dcec2dc1c764bedd21e69fdf888b8b55", "shasum": "" }, @@ -363,7 +363,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/d31246d93cd99dc57858adb5da63841d56969928", + "url": "https://api.github.com/repos/symfony/Console/zipball/a0d4aa01cfe2e3646e50c13c721c04d044534535", "reference": "d31246d93cd99dc57858adb5da63841d56969928", "shasum": "" }, @@ -420,7 +420,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/3c14966b099b4ba807f146df4c6a7acffba2f793", + "url": "https://api.github.com/repos/symfony/Debug/zipball/7eac742c453af47ae561d6c41743dc7faefc9464", "reference": "3c14966b099b4ba807f146df4c6a7acffba2f793", "shasum": "" }, @@ -475,7 +475,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/99c05679526e9293783ce3a9059890b47da1d97e", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/0558c49dc0abbf4702b432fb9813bcd849d46ff9", "reference": "99c05679526e9293783ce3a9059890b47da1d97e", "shasum": "" }, @@ -535,7 +535,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/d7246885b7fe4cb5a2786bda34362d2f0e40b730", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e79162fa079bb559ddad17c58cf8b7ecbaffd9b6", "reference": "d7246885b7fe4cb5a2786bda34362d2f0e40b730", "shasum": "" }, @@ -593,7 +593,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/b9fa06f1822de287e660130955b546777994597b", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/287fc0b1dcb11ff729eeefc20441c08eaf628f29", "reference": "b9fa06f1822de287e660130955b546777994597b", "shasum": "" }, @@ -744,7 +744,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/330079921340f2d273dd24df16fc129948614e77", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/39aa7db7997031951ad4a4019153199287e1cc88", "reference": "330079921340f2d273dd24df16fc129948614e77", "shasum": "" }, @@ -824,7 +824,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/e9554bafc78c93b15ef56ce72c5aa2f3a511e683", + "url": "https://api.github.com/repos/symfony/Routing/zipball/7ee642267d616c9855c28387d30050e093f26c6b", "reference": "e9554bafc78c93b15ef56ce72c5aa2f3a511e683", "shasum": "" }, @@ -971,7 +971,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/f85dc88ede5943c63c8681c02d8ef6b4252be54c", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/2d1b0ac84ff35256d14c7dd5d949e50d138fa7f3", "reference": "f85dc88ede5943c63c8681c02d8ef6b4252be54c", "shasum": "" }, @@ -2443,7 +2443,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/4f297d7e00c375b6ab03732e076f65799a73937d", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/4dbd336331f5e7ba7a6f9e4f9f608b89093f49b3", "reference": "4f297d7e00c375b6ab03732e076f65799a73937d", "shasum": "" }, @@ -2551,7 +2551,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/be577b3a5d4a06d8ce03db57222bd06b5a6509de", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/1b459587235fb74b213269ec5ad8ac2f6e22f5f4", "reference": "be577b3a5d4a06d8ce03db57222bd06b5a6509de", "shasum": "" }, @@ -2670,7 +2670,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.9" + "php": ">=5.4" }, "platform-dev": [] } diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index a0e63092f0..c6a88def7f 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@ <li>Oracle</li> </ul> </li> - <li><strong>PHP 5.3.9+</strong> with support for the database you intend to use.</li> + <li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li> <li>The following PHP modules are required: <ul> <li>json</li> diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 1d6530b4da..da3e2fa066 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -265,7 +265,7 @@ <ul> <li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li> - <li>PHP version and mode of operation, e.g. PHP 5.3.9 as a module, PHP 5.4.0 running as CGI, etc.</li> + <li>PHP version and mode of operation, e.g. PHP 5.4.0 as a module, PHP 5.4.0 running as CGI, etc.</li> <li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 SP1, etc.</li> </ul> @@ -323,11 +323,11 @@ <div class="content"> - <p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.9.</p> + <p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.4.0.</p> <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> - <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.3.x to 5.4.x without problem.</p> + <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x to 5.6.x without problem.</p> <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3> diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 8a53edb8ee..47e2660770 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -426,7 +426,7 @@ class acp_main // Version check $user->add_lang('install'); - if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.3.3', '<')) + if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.4', '<')) { $template->assign_vars(array( 'S_PHP_VERSION_OLD' => true, diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 3559a10971..6320b14947 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -22,9 +22,9 @@ define('PHPBB_ENVIRONMENT', 'production'); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -if (version_compare(PHP_VERSION, '5.3.9') < 0) +if (version_compare(PHP_VERSION, '5.4') < 0) { - die('You are running an unsupported PHP version. Please upgrade to PHP 5.3.9 or higher before trying to install phpBB 3.1'); + die('You are running an unsupported PHP version. Please upgrade to PHP 5.4 or higher before trying to install phpBB 3.2'); } function phpbb_require_updated($path, $optional = false) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 0e223866b1..da6dcb085e 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -163,7 +163,7 @@ class install_install extends module // Test the minimum PHP version $php_version = PHP_VERSION; - if (version_compare($php_version, '5.3.9') < 0) + if (version_compare($php_version, '5.4') < 0) { $result = '<strong style="color:red">' . $lang['NO'] . '</strong>'; } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index a776a539ed..5d26e22423 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -301,10 +301,10 @@ $lang = array_merge($lang, array( 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', 'PHP_SAFE_MODE' => 'Safe mode', 'PHP_SETTINGS' => 'PHP version and settings', - 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.3.9 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', + 'PHP_SETTINGS_EXPLAIN' => '<strong>Required</strong> - You must be running at least version 5.4.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_URL_FOPEN_SUPPORT' => 'PHP setting <var>allow_url_fopen</var> is enabled', 'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.', - 'PHP_VERSION_REQD' => 'PHP version >= 5.3.9', + 'PHP_VERSION_REQD' => 'PHP version >= 5.4.0', 'POST_ID' => 'Post ID', 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.', 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', diff --git a/phpBB/language/en/install_new.php b/phpBB/language/en/install_new.php index 35153973de..5b3942c125 100644 --- a/phpBB/language/en/install_new.php +++ b/phpBB/language/en/install_new.php @@ -99,7 +99,7 @@ $lang = array_merge($lang, array( // Server requirements 'PHP_VERSION_REQD' => 'PHP version', - 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 5.3.9 or higher.', + 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 5.4.0 or higher.', 'PHP_GETIMAGESIZE_SUPPORT' => 'PHP getimagesize() function is required', 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index 175be4b0ab..8241091dc1 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -22,6 +22,6 @@ "classmap": [""] }, "require": { - "php": ">=5.3.9" + "php": ">=5.4" } } diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php index 50efdc55a2..62485a2097 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php +++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php @@ -95,7 +95,7 @@ class check_server_environment extends \phpbb\install\task_base { $php_version = PHP_VERSION; - if (version_compare($php_version, '5.3.9') < 0) + if (version_compare($php_version, '5.4') < 0) { $this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN'); diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 636d95f01e..0c40e85783 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -28,7 +28,7 @@ <!-- IF S_DISPLAY_JUMPBOX --> <div class="jumpbox dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox"> - <span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="button dropdown-trigger dropdown-select"> + <span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="button button-secondary dropdown-trigger dropdown-select"> <span><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF --></span> <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> </span> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 85d9b76c81..9ab0b8e4cc 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -100,7 +100,7 @@ <div class="postbody" id="pr{postrow.POST_ID}"> <ul class="post-buttons"> <li> - <a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button"> + <a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only"> <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span> </a> </li> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 136b3d2613..ddf461aa9f 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -91,10 +91,10 @@ <form action="{U_SEARCH}" method="get" id="search"> <fieldset> <input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" /> - <button class="button" type="submit" title="{L_SEARCH}"> + <button class="button button-search" type="submit" title="{L_SEARCH}"> <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> </button> - <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> </a> {S_SEARCH_HIDDEN_FIELDS} diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 98938d03da..e8483331f4 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,7 +1,7 @@ <ul> <!-- IF BASE_URL and TOTAL_PAGES > 6 --> <li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump"> - <a class="button" href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270" aria-hidden="true"></i><span class="sr-only">{PAGE_NUMBER}</span></a> + <a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270" aria-hidden="true"></i><span class="sr-only">{PAGE_NUMBER}</span></a> <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> @@ -16,13 +16,13 @@ <!-- ENDIF --> <!-- BEGIN pagination --> <!-- IF pagination.S_IS_PREV --> - <li class="arrow previous"><a class="button" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> + <li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> <!-- ELSEIF pagination.S_IS_CURRENT --> <li class="active"><span>{pagination.PAGE_NUMBER}</span></li> <!-- ELSEIF pagination.S_IS_ELLIPSIS --> <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> <!-- ELSEIF pagination.S_IS_NEXT --> - <li class="arrow next"><a class="button" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> + <li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> <!-- ELSE --> <li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index f553ed59f7..45290251a6 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -61,48 +61,48 @@ <!-- EVENT posting_editor_buttons_before --> <div id="format-buttons" class="format-buttons"> - <button type="button" class="button bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}"> + <button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}"> <i class="icon fa-bold fa-fw" aria-hidden="true"></i> </button> - <button type="button" class="button bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}"> + <button type="button" class="button button-icon-only bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}"> <i class="icon fa-italic fa-fw" aria-hidden="true"></i> </button> - <button type="button" class="button bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}"> + <button type="button" class="button button-icon-only bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}"> <i class="icon fa-underline fa-fw" aria-hidden="true"></i> </button> <!-- IF S_BBCODE_QUOTE --> - <button type="button" class="button bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}"> + <button type="button" class="button button-icon-only bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}"> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i> </button> <!-- ENDIF --> - <button type="button" class="button bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}"> + <button type="button" class="button button-icon-only bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}"> <i class="icon fa-code fa-fw" aria-hidden="true"></i> </button> - <button type="button" class="button bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}"> + <button type="button" class="button button-icon-only bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}"> <i class="icon fa-list fa-fw" aria-hidden="true"></i> </button> - <button type="button" class="button bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}"> + <button type="button" class="button button-icon-only bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}"> <i class="icon fa-list-ol fa-fw" aria-hidden="true"></i> </button> - <button type="button" class="button bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}"> + <button type="button" class="button button-icon-only bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}"> <i class="icon fa-asterisk fa-fw" aria-hidden="true"></i> </button> <!-- IF S_BBCODE_IMG --> - <button type="button" class="button bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}"> + <button type="button" class="button button-icon-only bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}"> <i class="icon fa-image fa-fw" aria-hidden="true"></i> </button> <!-- ENDIF --> <!-- IF S_LINKS_ALLOWED --> - <button type="button" class="button bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}"> + <button type="button" class="button button-icon-only bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}"> <i class="icon fa-link fa-fw" aria-hidden="true"></i> </button> <!-- ENDIF --> <!-- IF S_BBCODE_FLASH --> - <button type="button" class="button bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}"> + <button type="button" class="button button-icon-only bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}"> <i class="icon fa-flash fa-fw" aria-hidden="true"></i> </button> <!-- ENDIF --> - <button type="button" class="button bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}"> + <button type="button" class="button button-icon-only bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}"> <i class="icon fa-tint fa-fw" aria-hidden="true"></i> </button> <select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}"> @@ -120,7 +120,9 @@ <!-- EVENT posting_editor_buttons_custom_tags_before --> <!-- BEGIN custom_tags --> - <button type="button" class="button bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}"></button> + <button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}"> + {custom_tags.BBCODE_TAG} + </button> <!-- END custom_tags --> </div> <!-- EVENT posting_editor_buttons_after --> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 91ba6ef884..dae0095105 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -28,14 +28,14 @@ <ul class="post-buttons"> <!-- IF topic_review_row.U_MCP_DETAILS --> <li> - <a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button"> + <a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only"> <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span> </a> <li> <!-- ENDIF --> <!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE --> <li> - <a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button"> + <a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button button-icon-only"> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE} {topic_review_row.POST_AUTHOR}</span> </a> </li> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index d6eb4891ec..8e3ff31376 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -31,10 +31,10 @@ <form method="post" action="{S_SEARCH_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" /> - <button class="button" type="submit" title="{L_SEARCH}"> + <button class="button button-search" type="submit" title="{L_SEARCH}"> <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> </button> - <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> </a> </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index 57f6cf14b5..e97befc552 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -25,7 +25,7 @@ <!-- EVENT ucp_pm_history_post_buttons_before --> <!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE --> <li> - <a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button"> + <a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button button-icon-only"> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span> </a> </li> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index c49649e619..6ad9e9cab6 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -31,7 +31,7 @@ <!-- IF not S_IS_BOT and U_PRINT_PM --> <div class="dropdown-container dropdown-button-control topic-tools"> - <span title="{L_PM_TOOLS}" class="button dropdown-trigger dropdown-select"> + <span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select"> <i class="icon fa-wrench fa-fw" aria-hidden="true"></i> <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> </span> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index d9713594ca..59317da8f7 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -90,28 +90,28 @@ <!-- EVENT ucp_pm_viewmessage_post_buttons_before --> <!-- IF U_EDIT --> <li> - <a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button"> + <a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only"> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_EDIT_PM}</span> </a> </li> <!-- ENDIF --> <!-- IF U_DELETE --> <li> - <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button"> + <a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only"> <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_MESSAGE}</span> </a> </li> <!-- ENDIF --> <!-- IF U_REPORT --> <li> - <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button"> + <a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only"> <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_PM}</span> </a> </li> <!-- ENDIF --> <!-- IF U_QUOTE --> <li> - <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button"> + <a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only"> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_QUOTE_PM}</span> </a> </li> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 13254e36f7..e99c98fb1b 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -55,11 +55,11 @@ <form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" /> - <button class="button" type="submit" title="{L_SEARCH}"> - <i class="icon fa-search fa-fw" aria-hidden="true"></i><span>{L_SEARCH}</span> + <button class="button button-search" type="submit" title="{L_SEARCH}"> + <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> </button> - <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> - <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span>{L_SEARCH_ADV}</span> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> + <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} </fieldset> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 9498db8698..8d7af4e434 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -48,10 +48,10 @@ <form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}"> <fieldset> <input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" /> - <button class="button" type="submit" title="{L_SEARCH}"> + <button class="button button-search" type="submit" title="{L_SEARCH}"> <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> </button> - <a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}"> + <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> <i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> </a> {S_SEARCH_LOCAL_HIDDEN_FIELDS} @@ -232,43 +232,73 @@ <!-- EVENT viewtopic_body_post_buttons_before --> <!-- IF postrow.U_EDIT --> <li> +<<<<<<< HEAD + <a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button button-icon-only"> + <i class="icon fa-pencil fa-fw"></i><span class="sr-only">{L_BUTTON_EDIT}</span> +======= <a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button"> <i class="icon fa-pencil fa-fw" aria-hidden="true"></i><span class="sr-only">{L_BUTTON_EDIT}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> <!-- IF postrow.U_DELETE --> <li> +<<<<<<< HEAD + <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only"> + <i class="icon fa-times fa-fw"></i><span class="sr-only">{L_DELETE_POST}</span> +======= <a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button"> <i class="icon fa-times fa-fw" aria-hidden="true"></i><span class="sr-only">{L_DELETE_POST}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> <!-- IF postrow.U_REPORT --> <li> +<<<<<<< HEAD + <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only"> + <i class="icon fa-exclamation fa-fw"></i><span class="sr-only">{L_REPORT_POST}</span> +======= <a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button"> <i class="icon fa-exclamation fa-fw" aria-hidden="true"></i><span class="sr-only">{L_REPORT_POST}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> <!-- IF postrow.U_WARN --> <li> +<<<<<<< HEAD + <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only"> + <i class="icon fa-exclamation-triangle fa-fw"></i><span class="sr-only">{L_WARN_USER}</span> +======= <a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button"> <i class="icon fa-exclamation-triangle fa-fw" aria-hidden="true"></i><span class="sr-only">{L_WARN_USER}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> <!-- IF postrow.U_INFO --> <li> +<<<<<<< HEAD + <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only"> + <i class="icon fa-info fa-fw"></i><span class="sr-only">{L_INFORMATION}</span> +======= <a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button"> <i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_INFORMATION}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> <!-- IF postrow.U_QUOTE --> <li> +<<<<<<< HEAD + <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only"> + <i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_QUOTE}</span> +======= <a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button"> <i class="icon fa-quote-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUOTE}</span> +>>>>>>> hanakin/ticket/14199 </a> </li> <!-- ENDIF --> @@ -405,9 +435,15 @@ <!-- IF .quickmod --> <div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod"> +<<<<<<< HEAD + <span title="{L_QUICK_MOD}" class="button button-secondary dropdown-trigger dropdown-select"> + <i class="icon fa-gavel fa-fw"></i><span class="sr-only">{L_QUICK_MOD}</span> + <span class="caret"><i class="icon fa-sort-down fa-fw"></i></span> +======= <span title="{L_QUICK_MOD}" class="button dropdown-trigger dropdown-select"> <i class="icon fa-gavel fa-fw" aria-hidden="true"></i><span class="sr-only">{L_QUICK_MOD}</span> <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> +>>>>>>> hanakin/ticket/14199 </span> <div class="dropdown"> <div class="pointer"><div class="pointer-inner"></div></div> diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 12f8648acf..96c514f1d9 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -1,6 +1,6 @@ <!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) --> <div class="dropdown-container dropdown-button-control topic-tools"> - <span title="{L_PM_TOOLS}" class="button dropdown-trigger dropdown-select"> + <span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select"> <i class="icon fa-wrench fa-fw" aria-hidden="true"></i> <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> </span> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 4a9a5bc1bc..ca7982b456 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -907,17 +907,17 @@ li.breadcrumbs span:first-child > a { padding: 3px; } -.rtl .search-box .button { +.rtl .button-search, +.button-search-end { float: right; } -.rtl .search-box a.button { +.button-search-end { border-left-width: 1px; border-right-width: 0; - border-radius: 4px 0 0 4px; } -.rtl .search-header a.button { +.rtl .search-header .button-search-end { border: 0; } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 57a08491e1..726639ff92 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -25,6 +25,7 @@ .button:focus, .button:hover { text-decoration: none; + outline: none; } .caret { @@ -37,6 +38,37 @@ vertical-align: top; } +/* Posting page styles +----------------------------------------*/ +.button-search, +.button-search-end { + float: left; + border-radius: 0; + margin: 0; + padding: 2px 5px; +} + +.button-search-end { + border-left-width: 0; + border-radius: 0 4px 4px 0; +} + +.search-header .button-search, +.search-header .button-search-end { + border-top-width: 0; + border-bottom-width: 0; + padding: 3px 5px; +} + +.search-header .button-search-end { + border-right-width: 0; +} + +.button-icon-only { + padding-left: 3px; + padding-right: 3px; +} + /* Poster contact icons ----------------------------------------*/ .contact-icons.dropdown-contents { diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 852a2843fd..b145a75ace 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -606,7 +606,8 @@ Colours and backgrounds for buttons.css color: #D31141; } -.button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select { +.button:hover, +.button:focus { border-color: #0A8ED0; background-color: #FFFFFF; /* Old browsers */ /* FF3.6+ */ background-image: -webkit-linear-gradient(top, #E9E9E9 0%, #FFFFFF 100%); @@ -615,34 +616,26 @@ Colours and backgrounds for buttons.css text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2); } -.button i { - color: #8f8f8f; -} -.button:focus i, -.button:hover i { - color: #1878cb; +.button .icon, +.button-secondary { + color: #8f8f8f; } -.caret { border-color: #DADADA; } -.caret { border-color: #C7C3BF; } - -.jumpbox .button, .jumpbox .button i { - color: #536482; +.button-secondary:focus, +.button-secondary:hover, +.button:focus .icon, +.button:hover .icon { + color: #0A8ED0; } -.jumpbox .button:hover { +.button-search:hover, +.button-search-end:hover { border-color: #C7C3BF; } -.jumpbox .button:hover i { - color: #536482; -} - -.dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select { - border-color: #A6B2BA; - color: #105289; -} +.caret { border-color: #DADADA; } +.caret { border-color: #C7C3BF; } .contact-icons a { border-color: #DCDCDC; } .contact-icons a:hover { background-color: #F2F6F9; } @@ -683,9 +676,7 @@ Colours and backgrounds for buttons.css .search-box .inputbox, .search-box .inputbox:hover, -.search-box .inputbox:focus, -.search-box .button:focus, -.search-box .button:hover { +.search-box .inputbox:focus { border-color: #C7C3BF; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 78321878c2..219603a969 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -441,12 +441,12 @@ ul.linklist.bulletin > li.no-bulletin:before { .dropdown .pointer { right: auto; left: 10px; - top: 0; + top: -1px; z-index: 3; } .dropdown-up .pointer { - bottom: 0; + bottom: -1px; top: auto; } @@ -803,6 +803,10 @@ fieldset.fields1 dl.pmlist dd.recipients { float: left; } +.action-bar .button-search { + margin-right: 0; +} + /* Pagination ---------------------------------------- */ .pagination { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index fbea5f3a72..371a56fca5 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -142,6 +142,12 @@ dd textarea { width: 95%; } +/* Browser-specific tweaks */ +button::-moz-focus-inner { + padding: 0; + border: 0 +} + /* Quick-login on index page */ fieldset.quick-login { margin-top: 5px; @@ -378,22 +384,6 @@ input.button1:focus, input.button2:focus, input.button3:focus { box-sizing: border-box; } -.search-box .button { - float: left; - border-radius: 0; - margin: 0; - padding: 2px 5px; -} - -.search-box a.button { - border-left-width: 0; - border-radius: 0 4px 4px 0; -} - -.search-box .button span { - font-size: 0; -} - /* Search box (header) --------------------------------------------- */ .search-header { @@ -406,12 +396,6 @@ input.button1:focus, input.button2:focus, input.button3:focus { .search-header .inputbox { border: 0; } -.search-header .button { - border-top-width: 0; - border-bottom-width: 0; - padding: 3px 5px; -} - .navbar .linklist > li.responsive-search { display: none; } input.search { diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index b5ed02b5e7..45d7adacb9 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -39,6 +39,11 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case { global $config, $phpbb_root_path, $phpEx, $phpbb_filesystem; + if (!@extension_loaded('gd')) + { + $this->markTestSkipped('Thumbnail tests require gd extension.'); + } + parent::setUp(); $config = $this->config = new \phpbb\config\config(array( diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index e1a1625d18..4ec037e6ce 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -12,10 +12,11 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 -root="$3" +NOTESTS=$3 +root="$4" path="${root}phpBB/" -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then # Check the permissions of the files diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index df13c5f4e2..05c7de2d27 100755 --- a/travis/check-image-icc-profiles.sh +++ b/travis/check-image-icc-profiles.sh @@ -12,8 +12,9 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh index 84976a7666..4cc2cee525 100755 --- a/travis/check-sami-parse-errors.sh +++ b/travis/check-sami-parse-errors.sh @@ -12,8 +12,9 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then # Workarounds for # https://github.com/fabpot/Sami/issues/116 diff --git a/travis/ext-sniff.sh b/travis/ext-sniff.sh index 4e557a41c1..61ceda6834 100755 --- a/travis/ext-sniff.sh +++ b/travis/ext-sniff.sh @@ -10,7 +10,7 @@ # set -e set -x - + DB=$1 TRAVIS_PHP_VERSION=$2 EXTNAME=$3 diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh index 660d1764c2..3f43b64130 100755 --- a/travis/phing-sniff.sh +++ b/travis/phing-sniff.sh @@ -13,8 +13,9 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then cd build ../phpBB/vendor/bin/phing sniff diff --git a/travis/setup-database.sh b/travis/setup-database.sh index 4ba9157d9d..3771f19073 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -13,6 +13,12 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 + +if [ "$NOTESTS" == '1' ] +then + exit 0 +fi if [ "$DB" == "postgres" ] then @@ -20,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 369c477860..30f79ee0cb 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -13,8 +13,9 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 +NOTESTS=$3 -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then travis/setup-exiftool.sh travis/setup-unbuffer.sh @@ -25,12 +26,12 @@ then travis/setup-mariadb.sh fi -if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] +if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ] then travis/setup-php-extensions.sh fi -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ] +if [ "$NOTESTS" != '1' ] then travis/setup-webserver.sh travis/install-phpbb-test-dependencies.sh |