Skip to content
Snippets Groups Projects
Commit 2704a4ee authored by enured's avatar enured
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents e500613f 45c687c6
No related branches found
No related tags found
2 merge requests!419S13788_datetimepicker_selectable_weekdays,!409S13787 datetimepicker documentation added and JS Correction
...@@ -235,7 +235,7 @@ class BuildFormBootstrap extends AbstractBuildForm { ...@@ -235,7 +235,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
/** /**
* Creates a link to open current form loaded in FormEditor * Creates a link to open current form loaded in FormEditor
* *
* @return string - the rendered Checkbox * @return string
* @throws \CodeException * @throws \CodeException
* @throws \DbException * @throws \DbException
* @throws \UserFormException * @throws \UserFormException
......
...@@ -193,8 +193,8 @@ class Checkbox { ...@@ -193,8 +193,8 @@ class Checkbox {
/** /**
* Build as many Checkboxes as items. * Build as many Checkboxes as items.
* *
* Layout: The Bootstrap Layout needs very special setup, the checkboxes are wrapped differently with <div * Layout: The Bootstrap Layout needs very special setup, the checkboxes are wrapped differently with
* class=checkbox> depending of if they aligned horizontal or vertical. * <div class=checkbox> depending of if they aligned horizontal or vertical.
* @param array $formElement * @param array $formElement
* @param string $htmlFormElementName * @param string $htmlFormElementName
* @param string $attributeBase * @param string $attributeBase
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment