Merge activity plugin into mainline

[quix0rs-gnu-social.git] / install.php
diff --git a/install.php b/install.php

index 9b0d19882cf5e4f3e4af9507230490eef9ca6f31..5cb46e27d2ae9234fa5d41afa2199d64ad037208 100644 (file)
--- a/install.php
+++ b/install.php
@@ -335,10 +335,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      <head>
          <title>Install StatusNet</title>
         <link rel="shortcut icon" href="favicon.ico"/>
-        <link rel="stylesheet" type="text/css" href="theme/default/css/display.css" media="screen, projection, tv"/>
+        <link rel="stylesheet" type="text/css" href="theme/base/css/display.css" media="screen, projection, tv"/>
+        <link rel="stylesheet" type="text/css" href="theme/neo/css/display.css" media="screen, projection, tv"/>
          <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css" /><![endif]-->
          <!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css" /><![endif]-->
-        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/default/css/ie.css" /><![endif]-->
+        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/neo/css/ie.css" /><![endif]-->
          <script src="js/jquery.min.js"></script>
          <script src="js/install.js"></script>
      </head>
@@ -347,12 +348,18 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
              <div id="header">
                  <address id="site_contact" class="vcard">
                      <a class="url home bookmark" href=".">
-                        <img class="logo photo" src="theme/default/logo.png" alt="StatusNet"/>
+                        <img class="logo photo" src="theme/neo/logo.png" alt="StatusNet"/>
                          <span class="fn org">StatusNet</span>
                      </a>
                  </address>
+                <div id="site_nav_global_primary"></div>
              </div>
              <div id="core">
+             <div id="aside_primary_wrapper">
+              <div id="content_wrapper">
+               <div id="site_nav_local_views_wrapper">
+                <div id="site_nav_local_views"></div>
+                
                  <div id="content">
                       <div id="content_inner">
                          <h1>Install StatusNet</h1>
@@ -362,7 +369,13 @@ $installer->main();
  ?>
                     </div>
                  </div>
+
+                <div id="aside_primary" class="aside"></div>
+               </div>
+              </div>
+             </div>
              </div>
+            <div id="footer"></div>
          </div>
      </body>
  </html>