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

Merge branch 'master' of git://github.com/whitef0x0/tellform

Browse source
This commit is contained in:
Sam 2016-06-05 00:48:43 +02:00
parent 51ae7bf2e9 32335e349e
commit b0461abdbe
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -163,6 +163,8 @@ After you've generated the key and certificate, place them in the *config/sslcer
## Mentions on the Web
[Mister Ad](http://start.mister-ad.biz/newsticker/open-source-alternative-zu-typeform-tellform-in-der-kurzvorstellung/)
[t3n.de](http://t3n.de/news/open-source-alternative-typeform-tellform-707295/)
[BootCSS Expo](http://expo.bootcss.com/)

6
public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html
View file

@ -69,7 +69,11 @@
<th class="scope">
{{$index+1}}
</th>
<td data-ng-repeat="field in row.form_fields">
<td ng-if="field.fieldType == 'dropdown'" data-ng-repeat="field in row.form_fields">
{{field.fieldValue.field_title}}
</td>
<td ng-if="field.fieldType != 'dropdown'" data-ng-repeat="field in row.form_fields">
{{field.fieldValue}}
</td>
<td ng-if="myform.plugins.oscarhost.baseUrl">

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

@ -64,7 +64,7 @@ ng-style="{'color':button.color}">
<div class="row form-actions" id="submit_field"
ng-class="{activeField: selected._id == 'submit_field' }"
ng-style="{ 'background-color':myform.design.colors.buttonColor}"
style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; padding-bottom: 100vh;">
style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; padding-bottom: 70vh; margin-bottom: 70vh; margin-top: 30vh;">
<div class="col-xs-12 text-left"
style="background-color:#990000; color:white;"