public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merged

Browse source
This commit is contained in:
Andris Reinman 2016-05-04 16:56:41 +03:00
commit 722230f7a0
13 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
views/campaigns/edit.hbs
View file

@ -128,13 +128,13 @@
<ul>
<li>
<code>[FIRST_NAME]</code> – first name of the subcriber
<code>[FIRST_NAME]</code> – first name of the subscriber
</li>
<li>
<code>[LAST_NAME]</code> – last name of the subcriber
<code>[LAST_NAME]</code> – last name of the subscriber
</li>
<li>
<code>[FULL_NAME]</code> – first and last names of the subcriber joined
<code>[FULL_NAME]</code> – first and last names of the subscriber joined
</li>
<li>
<code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber

2
views/emails/confirm-text.hbs
View file

@ -4,7 +4,7 @@ Please Confirm Subscription
Yes, subscribe me to this list: {{{confirmUrl}}}
If you received this email by mistake, simply delete it. You won't be subscribed if you don't click the confirmation link above.
If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.
For questions about this list, please contact:
{{{contactAddress}}}

2
views/lists/edit.hbs
View file

@ -5,7 +5,7 @@
<li class="active">Edit List</li>
</ol>
<h2>Edit List <a class="btn btn-default btn-xs" href="/lists/view/{{id}}" role="button"><span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span> View list</a></h2>
<h2>Edit List <a class="btn btn-default btn-xs" href="/lists/view/{{id}}" role="button"><span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span> View List</a></h2>
<hr>

2
views/lists/segments/rule-configure.hbs
View file

@ -27,7 +27,7 @@
<label for="value" class="col-sm-2 control-label">Value</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="value" id="value" value="{{value.value}}" placeholder="Value">
<span class="help-block">Use % for wildcard character, eg. "%test" to match all values that end with "test"</span>
<span class="help-block">Use % for wildcard character, e.g. "%test" to match all values that end with "test"</span>
</div>
</div>
{{/if}}

4
views/lists/segments/rule-edit.hbs
View file

@ -32,7 +32,7 @@
<label for="value" class="col-sm-2 control-label">Value</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="value" id="value" value="{{value.value}}" placeholder="Value">
<span class="help-block">Use % for wildcard character, eg. "%test" to match all values that end with "test"</span>
<span class="help-block">Use % for wildcard character, e.g. "%test" to match all values that end with "test"</span>
</div>
</div>
{{/if}}
@ -167,7 +167,7 @@
</div>
</div>
<div class="col-md-1">
<p class="form-control-static text-center">to</p>
<p class="form-control-static text-center">To</p>
</div>
<div class="col-md-3">
<div class="input-group date fm-birthday-generic">

4
views/lists/subscription/add.hbs
View file

@ -14,7 +14,7 @@
<input type="hidden" name="list" value="{{list.id}}">
<div class="form-group">
<label for="email" class="col-sm-2 control-label">Email address</label>
<label for="email" class="col-sm-2 control-label">Email Address</label>
<div class="col-sm-10">
<input type="email" class="form-control input-lg" name="email" id="email" placeholder="" value="{{email}}" required>
</div>
@ -136,7 +136,7 @@
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<p class="text-warning">
This person will not receive a confirmation email so make sure you have a permission to email them
This person will not receive a confirmation email so make sure that you have permission to email them.
</p>
<button type="submit" class="btn btn-primary">Subscribe</button>

2
views/lists/subscription/import-failed.hbs
View file

@ -10,7 +10,7 @@
<hr>
<div class="well">
Role-based addresses like <em><strong>postmaster</strong>@example.com</em> are blocked when importing. Subscribers with role-based email addresses can join your list using the <a href="/subscription/{{list.cid}}">subsription form</a>.
Role-based addresses like <em><strong>postmaster</strong>@example.com</em> are blocked when importing. Subscribers with role-based email addresses can join your list using the <a href="/subscription/{{list.cid}}">subscription form</a>.
</div>
<div class="table-responsive">

8
views/lists/view.hbs
View file

@ -17,8 +17,8 @@
<li><a href="/segments/{{id}}" role="button"><span class="glyphicon glyphicon-filter" aria-hidden="true"></span> Segments</a></li>
<li><a href="/lists/edit/{{id}}" role="button"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> Edit List</a></li>
<li role="separator" class="divider"></li>
<li><a href="/lists/subscription/{{id}}/add" role="button"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Add subscriber</a></li>
<li><a href="/lists/subscription/{{id}}/import" role="button"><span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Import subscribers</a></li>
<li><a href="/lists/subscription/{{id}}/add" role="button"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Add Subscriber</a></li>
<li><a href="/lists/subscription/{{id}}/import" role="button"><span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Import Subscribers</a></li>
</ul>
</div>
</div>
@ -41,7 +41,7 @@
<div class="form-group">
<label for="exampleInputName2">Segment</label>
<select name="segment" class="form-control">
<option value="0">All subscriptions</option>
<option value="0">All Subscriptions</option>
{{#if segments}}
<optgroup label="Segments">
{{#each segments}}
@ -50,7 +50,7 @@
</optgroup>
{{/if}}
<optgroup label="Actions">
<option value="-1">Create new segment…</option>
<option value="-1">Create New Segment…</option>
</optgroup>
</select>
</div>

4
views/subscription/manage.hbs
View file

@ -14,7 +14,7 @@
<input type="hidden" class="tz-detect" name="tz" id="tz" value="{{tz}}">
<div class="form-group">
<label for="email">Email address</label>
<label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" readonly>
</div>
@ -51,7 +51,7 @@
{{#if typeGpg}}
{{#if ../hasPubkey}}
<div class="pull-right">
<button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
<button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verification key</button>
</div>
{{/if}}
<textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>

4
views/subscription/subscribe.hbs
View file

@ -11,7 +11,7 @@
<input type="hidden" class="tz-detect" name="tz" id="tz" value="{{tz}}">
<div class="form-group">
<label for="email">Email address</label>
<label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" required>
</div>
@ -48,7 +48,7 @@
{{#if typeGpg}}
{{#if ../hasPubkey}}
<div class="pull-right">
<button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verififcation key</button>
<button type="submit" class="btn btn-link btn-xs" form="download-pubkey"><span class="glyphicon glyphicon-cloud-download" aria-hidden="true"></span> Download signature verification key</button>
</div>
{{/if}}
<textarea class="form-control gpg-text" rows="3" name="{{column}}" placeholder="Begins with &#39;-----BEGIN PGP PUBLIC KEY BLOCK-----&#39;">{{value}}</textarea>

6
views/templates/create.hbs
View file

@ -29,13 +29,13 @@
<ul>
<li>
<code>[FIRST_NAME]</code> – first name of the subcriber
<code>[FIRST_NAME]</code> – first name of the subscriber
</li>
<li>
<code>[LAST_NAME]</code> – last name of the subcriber
<code>[LAST_NAME]</code> – last name of the subscriber
</li>
<li>
<code>[FULL_NAME]</code> – first and last names of the subcriber joined
<code>[FULL_NAME]</code> – first and last names of the subscriber joined
</li>
<li>
<code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber

6
views/templates/edit.hbs
View file

@ -35,13 +35,13 @@
<ul>
<li>
<code>[FIRST_NAME]</code> – first name of the subcriber
<code>[FIRST_NAME]</code> – first name of the subscriber
</li>
<li>
<code>[LAST_NAME]</code> – last name of the subcriber
<code>[LAST_NAME]</code> – last name of the subscriber
</li>
<li>
<code>[FULL_NAME]</code> – first and last names of the subcriber joined
<code>[FULL_NAME]</code> – first and last names of the subscriber joined
</li>
<li>
<code>[LINK_UNSUBSCRIBE]</code> – URL that points to the preferences page of the subscriber

4
views/users/account.hbs
View file

@ -13,7 +13,7 @@
<fieldset>
<legend>
General settings
General Settings
</legend>
<div class="form-group">
@ -31,7 +31,7 @@
</legend>
<p>
You only need to fill this part if you want to change your current password
You only need to fill out this form if you want to change your current password
</p>
<div class="form-group">