From: jenkins-bot Date: Tue, 13 May 2014 20:43:47 +0000 (+0000) Subject: Merge "Installer: Minor tweaks to UI" X-Git-Tag: 1.31.0-rc.0~15726 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=6125d3fbf7bb046d2765d3ef058ea984871ca36c;hp=39fbea0e5b82ea0def5a550e723e5ee1ad71b7c0;p=lhc%2Fweb%2Fwiklou.git Merge "Installer: Minor tweaks to UI" --- diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index d8975073c7..304508c4b6 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -702,8 +702,8 @@ class WebInstaller extends Installer { $html = $this->parse( $text, true ); return "
\n" . - "" . wfMessage( 'config-help' )->escaped() . - "\n" . + "escaped() . "\">" . + wfMessage( 'config-help' )->escaped() . "\n" . "" . $html . "\n" . "
\n"; } @@ -1117,14 +1117,10 @@ class WebInstaller extends Installer { * @return string Html for download link */ public function downloadLinkHook( $text, $attribs, $parser ) { - $img = Html::element( 'img', array( - 'src' => '../skins/common/images/download-32.png', - 'width' => '32', - 'height' => '32', - ) ); $anchor = Html::rawElement( 'a', array( 'href' => $this->getURL( array( 'localsettings' => 1 ) ) ), - $img . ' ' . wfMessage( 'config-download-localsettings' )->parse() ); + wfMessage( 'config-download-localsettings' )->parse() + ); return Html::rawElement( 'div', array( 'class' => 'config-download-link' ), $anchor ); } @@ -1161,4 +1157,4 @@ class WebInstaller extends Installer { return WebRequest::detectServer(); } -} +} \ No newline at end of file diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json index 8cd06ed00f..b19bdc0c6a 100644 --- a/includes/installer/i18n/en.json +++ b/includes/installer/i18n/en.json @@ -117,7 +117,7 @@ "config-db-schema-help": "This schema will usually be fine.\nOnly change it if you know you need to.", "config-pg-test-error": "Cannot connect to database $1: $2", "config-sqlite-dir": "SQLite data directory:", - "config-sqlite-dir-help": "SQLite stores all data in a single file.\n\nThe directory you provide must be writable by the webserver during installation.\n\nIt should not be accessible via the web, this is why we're not putting it where your PHP files are.\n\nThe installer will write a .htaccess file along with it, but if that fails someone can gain access to your raw database.\nThat includes raw user data (email addresses, hashed passwords) as well as deleted revisions and other restricted data on the wiki.\n\nConsider putting the database somewhere else altogether, for example in /var/lib/mediawiki/yourwiki.", + "config-sqlite-dir-help": "SQLite stores all data in a single file.\n\nThe directory you provide must be writable by the webserver during installation.\n\nIt should not be accessible via the web; this is why we're not putting it where your PHP files are.\n\nThe installer will write a .htaccess file along with it, but if that fails someone can gain access to your raw database.\nThat includes raw user data (email addresses, hashed passwords) as well as deleted revisions and other restricted data on the wiki.\n\nConsider putting the database somewhere else altogether, for example in /var/lib/mediawiki/yourwiki.", "config-oracle-def-ts": "Default tablespace:", "config-oracle-temp-ts": "Temporary tablespace:", "config-type-mysql": "MySQL (or compatible)", @@ -308,6 +308,7 @@ "config-install-done": "Congratulations!\nYou have successfully installed MediaWiki.\n\nThe installer has generated a LocalSettings.php file.\nIt contains all your configuration.\n\nYou will need to download it and put it in the base of your wiki installation (the same directory as index.php). The download should have started automatically.\n\nIf the download was not offered, or if you cancelled it, you can restart the download by clicking the link below:\n\n$3\n\nNote: If you do not do this now, this generated configuration file will not be available to you later if you exit the installation without downloading it.\n\nWhen that has been done, you can [$2 enter your wiki].", "config-download-localsettings": "Download LocalSettings.php", "config-help": "help", + "config-help-tooltip": "click to expand", "config-nofile": "File \"$1\" could not be found. Has it been deleted?", "config-extension-link": "Did you know that your wiki supports [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions extensions]?\n\nYou can browse [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category extensions by category] or the [//www.mediawiki.org/wiki/Extension_Matrix Extension Matrix] to see the full list of extensions.", "mainpagetext": "MediaWiki has been successfully installed.", diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json index 67bc5af336..3a160793a3 100644 --- a/includes/installer/i18n/qqq.json +++ b/includes/installer/i18n/qqq.json @@ -326,6 +326,7 @@ "config-install-done": "Parameters:\n* $1 is the URL to LocalSettings download\n* $2 is a link to the wiki.\n* $3 is a download link with attached download icon. The config-download-localsettings message will be used as the link text.", "config-download-localsettings": "The link text used in the download link in config-install-done.", "config-help": "This is used in help boxes.\n{{Identical|Help}}", + "config-help-tooltip": "Tooltip for the 'help' links ({{msg-mw|config-help}}), to make it clear they'll expand in place rather than open a new page", "config-nofile": "Used as failure message. Parameters:\n* $1 - filename", "config-extension-link": "Shown on last page of installation to inform about possible extensions.", "mainpagetext": "Along with {{msg-mw|mainpagedocfooter}}, the text you will see on the Main Page when your wiki is installed.", diff --git a/skins/common/config.css b/skins/common/config.css index e1f7a83854..2f8e1e2931 100644 --- a/skins/common/config.css +++ b/skins/common/config.css @@ -144,6 +144,14 @@ margin-left: 2em; } +.config-download-link a { + background: url(images/download-32.png) no-repeat center left; + padding-left: 40px; /* 32 px for the image (above), plus some breathing room */ + height: 32px; /* provide enough vertical room for the image */ + display: inline-block; /* allow the height property (above) to work */ + line-height: 32px; /* center the text vertically */ +} + #config-live-log { overflow: hidden; min-width: 20em;