From fb8340fb5429e632841b0be66d63dbdc512382ca Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 1 May 2009 03:50:24 +0000
Subject: [PATCH] Added laconica logo Updated installation page markup

---
 install.php            | 161 ++++++++++++++++++++++++-----------------
 theme/default/logo.png | Bin 0 -> 2228 bytes
 2 files changed, 93 insertions(+), 68 deletions(-)
 create mode 100644 theme/default/logo.png

diff --git a/install.php b/install.php
index 87a99a6508..66e8e87124 100644
--- a/install.php
+++ b/install.php
@@ -52,23 +52,21 @@ function checkPrereqs()
 
     foreach ($reqs as $req) {
         if (!checkExtension($req)) {
-            ?><p class="error">Cannot load required extension &quot;<?php echo $req; ?>&quot;.</p><?php
+            ?><p class="error">Cannot load required extension: <code><?php echo $req; ?></code></p><?php
 		    return false;
         }
     }
 
 	if (!is_writable(INSTALLDIR)) {
-         ?><p class="error">Cannot write config file to &quot;<?php echo INSTALLDIR; ?>&quot;.</p>
-	       <p>On your server, try this command:</p>
-	       <blockquote>chmod a+w <?php echo INSTALLDIR; ?></blockquote>
+         ?><p class="error">Cannot write config file to: <code><?php echo INSTALLDIR; ?></code></p>
+	       <p>On your server, try this command: <code>chmod a+w <?php echo INSTALLDIR; ?></code>
          <?php
 	     return false;
 	}
 
 	if (!is_writable(INSTALLDIR.'/avatar/')) {
-         ?><p class="error">Cannot write avatar directory &quot;<?php echo INSTALLDIR; ?>/avatar/&quot;.</p>
-	       <p>On your server, try this command:</p>
-	       <blockquote>chmod a+w <?php echo INSTALLDIR; ?>/avatar/</blockquote>
+         ?><p class="error">Cannot write avatar directory: <code><?php echo INSTALLDIR; ?>/avatar/</code></p>
+	       <p>On your server, try this command: <code>chmod a+w <?php echo INSTALLDIR; ?>/avatar/</code></p>
          <?
 	     return false;
 	}
@@ -89,65 +87,78 @@ function checkExtension($name)
 function showForm()
 {
 ?>
-<p>Enter your database connection information below to initialize the database.</p>
-<form method='post' action='install.php'>
-	<fieldset>
-	<ul class='form_data'>
-	<li>
-	<label for='sitename'>Site name</label>
-	<input type='text' id='sitename' name='sitename' />
-	<p>The name of your site</p>
-	</li>
-	<li>
-	<li>
-	<label for='host'>Hostname</label>
-	<input type='text' id='host' name='host' />
-	<p>Database hostname</p>
-	</li>
-	<li>
-	<label for='host'>Database</label>
-	<input type='text' id='database' name='database' />
-	<p>Database name</p>
-	</li>
-	<li>
-	<label for='username'>Username</label>
-	<input type='text' id='username' name='username' />
-	<p>Database username</p>
-	</li>
-	<li>
-	<label for='password'>Password</label>
-	<input type='password' id='password' name='password' />
-	<p>Database password</p>
-	</li>
-	</ul>
-	<input type='submit' name='submit' value='Submit'>
-	</fieldset>
+        </ul>
+    </dd>
+</dl>
+<dl id="page_notice" class="system_notice">
+    <dt>Page notice</dt>
+    <dd>
+        <div class="instructions">
+            <p>Enter your database connection information below to initialize the database.</p>
+        </div>
+    </dd>
+</dl>
+<form method="post" action="install.php" class="form_settings" id="form_install">
+    <fieldset>
+        <legend>Connection settings</legend>
+        <ul class="form_data">
+            <li>
+                <label for="sitename">Site name</label>
+                <input type="text" id="sitename" name="sitename" />
+                <p class="form_guide">The name of your site</p>
+            </li>
+            <li>
+            <li>
+                <label for="host">Hostname</label>
+                <input type="text" id="host" name="host" />
+                <p class="form_guide">Database hostname</p>
+            </li>
+            <li>
+                <label for="host">Database</label>
+                <input type="text" id="database" name="database" />
+                <p class="form_guide">Database name</p>
+            </li>
+            <li>
+                <label for="username">Username</label>
+                <input type="text" id="username" name="username" />
+                <p class="form_guide">Database username</p>
+            </li>
+            <li>
+                <label for="password">Password</label>
+                <input type="password" id="password" name="password" />
+                <p class="form_guide">Database password</p>
+            </li>
+        </ul>
+        <input type="submit" name="submit" class="submit" value="Submit" />
+    </fieldset>
 </form>
-<?
+<?php
 }
 
 function updateStatus($status, $error=false)
 {
 ?>
-	<li>
-<?
-    print $status;
-?>
-	</li>
-<?
+                <li <?php echo ($error) ? 'class="error"': ''; ?>><?print $status;?></li>
+
+<?php
 }
 
 function handlePost()
 {
 ?>
-	<ul>
-<?
+
+<?php
     $host = $_POST['host'];
     $database = $_POST['database'];
     $username = $_POST['username'];
     $password = $_POST['password'];
     $sitename = $_POST['sitename'];
-
+?>
+    <dl class="system_notice">
+        <dt>Page notice</dt>
+        <dd>
+            <ul>
+<?php
     if (empty($host)) {
         updateStatus("No hostname specified.", true);
         showForm();
@@ -222,8 +233,8 @@ function handlePost()
     }
     updateStatus("Done!");
 ?>
-	</ul>
-<?
+
+<?php
 }
 
 function writeConf($sitename, $sqlUrl)
@@ -253,21 +264,35 @@ function runDbScript($filename, $conn)
 }
 
 ?>
-<html>
-<head>
-	<title>Install Laconica</title>
-	<link rel="stylesheet" type="text/css" href="theme/base/css/display.css?version=0.7.1" media="screen, projection, tv"/>
-	<link rel="stylesheet" type="text/css" href="theme/base/css/modal.css?version=0.7.1" media="screen, projection, tv"/>
-	<link rel="stylesheet" type="text/css" href="theme/default/css/display.css?version=0.7.1" media="screen, projection, tv"/>
-</head>
-<body>
-	<div id="wrap">
-	<div id="core">
-	<div id="content">
-	<h1>Install Laconica</h1>
+<?php echo"<?"; ?> xml version="1.0" encoding="UTF-8" <?php echo "?>"; ?>
+<!DOCTYPE html
+PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
+    <head>
+        <title>Install Laconica</title>
+        <link rel="stylesheet" type="text/css" href="theme/base/css/display.css?version=0.8" media="screen, projection, tv"/>
+        <link rel="stylesheet" type="text/css" href="theme/default/css/display.css?version=0.8" media="screen, projection, tv"/>
+        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css?version=0.8" /><![endif]-->
+        <!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css?version=0.8" /><![endif]-->
+        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/earthy/css/ie.css?version=0.8" /><![endif]-->
+    </head>
+    <body id="install">
+        <div id="wrap">
+            <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="Laconica"/>
+                        <span class="fn org">Laconica</span>
+                    </a>
+                </address>
+            </div>
+            <div id="core">
+                <div id="content">
+                    <h1>Install Laconica</h1>
 <?php main(); ?>
-	</div>
-	</div>
-	</div>
-</body>
+                </div>
+            </div>
+        </div>
+    </body>
 </html>
diff --git a/theme/default/logo.png b/theme/default/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdead6c4a0a23614552329ee68bb0860b0200a0c
GIT binary patch
literal 2228
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
C#trrW

literal 0
HcmV?d00001