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

v1.16.0

Browse source
This commit is contained in:
Andris Reinman 2016-08-29 13:57:27 +03:00
parent 3fcd389db8
commit 896fc01015
14 changed files with 95 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
views/lists/fields/create.hbs
View file

@ -66,6 +66,14 @@
</div>
</div>
<div class="form-group">
<label for="group-template" class="col-sm-2 control-label">Group template</label>
<div class="col-sm-10">
<textarea class="form-control gpg-text" rows="3" name="group-template" id="group-template">{{field.groupTemplate}}</textarea>
<span class="help-block">For group elements like checkboxes you can control the appearance of the merge tag with an optional template. The template uses handlebars syntax and you can find all values from <code>\{{values}}</code> array, for example <code>\{{#each values}} \{{this}} \{{/each}}</code>. If template is not defined then multiple values are joined with commas.</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-xs-4">
<div class="checkbox">

24
views/lists/fields/edit.hbs
View file

@ -64,7 +64,7 @@
<option value="{{id}}" {{#if selected}} selected {{/if}}>{{name}}</option>
{{/each}}
</select>
<span class="help-block">Required for group options)</span>
<span class="help-block">Required for group options</span>
</div>
</div>
@ -78,12 +78,24 @@
</div>
</div>
<div class="form-group">
<label for="default-value" class="col-sm-2 control-label">Default merge tag value</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="default-value" id="default-value" value="{{field.defaultValue}}" placeholder="Default merge tag value">
{{#if field.isGroup}}
<div class="form-group">
<label for="group-template" class="col-sm-2 control-label">Group template</label>
<div class="col-sm-10">
<textarea class="form-control gpg-text" rows="3" name="group-template" id="description">{{field.groupTemplate}}</textarea>
<span class="help-block">For group elements like checkboxes you can control the appearance of the merge tag with an optional template. The template uses handlebars syntax and you can find all values from <code>\{{values}}</code> array, for example <code>\{{#each values}} \{{this}} \{{/each}}</code>. If template is not defined then multiple values are joined with commas.</span>
</div>
</div>
</div>
{{else}}
<div class="form-group">
<label for="default-value" class="col-sm-2 control-label">Default merge tag value</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="default-value" id="default-value" value="{{field.defaultValue}}" placeholder="Default merge tag value">
</div>
</div>
{{/if}}
<div class="form-group">
<div class="col-sm-offset-2 col-xs-4">

4
views/users/account.hbs
View file

@ -9,9 +9,9 @@
{{#if ldap.enabled}}
<p>
This account is managed through LDAP.<br/>
This account is managed through LDAP.
<br/>
Associated Email Address: <a href="mailto:{{email}}">{{email}}</a>
<br/> Associated Email Address: <a href="mailto:{{email}}">{{email}}</a>
</p>
{{else}}
<form class="form-horizontal" method="post" action="/users/account">

1
views/users/api.hbs
View file

@ -170,6 +170,7 @@
</ul>
</li>
<li><strong>GROUP</strong> – If the type is 'option' then you also need to specify the parent element ID</li>
<li><strong>GROUP_TEMPLATE</strong> – Template for the group element. If not set, then values of the elements are joined with commas</li>
<li><strong>VISIBLE</strong> – yes/no, if not visible then the subscriber can not view or modify this value at the profile page</li>
</ul>

3
views/users/forgot.hbs
View file

@ -10,7 +10,8 @@
{{#if ldap.enabled}}
<p>
Accounts are managed through LDAP.<br/>
Accounts are managed through LDAP.
<br/>
<br/>
<a href="{{ldap.passwordresetlink}}">Reset Password</a>
</p>