diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 0000000..b45e6af --- /dev/null +++ b/.yarnrc @@ -0,0 +1,2 @@ +# ./.yarnrc +--modules-folder public/vendor diff --git a/composer.json b/composer.json index 675564c..8a24d76 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "oneplace/oneplace-core", "description": "onePlace Core Application", "type": "project", - "version": "1.0.10", + "version": "1.0.11", "license": "BSD-3-Clause", "keywords": [ "laminas", diff --git a/docs/book/installation.md b/docs/book/installation.md index 76f5618..37f14ec 100644 --- a/docs/book/installation.md +++ b/docs/book/installation.md @@ -9,93 +9,13 @@ $ composer create-project oneplace/oneplace-core my-app After you successfully installed core, you may add 3rd party dependencies for certain features (they are disabled if libs are not found) -Add them to ./public/vendor +the easiest way is to use yarn. if you dont have yarn, [get it here](https://legacy.yarnpkg.com/en/docs/install/#windows-stable) +you can also use npm if you like -* [jQuery UI 1.12.1](https://jqueryui.com/download/) -> For Drag & Drop Index Columns ``` -. -+-- jquery-ui -| +-- jquery-ui.min.css -| +-- jquery-ui.min.js +$ cd my-app +$ yarn install ``` - -* [Apex Charts](https://apexcharts.com/) -> For all Daily Stats Charts and many more -``` -. -+-- apexcharts -| +-- apexcharts.css -| +-- apexcharts.min.js -``` - -* [Font Awesome 5.12.0 Free or Pro](https://fontawesome.com/) -> For all icons across onePlace -``` -. -+-- fontawesome -| +-- css -| | +-- all.min.css -| +-- webfonts -| | +-- fa-brands-400.eot/svg/ttf/woff/woff2 -| | +-- ..(all fonts in package) -``` - -* [Filepond 4.9.4](https://github.com/pqina/filepond/releases) - * [file-validate-size](https://github.com/pqina/filepond-plugin-file-validate-size/releases) - * [file-validate-type](https://github.com/pqina/filepond-plugin-file-validate-type/releases) - * [image-validate-size](https://github.com/pqina/filepond-plugin-image-validate-size/releases) - * [image-crop](https://github.com/pqina/filepond-plugin-image-crop/releases) - * [image-preview](https://github.com/pqina/filepond-plugin-image-preview/releases) - * [image-resize](https://github.com/pqina/filepond-plugin-image-resize/releases) - * [image-exif-orientation](https://github.com/pqina/filepond-plugin-image-exif-orientation/releases) - * [image-transform](https://github.com/pqina/filepond-plugin-image-transform/releases) -> For Featured Image Upload -``` -. -+-- filepond -| +-- filepond.css -| +-- filepond-plugin-image-preview.css -| +-- filepond.min.js -| +-- filepond-plugin-image-preview.js -``` - -* [Uppy 1.8.0](https://github.com/transloadit/uppy/releases) - * + @uppy/xhr-upload@1.4.2 -> For Image Gallery Upload -``` -. -+-- uppy -| +-- filepond.css -| +-- filepond-plugin-image-preview.css -| +-- filepond.min.js -| +-- filepond-plugin-image-preview.js -``` - -* [Summernote 0.8.15](https://github.com/summernote/summernote/releases) -> Texteditor -``` -. -+-- summernote -| +-- summernote-bs4.min.js -| +-- summernote-bs4.min.css -| +-- lang -| +-- font -``` - -* [Select2 4.0.x](https://github.com/select2/select2/releases) -> For all Select und Multiselect Fields -``` -. -+-- select2 -| +-- css -| | +-- select2.min.css -| +-- js -| | +-- i18n -| | | +-- *.js (all languages you want/need) -| | +-- select2.full.min.js -``` - ## support for environment variables in setup if you are testing and often have to deploy the same oneplace system. diff --git a/module/Application/src/Module.php b/module/Application/src/Module.php index f25710c..67882dd 100644 --- a/module/Application/src/Module.php +++ b/module/Application/src/Module.php @@ -24,9 +24,9 @@ class Module { /** * Module Version * - * @since 1.0.10 + * @since 1.0.11 */ - const VERSION = '1.0.10'; + const VERSION = '1.0.11'; public function getConfig() : array { return include __DIR__ . '/../config/module.config.php'; diff --git a/module/Application/view/layout/layout-default.phtml b/module/Application/view/layout/layout-default.phtml index 976eed3..dfcdd98 100644 --- a/module/Application/view/layout/layout-default.phtml +++ b/module/Application/view/layout/layout-default.phtml @@ -1,13 +1,19 @@ = $this->doctype() ?>
- = $this->headTitle('onePlace X - RC 1')->setSeparator(' - ')->setAutoEscape(false) ?> + = $this->headTitle($sPlcTitle)->setSeparator(' - ')->setAutoEscape(false) ?> = $this->headMeta() ->appendName('viewport', 'width=device-width, initial-scale=1.0') @@ -16,30 +22,30 @@ use Application\Controller\CoreController; = $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico']) - ->prependStylesheet($this->basePath('css/style.css')) - ->prependStylesheet($this->basePath('vendor/summernote/summernote-bs4.min.css')) - ->prependStylesheet($this->basePath('vendor/fontawesome/css/all.min.css')) - ->prependStylesheet($this->basePath('vendor/filepond/filepond-plugin-image-preview.min.css')) - ->prependStylesheet($this->basePath('vendor/filepond/filepond.css')) - ->prependStylesheet($this->basePath('vendor/apexcharts/css/apexcharts.css')) - ->prependStylesheet($this->basePath('vendor/select2/css/select2.min.css')) - ->prependStylesheet($this->basePath('vendor/jquery-ui/jquery-ui.min.css')) - ->prependStylesheet($this->basePath('css/bootstrap.min.css')) + ->prependStylesheet($this->basePath('/css/style.css')) + ->prependStylesheet($this->basePath('/vendor/@fortawesome/fontawesome-free/css/all.min.css')) + ->prependStylesheet($this->basePath('/vendor/summernote/dist/summernote-bs4.min.css')) + ->prependStylesheet($this->basePath('/vendor/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css')) + ->prependStylesheet($this->basePath('/vendor/filepond/dist/filepond.min.css')) + ->prependStylesheet($this->basePath('/vendor/uppy/dist/uppy.min.css')) + ->prependStylesheet($this->basePath('/vendor/apexcharts/dist/apexcharts.min.css')) + ->prependStylesheet($this->basePath('/vendor/select2/dist/css/select2.min.css')) + ->prependStylesheet($this->basePath('/vendor/bootstrap/dist/css/bootstrap.min.css')) ?> - = $this->inlineScript() - ->prependFile($this->basePath('js/plc-message.js')) - ->prependFile($this->basePath('js/listener.js')) - ->prependFile($this->basePath('vendor/summernote/summernote-bs4.min.js')) - ->prependFile($this->basePath('vendor/apexcharts/apexcharts.min.js')) - ->prependFile($this->basePath('vendor/jquery-ui/jquery-ui.min.js')) - ->prependFile($this->basePath('vendor/select2/js/select2.full.min.js')) - ->prependFile($this->basePath('js/bootstrap.min.js')) - ->prependFile($this->basePath('js/jquery-3.4.1.min.js')) + ->prependFile($this->basePath('/js/plc-message.js')) + ->prependFile($this->basePath('/js/listener.js')) + ->prependFile($this->basePath('/vendor/@fortawesome/fontawesome-free/js/all.min.js')) + ->prependFile($this->basePath('/vendor/sweetalert/dist/sweetalert.min.js')) + ->prependFile($this->basePath('/vendor/summernote/dist/summernote-bs4.min.js')) + ->prependFile($this->basePath('/vendor/apexcharts/dist/apexcharts.min.js')) + ->prependFile($this->basePath('/vendor/jquery-ui-sortable/jquery-ui.min.js')) + ->prependFile($this->basePath('/vendor/select2/dist/js/select2.full.min.js')) + ->prependFile($this->basePath('/vendor/bootstrap/dist/js/bootstrap.min.js')) + ->prependFile($this->basePath('/vendor/jquery/dist/jquery.min.js')) ?> - @@ -50,7 +56,7 @@ use Application\Controller\CoreController; - onePlace X + onePlace = $this->inlineScript() ?> diff --git a/module/Application/view/partial/viewform.phtml b/module/Application/view/partial/viewform.phtml index 8939d38..ece67b9 100644 --- a/module/Application/view/partial/viewform.phtml +++ b/module/Application/view/partial/viewform.phtml @@ -34,14 +34,14 @@ hasFeaturedImage()) { ?> - - - - - - - - + + + + + + + + +