diff options
| author | Robert Jaros <rjaros@finn.pl> | 2019-10-07 09:58:14 +0200 |
|---|---|---|
| committer | Robert Jaros <rjaros@finn.pl> | 2019-10-07 09:58:14 +0200 |
| commit | 04ac8542c218b7ce5199350f0880e8f7cb4252b6 (patch) | |
| tree | 4f96d1c3bb8281289b96e2b11eecc404a3c98788 /kvision-modules | |
| parent | 6678eec9799681b09e5ac85de1a39596d56de22f (diff) | |
| parent | 6b14906f0e35dc522bd1c1a44682d728315cf619 (diff) | |
| download | kvision-04ac8542c218b7ce5199350f0880e8f7cb4252b6.tar.gz kvision-04ac8542c218b7ce5199350f0880e8f7cb4252b6.tar.bz2 kvision-04ac8542c218b7ce5199350f0880e8f7cb4252b6.zip | |
Merge branch 'bs4'
Diffstat (limited to 'kvision-modules')
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/build.gradle | 9 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/package.json.d/project.info | 3 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrapCss.kt | 35 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/webpack.config.d/bootstrap.js | 4 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/webpack.config.d/css.js (renamed from kvision-modules/kvision-datetime/webpack.config.d/css.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-css/webpack.config.d/jquery.js (renamed from kvision-modules/kvision-spinner/webpack.config.d/jquery.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/build.gradle | 13 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/package.json.d/project.info (renamed from kvision-modules/kvision-datetime/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/KVManagerDatetime.kt | 36 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt (renamed from kvision-modules/kvision-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt) | 99 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt | 377 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt (renamed from kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt (renamed from kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt) | 8 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt (renamed from kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt) | 4 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-datetime/webpack.config.d/css.js (renamed from kvision-modules/kvision-select/webpack.config.d/css.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-dialog/build.gradle | 6 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-dialog/package.json.d/project.info (renamed from kvision-modules/kvision-dialog/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt (renamed from kvision-modules/kvision-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-dialog/webpack.config.d/css.js (renamed from kvision-modules/kvision-spinner/webpack.config.d/css.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select-remote/build.gradle (renamed from kvision-modules/kvision-select-remote/build.gradle) | 2 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select-remote/package.json.d/project.info (renamed from kvision-modules/kvision-select-remote/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt (renamed from kvision-modules/kvision-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt) | 8 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt (renamed from kvision-modules/kvision-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select-remote/webpack.config.d/css.js (renamed from kvision-modules/kvision-upload/webpack.config.d/css.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/build.gradle | 14 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/package.json.d/project.info (renamed from kvision-modules/kvision-select/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/KVManagerSelect.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/KVManagerSelect.kt) | 21 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/AjaxOptions.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/form/select/AjaxOptions.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt) | 8 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt) | 8 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectOptGroup.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectOptGroup.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectOption.kt (renamed from kvision-modules/kvision-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectOption.kt) | 6 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.cs-CZ.min.js | 23 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.de-DE.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.de-DE.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.en-US.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.en-US.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.es-ES.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.es-ES.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.fr-FR.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.fr-FR.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.it-IT.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.it-IT.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ja-JP.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ja-JP.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ko-KR.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ko-KR.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.nl-NL.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.nl-NL.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.pl-PL.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.pl-PL.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.pt-BR.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.pt-BR.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ru-RU.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.ru-RU.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.sr-SP.min.js | 23 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.tr-TR.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/ajax-bootstrap-select/ajax-bootstrap-select.tr-TR.min.js) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/main/resources/js/locales/bootstrap-select/bootstrap-select-i18n.min.js (renamed from kvision-modules/kvision-select/src/main/resources/js/locales/bootstrap-select/bootstrap-select-i18n.min.js) | 2 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt (renamed from kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt (renamed from kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt) | 2 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt (renamed from kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt (renamed from kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt) | 4 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt (renamed from kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt) | 6 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/webpack.config.d/css.js | 2 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-select/webpack.config.d/jquery.js | 5 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/build.gradle | 13 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/package.json.d/project.info (renamed from kvision-modules/kvision-spinner/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/main/kotlin/pl/treksoft/kvision/KVManagerSpinner.kt (renamed from kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/KVManagerSpinner.kt) | 10 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/Spinner.kt (renamed from kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/Spinner.kt) | 72 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt (renamed from kvision-modules/kvision-spinner/src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt) | 86 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt (renamed from kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt (renamed from kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt (renamed from kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt) | 4 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/webpack.config.d/css.js | 2 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-spinner/webpack.config.d/jquery.js | 5 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/build.gradle | 14 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/package.json.d/project.info (renamed from kvision-modules/kvision-upload/package.json.d/project.info) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt (renamed from kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt) | 22 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/Upload.kt (renamed from kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/Upload.kt) | 8 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt (renamed from kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt) | 12 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/utils/Utils.kt (renamed from kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/utils/Utils.kt) | 0 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/ar.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/ar.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/az.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/az.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/bg.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/bg.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/ca.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/ca.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/cr.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/cr.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/cs.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/cs.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/da.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/da.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/de.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/de.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/el.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/el.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/es.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/es.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/et.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/et.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/fa.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/fa.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/fi.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/fi.js) | 14 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/fr.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/fr.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/gl.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/gl.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/he.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/he.js) | 11 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/hu.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/hu.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/id.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/id.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/it.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/it.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/ja.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/ja.js) | 15 | ||||
| -rw-r--r-- | kvision-modules/kvision-bootstrap-upload/src/main/resources/js/locales/bootstrap-fileinput/ka.js (renamed from kvision-modules/kvision-upload/src/main/resources/js/locales/bootstrap-fileinput/ka.js) | 15 | ||||