css color changes and updated install directions

README.md

@@ -19,9 +19,25 @@ Improvements:
 
 And of course now that we are on GitHub contributions and collaboration should be must easier.  Look forward to anyone with some skills to jump in and keep this moving.
 
-<h2>Fresh Installation</h2>
-<hr/>
+<h2>Installation</h2>
+<p>
+There are two ways to install PHPRecipebook. The first option is to use Git to get the code.  This option will allow for very easy upgrades but a little more 
+upfront effort. The second option is to simply download the tar.gz file and extract.  This option is very easy upfront but upgrades will require 
+more effort copying files around.
+</p>
+
+<h3>Git Install Option</h3>
+* Clone /PHPRecipbook repository (not the PHPRecipebook-Downloads).
+* Get PHP Composer installed. https://getcomposer.org/download/.  Composer is used to manage dependencies and make upgrading CakePHP easier.
+* Run 'php composer.phar install' in the application directory to get CakePHP and check dependencies.
+* To upgrade later simply run 'git pull'. Resolve merge conflicts if needed.
+
+<h3>Download Install Option</h3>
 * Download latest release from https://github.com/nazgul26/PHPRecipebook-Download
+* Extract files to your web folder.
+
+<hr/>
+<h4>Setup Directions for all</h4>
 * Ensure you have the following PHP Modules installed: mcrypt, gd. And mysql, pgsql or your DB.
 * Create a new database to store the application in. i.e. recipebook
 * Edit Configuration DB Configuration Settings <app install dir>/Config/database.php to match your database settings. 
@@ -57,9 +73,3 @@ And of course now that we are on GitHub contributions and collaboration should b
   - Solution 2: Your webserver does not support url rewriting.  Follow the directions http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration to change app to not use rewriting.
 * You get this error: Warning: include(/<some path>/Vendor/cakephp/cakephp/lib/Cake/Error/ErrorHandler.php): failed to open stream: 
   - Solution: Clear the ./tmp/cache/models, ./tmp/cache/persistent directories.  These folders keep path info in them so if the path the app runs from changes the cache has to be cleared.
-
-<h2>Developer Requirements</h2>
-* Clone /PHPRecipbook repository (not the PHPRecipebook-Downloads).
-* Get PHP Composer installed. https://getcomposer.org/download/.  Composer is used to manage dependencies and make upgrading CakePHP easier.
-* Run 'php composer.phar install' in the application directory to get CakePHP and check dependencies.
-* Setup using fresh installation directions above.

View/Setup/index.ctp

@@ -123,11 +123,18 @@ if (isset($filePresent)):
 <?php
 if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')):
 ?>
-<span class="error-message">
-	<?php echo __d('cake_dev', 'URL rewriting might not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
-</span>
+<div class="notice">
+    <?php echo __d('cake_dev', 'URL rewriting might not properly configured on your server.  '); ?>
+    <ol style="padding-left: 1em;">
+        <li><a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html">Help me configure it</a></li>
+        <li><a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration">I don't / can't use URL rewriting</a></li>
+    </ol>
+    <br/>
+
+    <p>
+        <i><?php echo __d('cake_dev', 'If you have already configured rewriting or a base URL and still see this warning you can try to continue the setup.  Detection of this feature sometimes is not correct.'); ?></i>
+    </p>
+</div>
 <?php
 endif;
 ?>

sass/src/_recipeBox.scss

@@ -5,9 +5,9 @@ Recipe Box on Left.  This is the sidecar of the site.
 #recipeLinkBox { 
     float: left; 
     width: 200px; 
-    background-color: rgba(0, 0, 0, 0.18);
+    background-color: $primary-color;
     border-radius: 10px 10px 10px 10px;
-    border: 1px solid rgba(250, 250, 250, 0.27);
+    border: 1px solid $primary-color;
     box-shadow: 5px 5px 5px rgba(1, 1, 1, 0.698);
     margin-left: 20px;
     margin-right: 20px;

sass/src/_recipes.scss

@@ -90,7 +90,7 @@ float60Section {
 
 .relatedRecipe {
     span {
-        background-color: #00547d;
+        background-color: $primary-color;
         border-radius: 6px;
         display: block;
         padding: 8px;

sass/src/cake.generic.scss

@@ -8,13 +8,7 @@ $titleColor: rgba(0, 50, 180, 0.8);
 }
 
 /** General Style Info **/
-body {
-	background: #006699;
-	color: #fff;
-	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
-	font-size:90%;
-	margin: 0;
-}
+
 a {
 	color: #003d4c;
 	text-decoration: underline;
@@ -63,13 +57,6 @@ p {
 	text-align: left;
 }
 
-#content{
-	background: #fff;
-	clear: both;
-	color: #333;
-	padding: 10px 20px 40px 20px;
-	overflow: auto;
-}
 
 /** containers **/
 div.form,

sass/src/default.scss

@@ -1,4 +1,5 @@
 $primary-color: #00547d;
+$background-color: #5E99BD;
 
 @import "_header.scss";
 @import "_recipeBox.scss";
@@ -12,6 +13,14 @@ $primary-color: #00547d;
 @import "_jquery-ui.scss";
 @import "_users.scss";
 
+body {
+    background: $background-color;
+    color: #fff;
+    font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
+    font-size:90%;
+    margin: 0;
+}
+
 .constrain {
     margin: 0;
     max-width: 1240px;
@@ -36,7 +45,7 @@ $primary-color: #00547d;
 }  
 
 #main {
-    background-color: rgba(0, 0, 0, 0.18);
+    background-color: $primary-color;
     border-left: 1px solid rgba(2, 2, 2, 0.28);
     border-radius: 10px 10px 0 0;
     border-right: 1px solid rgba(2, 2, 2, 0.28);
@@ -45,6 +54,16 @@ $primary-color: #00547d;
     float: left;
 }
 
+#content {
+    background: #fff;
+    clear: both;
+    color: #333;
+    padding: 10px 20px 40px 20px;
+    overflow: auto;
+    border: 1px solid $primary-color;
+    margin: -1px;
+}
+
 @media (max-width: 1024px) {
   .higherRes {
     display: none;