From 661fa204dc2e664935506791ad6f0e254556266b Mon Sep 17 00:00:00 2001
From: Timothy Prepscius <tprepscius>
Date: Sun, 29 Sep 2013 19:19:44 -0400
Subject: [PATCH] fixes bug with replacing ##COMPANY##, sed sort of sucks

---
 build/compile-web-html |  3 +++
 build/replace_html.sed |  4 ----
 web/signup/SignUp.html | 15 ++++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/compile-web-html b/build/compile-web-html
index 2adc4fb..a83e3d1 100755
--- a/build/compile-web-html
+++ b/build/compile-web-html
@@ -5,6 +5,7 @@ V=$1
 M=$2
 
 APP_TITLE=`cat ../config/title`
+COMPANY=`cat ../config/company`
 
 dst=www
 cmn_src=../web/common
@@ -23,7 +24,9 @@ function replaceStrings() {
 	sed -i '' -e s/__VERSION__/$V/g $1
 	sed -i '' -e s/__THIS_YEAR__/2013/g $1
 
+	echo $COMPANY
 	sed -i '' -e s/{##TITLE##}/$APP_TITLE/g $1
+	sed -i '' -e s/{##COMPANY##}/"$COMPANY"/g $1
 }
 
 echo Compiling CSS/JS
diff --git a/build/replace_html.sed b/build/replace_html.sed
index 0f6afac..191d7bc 100644
--- a/build/replace_html.sed
+++ b/build/replace_html.sed
@@ -24,8 +24,4 @@
   d
 }
 
-/{##COMPANY##}/ {
-  r ../config/company
-  d
-}
 
diff --git a/web/signup/SignUp.html b/web/signup/SignUp.html
index 2d74f5e..cdc0a29 100644
--- a/web/signup/SignUp.html
+++ b/web/signup/SignUp.html
@@ -173,8 +173,8 @@
 						<div class="inner-td">
 							I want to use the storage provider:<br/>
 							<br/>
-							<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="mailiverse" checked>Mailiverse</label><br/>
-							<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="s3">Mailiverse (S3 Backed)</label><br>
+							<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="mailiverse" checked>{##TITLE##}</label><br/>
+							<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="s3">{##TITLE##} (S3 Backed)</label><br>
 							<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="dropbox">Dropbox</label><br/>
 						</div>
 					</td>
@@ -183,13 +183,14 @@
 				<tr id="storage_s3" class="storage-option" style="display:none">
 					<td class="left-side">
 						<div class="inner-td">
-							<h4>Mailiverse S3 backed storage</h4>
+							<h4>
+							{##TITLE##} S3 backed storage</h4>
 							We provide infinite mail storage.
 						</div>
 					</td>
 					<td class="right-side">
 						<div class="inner-td">
-							Mailiverse S3 backed storage is simple, no hassle.  We take care of everything.<br/>
+							{##TITLE##} S3 backed storage is simple, no hassle.  We take care of everything.<br/>
 							<br/>
 							Pick the region you are closest to most of the time.<br/>
 							<select id="storage_s3_region">
@@ -209,13 +210,13 @@
 				<tr id="storage_mailiverse" class="storage-option">
 					<td class="left-side">
 						<div class="inner-td">
-							<h4>Mailiverse storage</h4>
+							<h4>{##TITLE##} storage</h4>
 							We provide infinite mail storage.  This storage is backed by our local db.
 						</div>
 					</td>
 					<td class="right-side">
 						<div class="inner-td">
-							Mailiverse storage is simple, no hassle.  We take care of everything.<br/>
+							{##TITLE##} storage is simple, no hassle.  We take care of everything.<br/>
 						</div>
 					</td>
 				</tr>
@@ -226,7 +227,7 @@
 							<h4>Dropbox storage</h4>
 							
 							Store your mail on your own dropbox account.  
-							It's easy, just click on the button to open a new tab to link Mailiverse to Dropbox.<br/>
+							It's easy, just click on the button to open a new tab to link {##COMPANY##} to Dropbox.<br/>
 							<br/>
 							Enter the authorization verification code recieved.
 							<br/>