beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed form footer toggle in config general admin panel

Browse source
This commit is contained in:
David Baldwynn 2017-11-15 09:41:19 -08:00
parent 3606c9444b
commit ab830fdc9e
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/forms.server.controller.js
View file

@ -514,7 +514,7 @@ exports.formByID = function(req, res, next, id) {
}
Form.findById(id)
.select('admin title language form_fields startPage endPage hideFooter isLive design analytics.gaCode respondentNotifications selfNotifications')
.select('admin title language form_fields startPage endPage showFooter isLive design analytics.gaCode respondentNotifications selfNotifications')
.populate('admin')
.exec(function(err, form) {
if (err) {
@ -543,7 +543,7 @@ exports.formByIDFast = function(req, res, next, id) {
}
Form.findById(id)
.lean()
.select('title language form_fields startPage endPage hideFooter isLive design analytics.gaCode selfNotifications respondentNotifications')
.select('title language form_fields startPage endPage showFooter isLive design analytics.gaCode selfNotifications respondentNotifications')
.exec(function(err, form) {
if (err) {
return next(err);

4
app/models/form.server.model.js
View file

@ -192,9 +192,9 @@ var FormSchema = new Schema({
}
},
hideFooter: {
showFooter: {
type: Boolean,
default: false
default: true
},
isLive: {

2
public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html
View file

@ -72,7 +72,7 @@
</form>
</div>
<section ng-if="!myform.hideFooter" class="navbar navbar-fixed-bottom" ng-style="{ 'background-color':myform.design.colors.buttonColor, 'padding-top': '15px', 'border-top': '2px '+ myform.design.colors.buttonTextColor +' solid', 'color':myform.design.colors.buttonTextColor}">
<section ng-if="myform.showFooter" class="navbar navbar-fixed-bottom" ng-style="{ 'background-color':myform.design.colors.buttonColor, 'padding-top': '15px', 'border-top': '2px '+ myform.design.colors.buttonTextColor +' solid', 'color':myform.design.colors.buttonTextColor}">
<div class="container-fluid">
<div class="row">
<div class="col-sm-5 col-md-6 col-xs-5" ng-show="!myform.submitted">

2
public/modules/forms/admin/views/adminTabs/configureTabs/general.html
View file

@ -71,7 +71,7 @@
<div class="field-input col-sm-4 text-right">
<input class="toggle-switch" type="checkbox"
bs-switch ng-model="myform.hideFooter"
bs-switch ng-model="myform.showFooter"
switch-on-text="{{ 'ON' | translate }}"
switch-off-text="{{ 'OFF' | translate }}">
</div>

2
public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js
View file

@ -31,7 +31,7 @@
startPage: {
showStart: false
},
hideFooter: false,
showFooter: false,
isGenerated: false,
isLive: false,
autofillPDFs: false,

2
public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js
View file

@ -59,7 +59,7 @@
endPage: {
showEnd: false
},
hideFooter: false,
showFooter: false,
isGenerated: false,
isLive: false,
_id: '525a8422f6d0f87f0e407a33'

2
public/modules/forms/tests/unit/directives/edit-form.client.directive.test.js
View file

@ -32,7 +32,7 @@
showStart: false,
buttons: []
},
hideFooter: false,
showFooter: false,
isGenerated: false,
isLive: false,
_id: '525a8422f6d0f87f0e407a33'

2
public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js
View file

@ -52,7 +52,7 @@ var MobileDetect = function(userAgentStr){
startPage: {
showStart: false
},
hideFooter: false,
showFooter: false,
isGenerated: false,
isLive: false,
autofillPDFs: false,

2
public/swagger.json
View file

@ -811,7 +811,7 @@
}
}
},
"hideFooter": {
"showFooter": {
"type": "boolean",
"default": false,
"description": "Specifies whether to hide or show Form Footer",