* Update NoLocalSettings.php for the new installer. Stop advising users to move Local...

[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index ce0927f..3492ca8 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -9,20 +9,20 @@
 /**
  * Output class modelled on OutputPage.
  *
- * I've opted to use a distinct class rather than derive from OutputPage here in
- * the interests of separation of concerns: if we used a subclass, there would be
- * quite a lot of things you could do in OutputPage that would break the installer,
- * that wouldn't be immediately obvious.
- *
+ * I've opted to use a distinct class rather than derive from OutputPage here in 
+ * the interests of separation of concerns: if we used a subclass, there would be 
+ * quite a lot of things you could do in OutputPage that would break the installer, 
+ * that wouldn't be immediately obvious. 
+ * 
  * @ingroup Deployment
  * @since 1.17
  */
 class WebInstallerOutput {
        /**
         * The WebInstaller object this WebInstallerOutput is used by.
-        *
+        * 
         * @var WebInstaller
-        */
+        */     
        public $parent;
 
        /**
@@ -47,7 +47,7 @@ class WebInstallerOutput {
 
        /**
         * Constructor.
-        *
+        * 
         * @param $parent WebInstaller
         */
        public function __construct( WebInstaller $parent ) {
@@ -85,18 +85,22 @@ class WebInstallerOutput {
         * @return String
         */
        public function getCSS( $dir ) {
-               $vectorCssFile = dirname( dirname( dirname( __FILE__ ) ) ) .
-                       '/skins/vector/screen.css';
+               $skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins';
+               $vectorCssFile = "$skinDir/vector/screen.css";
+               $configCssFile = "$skinDir/common/config.css";
                wfSuppressWarnings();
-               $css = file_get_contents( $vectorCssFile );
+               $vectorCss = file_get_contents( $vectorCssFile );
+               $configCss = file_get_contents( $configCssFile );
                wfRestoreWarnings();
-               if( !$css ) {
-                       return "/** Your webserver cannot read $vectorCssFile, please check file permissions */";
-               } elseif( $dir == 'rtl' ) {
-                       return CSSJanus::transform( $css, true );
-               } else {
-                       return $css;
+               if( !$vectorCss || !$configCss ) {
+                       $css = "/** Your webserver cannot read $vectorCssFile or $configCssFile, please check file permissions */";
+               }
+
+               $css .= str_replace( 'images/', '../skins/vector/images/', $vectorCss ) . "\n" . str_replace( 'images/', '../skins/common/images/', $configCss );
+               if( $dir == 'rtl' ) {
+                       $css = CSSJanus::transform( $css, true );
                }
+               return $css;
        }
 
        /**
@@ -176,10 +180,8 @@ class WebInstallerOutput {
        <title><?php $this->outputTitle(); ?></title>
        <?php echo Html::linkedStyle( '../skins/common/shared.css' ) . "\n"; ?>
        <?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?>
-       <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
        <?php echo Html::inlineScript(  "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?>
        <?php echo $this->getJQuery() . "\n"; ?>
-       <?php echo $this->getJQueryTipsy() . "\n"; ?>
        <?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?>
 </head>
 
@@ -190,8 +192,8 @@ class WebInstallerOutput {
 .config-show-help { display: none; }
 </style>
 </noscript>
-<div id="mw-page-base">
-<div id="mw-head-base">
+<div id="mw-page-base"></div>
+<div id="mw-head-base"></div>
 <div id="content">
 <div id="bodyContent">
 
@@ -208,25 +210,23 @@ class WebInstallerOutput {
                }
 ?>
 
-</div></div></div>
+</div></div>
 
 
-<div id="column-one">
-       <div class="portlet" id="p-logo">
+<div id="mw-panel">
+       <div class="portal" id="p-logo">
          <a style="background-image: url(../skins/common/images/mediawiki.png);"
            href="http://www.mediawiki.org/"
            title="Main Page"></a>
        </div>
        <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
-       <div class='portlet'><div class='pBody'>
+       <div class="portal"><div class="body">
 <?php
        echo $this->parent->parse( wfMsgNoTrans( 'config-sidebar' ), true );
 ?>
        </div></div>
 </div>
 
-</div>
-
 </body>
 </html>
 <?php
@@ -240,9 +240,7 @@ class WebInstallerOutput {
        <meta name="robots" content="noindex, nofollow" />
        <title><?php $this->outputTitle(); ?></title>
        <?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?>
-       <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
        <?php echo $this->getJQuery(); ?>
-       <?php echo $this->getJQueryTipsy() . "\n"; ?>
        <?php echo Html::linkedScript( '../skins/common/config.js' ); ?>
 </head>
 
@@ -258,7 +256,10 @@ class WebInstallerOutput {
        public function getJQuery() {
                return Html::linkedScript( "../resources/jquery/jquery.js" );
        }
-       public function getJQueryTipsy() {
-               return Html::linkedScript( "../resources/jquery/jquery.tipsy.js" );
+
+       public function outputWarnings() {
+               $this->addHTML( $this->warnings );
+               $this->warnings = '';
        }
+       
 }