Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

inform add assets [INTEGRALCS-11927] #235

Open
wants to merge 69 commits into
base: gh-pages
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
35764d6
changed it for the bootstrap
Mar 19, 2014
8043919
Removed saveFormButton, added Signature element
tristankenney Mar 22, 2014
b8d5ec9
Various changes
tristankenney Apr 14, 2014
d58e829
Bug fixes
tristankenney Apr 22, 2014
0844a40
POWER TIME
tristankenney Apr 30, 2014
c421a9b
Merge branch 'master' of github.com:crusepartnership/formbuilder
tristankenney Apr 30, 2014
d4c3c1b
Grid element + info element + icon prefix
tristankenney May 23, 2014
6f2e323
Children can be rendered in flat structure
tristankenney May 26, 2014
78e6fd1
Bug and styling fixes
tristankenney May 27, 2014
6c87744
'options per row' and fixes
tristankenney Jul 24, 2014
cd641b0
WIP
tristankenney Nov 27, 2014
5be27be
That'll do pig
tristankenney Nov 29, 2014
ee82a3a
Now with table and datasource
tristankenney Apr 14, 2015
47c83ba
Updated to summernote 0.6.16 and added link item to info element
Aug 31, 2015
b16f25c
Update for info field + set version for karma
Aug 31, 2015
9abe8f1
Removed multiple from datasource
tristankenney Sep 29, 2015
c6a9af8
Merge branch 'master' of github.com:crusepartnership/formbuilder
tristankenney Sep 30, 2015
493fdb4
Added option to grid element (first row headings)
Oct 14, 2015
8615a03
Merge remote-tracking branch 'origin/master'
Oct 14, 2015
150b73c
Updated .gitignore
tristankenney Oct 15, 2015
70e581c
Added ability to set heading colours for elements in tables [INTEGRAL…
Dec 3, 2015
870c31c
Merge remote-tracking branch 'origin/master'
Dec 3, 2015
74d33ec
Updates for ability to set heading colours for elements in tables [IN…
Dec 8, 2015
3a4580e
INTEGRALCS-3790 INTEGRALCS-3791 Inform Element Improvements
Dec 22, 2015
7ea36ab
Updated default time label
tristankenney Jan 3, 2016
f22ea40
fix the issue for dulication feature INTEGRALCS-3961
Mar 8, 2016
68035e6
Added conditional question
tristankenney Apr 19, 2017
fd7857f
Updated styling + conditional options
tristankenney Apr 23, 2017
221d5c4
Added styling to paarent
tristankenney Apr 23, 2017
026c56d
Fixed issues with issues repeatedly being registered
tristankenney Apr 25, 2017
b16649f
Added tooltip init code
tristankenney Apr 25, 2017
aa62cbe
Added toggle to conditional functionality
tristankenney Apr 26, 2017
d406bca
Added condtional display to section element
tristankenney May 6, 2017
6b5bde6
Added padding to bottom of the formbuilder
tristankenney May 11, 2017
d4592e3
Merge pull request #1 from crusepartnership/padding-fix
tristankenney May 11, 2017
7c9c778
Rebuilt and merged with master
tristankenney May 11, 2017
1910483
Uncommented table
tristankenney May 11, 2017
d8d6895
Merge pull request #2 from crusepartnership/conditional-functionality
tristankenney May 11, 2017
7fd605d
Add get geolocation button
lukeluluke May 12, 2017
d61e12b
add label and descrption for Geolocation element
lukeluluke May 16, 2017
2c6e0c7
change name of geolocation element type to lower case
lukeluluke May 16, 2017
d5bf05a
Add Reference ID to formbuilder field, and show reference id in Condi…
lukeluluke Aug 10, 2017
0713367
Merge pull request #3 from crusepartnership/add_geolocation
tristankenney Aug 10, 2017
24db0f8
Move Reference ID to end of header [INTEGRALCS-5847]
lukeluluke Aug 10, 2017
a143f40
Merge remote-tracking branch 'origin/master' into element-add-referen…
tristankenney Aug 17, 2017
6d0c899
fix for conditional functionality parent child question [INTEGRALCS-5…
Aug 28, 2017
74ccaab
Merge pull request #6 from crusepartnership/conditional-functionality…
tristankenney Aug 29, 2017
cc0452e
Merge pull request #4 from crusepartnership/element-add-referenceId
tristankenney Aug 29, 2017
695df50
Rebuilt post-merge
tristankenney Aug 29, 2017
00dc0c9
fix the issue for conditional display [SUPPORT-778] (#9)
raycui2011 Dec 20, 2017
e1daab5
fix the issue for element can not be removed in the table [SUPPORT-84…
raycui2011 Jan 5, 2018
f2fc899
use global variable to store the element for index[INTEGRALCS-6231]
Jan 24, 2018
7e57962
fix typo [INTEGRALCS-6231]
Jan 24, 2018
6f1b7a9
FormBuilder performance improvements
Jan 24, 2018
07901d3
Add HTML stripping (#14)
chintogtokh Nov 2, 2018
c7d06c1
Fix for formbuilder index issue
raycui2011 Dec 3, 2018
157bb62
Merge pull request #17 from crusepartnership/formbuilder-wrapper-inde…
Dec 3, 2018
34dc63e
Add fixes to correctly convert slash n to br [INTEGRALCS-8877]
chintogtokh Jan 30, 2019
4da6a39
Merge pull request #18 from crusepartnership/integralcs-8877-nl2br
lukeluluke Jan 30, 2019
bac5003
Add minor fix
chintogtokh Jan 30, 2019
4076dd7
Re-add commit c7d06c1 fixes to dist and coffeescript
chintogtokh Feb 11, 2019
2b585f3
Fix issue with info element [INTEGRALCS-9842]
chintogtokh May 15, 2019
18777d2
Add comments/readme
chintogtokh May 16, 2019
6f82e76
Re-add foxes from CLIENTHUB-1748 to coffeescript [CLIENTHUB-1748]
chintogtokh May 16, 2019
b38f88d
Make info description print raw - note that this has to be handled se…
chintogtokh May 16, 2019
3454889
Revert index.html
chintogtokh May 17, 2019
2613ed2
Merge pull request #20 from crusepartnership/integralcs-9842-formbuilder
chintogtokh May 17, 2019
6ebf934
Make formbuilder runs on server [INTEGRALCS-10486]
lukeluluke Oct 4, 2019
07b1e7c
Make formbuilder runs on server [INTEGRALCS-10486]
lukeluluke Oct 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
changed it for the bootstrap
ray committed Mar 19, 2014
commit 35764d6849fece5499ec3208b8c70af4e598af18
12 changes: 6 additions & 6 deletions dist/formbuilder.js
Original file line number Diff line number Diff line change
@@ -976,9 +976,9 @@ __p += '\n\n<div class=\'option\' data-rv-each-option=\'model.' +
((__t = ( Formbuilder.options.mappings.OPTIONS )) == null ? '' : __t) +
'\'>\n <input type="checkbox" class=\'js-default-updated\' data-rv-checked="option:checked" />\n <input type="text" data-rv-input="option:label" class=\'option-label-input\' />\n <a class="js-add-option ' +
((__t = ( Formbuilder.options.BUTTON_CLASS )) == null ? '' : __t) +
'" title="Add Option"><i class=\'fa fa-plus-circle\'></i></a>\n <a class="js-remove-option ' +
'" title="Add Option"><span class=\'glyphicon glyphicon-plus-sign\'></span></a>\n <a class="js-remove-option ' +
((__t = ( Formbuilder.options.BUTTON_CLASS )) == null ? '' : __t) +
'" title="Remove Option"><i class=\'fa fa-minus-circle\'></i></a>\n</div>\n\n';
'" title="Remove Option"><span class=\'glyphicon glyphicon-minus-sign\'></span></a>\n</div>\n\n';
if (typeof includeOther !== 'undefined'){ ;
__p += '\n <label>\n <input type=\'checkbox\' data-rv-checked=\'model.' +
((__t = ( Formbuilder.options.mappings.INCLUDE_OTHER )) == null ? '' : __t) +
@@ -1077,7 +1077,7 @@ this["Formbuilder"]["templates"]["partials/left_side"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div class=\'fb-left\'>\n <ul class=\'fb-tabs\'>\n <li class=\'active\'><a data-target=\'#addField\'>Add new field</a></li>\n <li><a data-target=\'#editField\'>Edit field</a></li>\n </ul>\n\n <div class=\'fb-tab-content\'>\n ' +
__p += '<div class=\'fb-left\'>\n <ul class=\'fb-tabs nav nav-tabs\'>\n <li class=\'active\'><a data-target=\'#addField\'>Add new field</a></li>\n <li><a data-target=\'#editField\'>Edit field</a></li>\n </ul>\n\n <div class=\'fb-tab-content\'>\n ' +
((__t = ( Formbuilder.templates['partials/add_field']() )) == null ? '' : __t) +
'\n ' +
((__t = ( Formbuilder.templates['partials/edit_field']() )) == null ? '' : __t) +
@@ -1091,7 +1091,7 @@ this["Formbuilder"]["templates"]["partials/right_side"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div class=\'fb-right\'>\n <div class=\'fb-no-response-fields\'>No response fields</div>\n <div class=\'fb-response-fields\'></div>\n</div>\n';
__p += '<div class=\'fb-right panel\'>\n <div class=\'fb-no-response-fields\'>No response fields</div>\n <div class=\'fb-response-fields panel-body\'></div>\n</div>\n';

}
return __p
@@ -1159,9 +1159,9 @@ var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div class=\'actions-wrapper\'>\n <a class="js-duplicate ' +
((__t = ( Formbuilder.options.BUTTON_CLASS )) == null ? '' : __t) +
'" title="Duplicate Field"><i class=\'fa fa-plus-circle\'></i></a>\n <a class="js-clear ' +
'" title="Duplicate Field"><span class=\'glyphicon glyphicon-plus-sign\'></span></a>\n <a class="js-clear ' +
((__t = ( Formbuilder.options.BUTTON_CLASS )) == null ? '' : __t) +
'" title="Remove Field"><i class=\'fa fa-minus-circle\'></i></a>\n</div>';
'" title="Remove Field"><span class=\'glyphicon glyphicon-minus-sign\'></span></a>\n</div>';

}
return __p
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@
</head>
<body>
<div class='fb-main'></div>
<script src="vendor/js/vendor.js"></script>

<script src="vendor/js/vendor.js"></script>
<script src="dist/formbuilder.js"></script>

<script>
4 changes: 2 additions & 2 deletions src/templates/edit/options.html
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@
<div class='option' data-rv-each-option='model.<%= Formbuilder.options.mappings.OPTIONS %>'>
<input type="checkbox" class='js-default-updated' data-rv-checked="option:checked" />
<input type="text" data-rv-input="option:label" class='option-label-input' />
<a class="js-add-option <%= Formbuilder.options.BUTTON_CLASS %>" title="Add Option"><i class='fa fa-plus-circle'></i></a>
<a class="js-remove-option <%= Formbuilder.options.BUTTON_CLASS %>" title="Remove Option"><i class='fa fa-minus-circle'></i></a>
<a class="js-add-option <%= Formbuilder.options.BUTTON_CLASS %>" title="Add Option"><span class='glyphicon glyphicon-plus-sign'></span></a>
<a class="js-remove-option <%= Formbuilder.options.BUTTON_CLASS %>" title="Remove Option"><span class='glyphicon glyphicon-minus-sign'></span></a>
</div>

<% if (typeof includeOther !== 'undefined'){ %>
2 changes: 1 addition & 1 deletion src/templates/partials/left_side.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class='fb-left'>
<ul class='fb-tabs'>
<ul class='fb-tabs nav nav-tabs'>
<li class='active'><a data-target='#addField'>Add new field</a></li>
<li><a data-target='#editField'>Edit field</a></li>
</ul>
4 changes: 2 additions & 2 deletions src/templates/partials/right_side.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class='fb-right'>
<div class='fb-right panel'>
<div class='fb-no-response-fields'>No response fields</div>
<div class='fb-response-fields'></div>
<div class='fb-response-fields panel-body'></div>
</div>
4 changes: 2 additions & 2 deletions src/templates/view/duplicate_remove.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class='actions-wrapper'>
<a class="js-duplicate <%= Formbuilder.options.BUTTON_CLASS %>" title="Duplicate Field"><i class='fa fa-plus-circle'></i></a>
<a class="js-clear <%= Formbuilder.options.BUTTON_CLASS %>" title="Remove Field"><i class='fa fa-minus-circle'></i></a>
<a class="js-duplicate <%= Formbuilder.options.BUTTON_CLASS %>" title="Duplicate Field"><span class='glyphicon glyphicon-plus-sign'></span></a>
<a class="js-clear <%= Formbuilder.options.BUTTON_CLASS %>" title="Remove Field"><span class='glyphicon glyphicon-minus-sign'></span></a>
</div>
6,134 changes: 6,131 additions & 3 deletions vendor/css/vendor.css

Large diffs are not rendered by default.

Binary file removed vendor/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed vendor/fonts/fontawesome-webfont.eot
Binary file not shown.
414 changes: 0 additions & 414 deletions vendor/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed vendor/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed vendor/fonts/fontawesome-webfont.woff
Binary file not shown.
268 changes: 158 additions & 110 deletions vendor/js/vendor.js

Large diffs are not rendered by default.