Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.

3 files changed, 44 insertions, 20 deletions

diff --git a/installer/install.css b/installer/install.css
index 513d502f..e132b80d 100644
--- a/installer/install.css
+++ b/installer/install.css
@@ -4,10 +4,14 @@ h1, h2, h3 {
 
 body {
     background: #eee;
-    font-family: Trebuchet MS;
+    font-family: Trebuchet MS, Verdana;
     font-size: 1.1em;
 }
 
+em {
+  font-style: italic;
+}
+
 div#outer {
     width: 650px;
     background: white;
@@ -47,11 +51,14 @@ fieldset {
     border: 0px;
     padding-left: 0px;
     margin-top: 1em;
+    border: 1px solid #ccc;
+    padding: 8px;
 }
 
 fieldset legend {
     font-weight: bold;
-    padding-left: 0px;
+    margin: 8px;
+    padding: 2px;
 }
 
 table#db_info {
@@ -66,6 +73,9 @@ code {
   background: #eee;
   border: 1px solid #bbb;
   padding: 2px;
+  display: block;
+  width: 200px;
+  margin: 4px 4px 4px 20px;
 }
 
 code.location {
@@ -74,3 +84,9 @@ code.location {
   padding: 4px;
   width: auto;
 }
+
+span.subtext {
+  font-size: .7em;
+  color: #999;
+}
+
diff --git a/installer/install.sql b/installer/install.sql
index c6314aa7..7440cc8f 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -244,10 +244,10 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',34,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',37,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
-INSERT INTO {modules} VALUES (4,1,'organize',1,4);
+INSERT INTO {modules} VALUES (4,1,'organize',2,4);
 INSERT INTO {modules} VALUES (5,1,'info',1,5);
 INSERT INTO {modules} VALUES (6,1,'rest',3,6);
 INSERT INTO {modules} VALUES (7,1,'rss',1,7);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -412,10 +412,16 @@ INSERT INTO {vars} VALUES (NULL,'gallery','simultaneous_upload_limit','5');
 INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
+INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','date_time_format','Y-M-d H:i:s');
+INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico');
 INSERT INTO {vars} VALUES (NULL,'gallery','date_format','Y-M-d');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_center','a:3:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}}');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_from','admin@example.com');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','public@example.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:9;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:10;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:11;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:12;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
diff --git a/installer/views/get_db_info.html.php b/installer/views/get_db_info.html.php
index ada0793c..9fc1accd 100644
--- a/installer/views/get_db_info.html.php
+++ b/installer/views/get_db_info.html.php
@@ -1,25 +1,27 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<h1> Welcome! </h1>
+<h1> Let's get going! </h1>
 <p>
-  Installing Gallery is very easy.  We just need to know how to talk
-  to your MySQL database, and we need a place to store your photos on
-  your web host.
+  Installing Gallery is easy.  We just need a place to put your photos
+  and info about your MySQL database.
 </p>
 
 
-<fieldset>
+<fieldset class="<?= installer::var_writable() ? 'success' : 'error' ?>">
   <legend>Photo Storage</legend>
   <?php if (!installer::var_writable()): ?>
-  <p class="error">
+  <p>
     We're having trouble creating a place for your photos.  Can you
-    help?  Please create a directory called "var" using <code>mkdir var</code> in your
-    gallery3 directory, then run <code>chmod 777 var</code>.  That
-    should fix it.
-    <br/><br/>
+    help?  We need you to create a directory called <em>var</em> in
+    your gallery3 directory.  This sample code works for most users.
+    Run it in the gallery3 directory:
+    <code>
+      mkdir var<br>
+      chmod 777 var
+    </code>
     <a href="index.php">Check again</a>
   </p>
   <?php else: ?>
-  <p class="success">
+  <p>
     We've found a place to store your photos:
     <code class="location"> <?= VARPATH ?> </code>
   </p>
@@ -31,14 +33,14 @@
   <fieldset>
     <legend>Database</legend>
     <p>
-      We've provided values that work for most common web hosts.  If
-      you have problems, contact your web host for help.
+      Gallery 3 needs a MySQL database.  The values provided work for
+      most setups, so if you're confused try clicking <i>continue</i>.
     </p>
     <br/>
     <table id="db_info">
       <tr>
         <td>
-          Database Name
+          Database name
         </td>
         <td>
           <input name="dbname" value="gallery3"/>
@@ -70,7 +72,7 @@
       </tr>
       <tr>
         <td>
-          Table Prefix
+          Table prefix <span class="subtext">(optional)</span>
         </td>
         <td>
           <input name="prefix" value=""/>