Merge branch 'master' into master

views/campaigns/edit.hbs

@@ -17,6 +17,11 @@
     <input type="hidden" name="id" value="{{id}}" />
 </form>
 
+<form method="post" class="duplicate-form" id="campaigns-duplicate" action="/campaigns/duplicate">
+    <input type="hidden" name="_csrf" value="{{csrfToken}}">
+    <input type="hidden" name="id" value="{{id}}" />
+</form>
+
 {{#each attachments}}
     <form method="post" id="attachment-download-{{id}}" action="/campaigns/attachment/download">
         <input type="hidden" name="_csrf" value="{{../csrfToken}}">
@@ -240,6 +245,7 @@
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
                 <div class="pull-right">
+                    <button type="submit" form="campaigns-duplicate" class="btn btn-default"> {{#translate}}Duplicate{{/translate}}</button>
                     <button type="submit" form="campaigns-delete" class="btn btn-danger"><i class="glyphicon glyphicon-remove"></i> {{#translate}}Delete Campaign{{/translate}}</button>
                 </div>
                 <button type="submit" class="btn btn-primary"><i class="glyphicon glyphicon-ok"></i> {{#translate}}Update{{/translate}}</button>

views/lists/fields/create.hbs

@@ -19,6 +19,13 @@
         </div>
     </div>
 
+    <div class="form-group">
+         <label for="description" class="col-sm-2 control-label">{{#translate}}Field Description{{/translate}}</label>
+         <div class="col-sm-10">
+             <textarea class="form-control gpg-text" rows="3" name="description" id="description">{{field.description}}</textarea>
+         </div>
+    </div>
+
     <div class="form-group">
         <label for="type" class="col-sm-2 control-label">{{#translate}}Field Type{{/translate}}</label>
         <div class="col-sm-10">

views/lists/fields/edit.hbs

@@ -26,6 +26,13 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label for="description" class="col-sm-2 control-label">{{#translate}}Field Description{{/translate}}</label>
+        <div class="col-sm-10">
+            <textarea class="form-control gpg-text" rows="3" name="description" id="description">{{field.description}}</textarea>
+        </div>
+    </div>
+
     <div class="form-group">
         <label for="type" class="col-sm-2 control-label">{{#translate}}Field Type{{/translate}}</label>
         <div class="col-sm-10">

views/subscription/partials/subscription-custom-fields.hbs

@@ -134,9 +134,12 @@
             <label>{{name}}</label>
             <input type="hidden" name="origin_{{key}}" value="webform">
             {{#each options}}
+                <p>
                 <label class="label-checkbox">
                     <input type="checkbox" name="{{column}}" value="1" {{#if value}} checked {{/if}}> {{name}}
                 </label>
+                <span class="help-block">{{description}}</span>
+                </p>
             {{/each}}
         </div>
     {{/if}}

views/users/api.hbs

@@ -181,6 +181,7 @@
 </p>
 <ul>
     <li><strong>NAME</strong> – {{#translate}}field name{{/translate}} (<em>{{#translate}}required{{/translate}}</em>)</li>
+    <li><strong>DESCRIPTION</strong> – {{#translate}}field description{{/translate}}</li>
     <li><strong>TYPE</strong> – {{#translate}}one of the following types:{{/translate}}
         <ul>
             {{#each allowedTypes}}
@@ -362,3 +363,4 @@
 
 <pre>curl -XPOST {{serviceUrl}}api/changeemail/B16uVTdW?access_token={{accessToken}} \
 --data 'EMAILOLD=test@example.com&EMAILNEW=foo@bar.com'</pre>
+