mirror of
https://github.com/moparisthebest/mailiverse
synced 2024-11-24 09:32:17 -05:00
fixes bug with replacing ##COMPANY##, sed sort of sucks
This commit is contained in:
parent
5098e228d6
commit
661fa204dc
@ -5,6 +5,7 @@ V=$1
|
|||||||
M=$2
|
M=$2
|
||||||
|
|
||||||
APP_TITLE=`cat ../config/title`
|
APP_TITLE=`cat ../config/title`
|
||||||
|
COMPANY=`cat ../config/company`
|
||||||
|
|
||||||
dst=www
|
dst=www
|
||||||
cmn_src=../web/common
|
cmn_src=../web/common
|
||||||
@ -23,7 +24,9 @@ function replaceStrings() {
|
|||||||
sed -i '' -e s/__VERSION__/$V/g $1
|
sed -i '' -e s/__VERSION__/$V/g $1
|
||||||
sed -i '' -e s/__THIS_YEAR__/2013/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/{##TITLE##}/$APP_TITLE/g $1
|
||||||
|
sed -i '' -e s/{##COMPANY##}/"$COMPANY"/g $1
|
||||||
}
|
}
|
||||||
|
|
||||||
echo Compiling CSS/JS
|
echo Compiling CSS/JS
|
||||||
|
@ -24,8 +24,4 @@
|
|||||||
d
|
d
|
||||||
}
|
}
|
||||||
|
|
||||||
/{##COMPANY##}/ {
|
|
||||||
r ../config/company
|
|
||||||
d
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -173,8 +173,8 @@
|
|||||||
<div class="inner-td">
|
<div class="inner-td">
|
||||||
I want to use the storage provider:<br/>
|
I want to use the storage provider:<br/>
|
||||||
<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="mailiverse" checked>{##TITLE##}</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="s3">{##TITLE##} (S3 Backed)</label><br>
|
||||||
<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="dropbox">Dropbox</label><br/>
|
<label class="checkbox inline"><input name="storage" type="radio" onchange="mSignUp.onStorageChange();" value="dropbox">Dropbox</label><br/>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
@ -183,13 +183,14 @@
|
|||||||
<tr id="storage_s3" class="storage-option" style="display:none">
|
<tr id="storage_s3" class="storage-option" style="display:none">
|
||||||
<td class="left-side">
|
<td class="left-side">
|
||||||
<div class="inner-td">
|
<div class="inner-td">
|
||||||
<h4>Mailiverse S3 backed storage</h4>
|
<h4>
|
||||||
|
{##TITLE##} S3 backed storage</h4>
|
||||||
We provide infinite mail storage.
|
We provide infinite mail storage.
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="right-side">
|
<td class="right-side">
|
||||||
<div class="inner-td">
|
<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/>
|
<br/>
|
||||||
Pick the region you are closest to most of the time.<br/>
|
Pick the region you are closest to most of the time.<br/>
|
||||||
<select id="storage_s3_region">
|
<select id="storage_s3_region">
|
||||||
@ -209,13 +210,13 @@
|
|||||||
<tr id="storage_mailiverse" class="storage-option">
|
<tr id="storage_mailiverse" class="storage-option">
|
||||||
<td class="left-side">
|
<td class="left-side">
|
||||||
<div class="inner-td">
|
<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.
|
We provide infinite mail storage. This storage is backed by our local db.
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="right-side">
|
<td class="right-side">
|
||||||
<div class="inner-td">
|
<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>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -226,7 +227,7 @@
|
|||||||
<h4>Dropbox storage</h4>
|
<h4>Dropbox storage</h4>
|
||||||
|
|
||||||
Store your mail on your own dropbox account.
|
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/>
|
<br/>
|
||||||
Enter the authorization verification code recieved.
|
Enter the authorization verification code recieved.
|
||||||
<br/>
|
<br/>
|
||||||
|
Loading…
Reference in New Issue
Block a user