Skip to content

Commit

Permalink
Merge pull request #17 from contao-thememanager/develop
Browse files Browse the repository at this point in the history
Rework and version 1.5 preparation
  • Loading branch information
zoglo authored Nov 23, 2022
2 parents bccff31 + 8d11839 commit bdec578
Show file tree
Hide file tree
Showing 182 changed files with 4,824 additions and 3,614 deletions.
362 changes: 362 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -656,4 +656,5 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see

<https://www.gnu.org/licenses/>.
25 changes: 12 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p align="center"><i>Provides a basic framework on which different themes can be built.</i></p>
<p align="center">
<a href="https://www.oveleon.de"><img src="https://img.shields.io/badge/oveleon-maintained-83aa0e?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAUCAYAAABvVQZ0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM5MjZBNjQzMzZFQjExRUFBMTdBQkNFQTAxNjg2RDI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM5MjZBNjQyMzZFQjExRUFBMTdBQkNFQTAxNjg2RDI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIElsbHVzdHJhdG9yIENTNiAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDplMDhkZDhmZC1mOTA4LTQ5YzItYWMwZC00OGE3YTI4ODc2YWEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6OTA2RDhGOENERUQxRTgxMTgyMjVBMzBGQ0NBNjE4RUQiLz4gPGRjOnRpdGxlPiA8cmRmOkFsdD4gPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij5Mb2dvX292ZWxlb25fWmVpY2hlbl9yejwvcmRmOmxpPiA8L3JkZjpBbHQ+IDwvZGM6dGl0bGU+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+P8iBTQAAAbFJREFUeNqU08srRFEcB/BromGGaJRHKSIaYfIm7JRSsvHIyuM/wMorNeEfUMqKnbKwU2TBwpSUSWYWFmSBDKWmWcgwcX2Pvrc5HXfuXL/6zD2P3z2Puedouq5rilG40JPxAuUmeX84tGTkwyXsghOWYQmKoFazExzVDXFIgEeazcPV9TCnzGplRiHMl7KgCWYghy9vQAasMEfkTqQarJ9JFWw0YlhJFv2rUv8tdKiDhTib0eiHQyhOsR2xyjlp0BF5MBELdr6WohE++X6raBOz6PwWCfiCOLzDN8sRGICYyfdrgBA8Q2kmfnzQJirghlw+XZANUQ5qFmHY52R9/9lWCXjBpbRPcaubDhtHsRoOuN1reAO/1H/PpzfdaqrggzOLK7YFD6zPMqeL9at0gwWZuKa0i3hkuZf1E6tteqEZnmCRbZVwxPIOn3V83litaogzbrPuhDOIwbyUd8q8SavBOpl0rnxROadFugkFVoOJAx1h4rRJvw9e2b9u3ACrY9ENAZaD/L/E0aiHMbbfQc3v7bFxWAchqptHAAqN3HQrM0JcsXFohzzexWPYk5N+BBgAix5VyvzRZbwAAAAASUVORK5CYII=" alt="Oveleon"></a>
<a href="https://github.com/contao-thememanager/core"><img src="https://img.shields.io/badge/license-MIT-83aa0e?style=flat-square"/></a>
<a href="https://github.com/contao-thememanager/core"><img src="https://img.shields.io/badge/license-AGPLv3-83aa0e?style=flat-square"/></a>
<a href="https://github.com/contao-thememanager/core"><img src="https://img.shields.io/badge/stable-master-83aa0e?style=flat-square"/></a>
<a href="https://packagist.org/packages/contao-thememanager/core"><img src="https://img.shields.io/packagist/dt/contao-thememanager/core?color=0A7BBC&style=flat-square"/></a>
</p>
Expand All @@ -14,33 +14,32 @@
- Grid
- Layout
- Colors
- Headings and Fonts
- Forms and Formfield explanation icons / images
- Links and Buttons
- Headings and fonts
- Forms and formfield explanation icons / images
- Links and buttons
- Default component styling
- Article and component spacing
- Icons
- Boxed-Elements
- New Content-Elements (based on Rocksolid Custom Elements) [🔗](https://github.com/madeyourday/contao-rocksolid-custom-elements)
- Boxed-elements
- New content elements (based on Rocksolid Custom Elements) [🔗](https://github.com/madeyourday/contao-rocksolid-custom-elements)
- _and more ..._


### Tools:
- Backend Config for SCSS-Variables
- Theme-Compiler for generate/renew CSS-Files from Config
- StyleManager
- __Custom Skin integration to customize the whole website based on this framework__ 🎭
- Backend configuration for SCSS-variables [🔗](https://github.com/oveleon/contao-config-driver-bundle)
- Theme-Compiler for generating and renewing CSS-Files from the configuration [🔗](https://github.com/oveleon/contao-theme-compiler-bundle)
- StyleManager [🔗](https://github.com/oveleon/contao-component-style-manager)
- __Custom skin integration to customize the whole website based on this framework__ 🎭

### Extensions / Addons
- Slider (Tiny Slider) [🔗](https://github.com/contao-thememanager/ctm-tiny-slider)
- EstateManager (Contao EstateManager) [🔗](https://github.com/contao-thememanager/ctm-estatemanager)
- AdvancedForm (Contao AdvancedForm) [🔗](https://github.com/contao-thememanager/ctm-advanced-form)
- Recommendation (Contao Recommendation) [🔗](https://github.com/contao-thememanager/ctm-recommendation)
- EstateManager (Contao EstateManager) [🔗](https://github.com/contao-thememanager/ctm-estatemanager)
- _Further extensions will follow ..._


### Further Links
- [Documentation](https://github.com/contao-thememanager/docs)

### License

This project is licensed under the AGPL-3.0 License
141 changes: 141 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# Upgrading contao-thememanager

+ [Version 1.4 to 1.5](#version-14-to-15)

## Version 1.4 to 1.5

+ [Utility functions](#v15-changes-to-utility-functions)
+ [Template changes](#v15-changes-to-templates)
+ [StyleManager options](#v15-stylemanager-options)
+ [StyleManager archives](#v15-stylemanager-archives)

### v1.5 Changes to utility functions
- removed button-padding(), use subList() instead
- removed shorten-decimal-value(), use shortPercentage() instead
---
### v1.5 Changes to templates
Some templates have been updated in this version to fully support Contao 4.13.
If you have overwritten any of the following templates, you need to adjust them:
___
#### Contao Templates
```
- block_searchable.html5
- block_unsearchable.html5
- ce_download.html5
- ce_downloads.html5
- ce_headline.html5
- ce_list.html5
- ce_table.html5
- ce_toplink.html5
- form_captcha.html5
- form_checkbox.html5
- form_fieldsetStart.html5
- form_fieldsetStop.html5
- form_password.html5
- form_radio.html5
- form_rage.html5
- form_row.html5
- form_select.html5
- form_submit.html5
- form_textarea.html5
- form_textfield.html5
- form_upload.html5
- form_wrapper.html5
- fe_page.html5
- member_default.html5
- member_grouped.html5
- mod_article.html5
- mod_changePassword.html5
- mod_eventlist.html5
- mod_login.html5
- mod_navigation.html5
- mod_newslist.html5
- mod_password.html5
- mod_search.html5
```
___
#### ThemeManager Templates
```
- ce_wrapperStart.html5
- ce_wrapperStart_gridless.html5
- ce_wrapperStartBoxed.html5
- ce_wrapperStop.html5
- ce_wrapperStopBoxed.html5
- rsce_icon_text.html5
- rsce_icon_text_config.php
- rsce_icon_text_list.html5
- rsce_icon_text_list_config.php
- rsce_image_list.html5
- rsce_image_list_config.php
- rsce_image_text.html5
- rsce_image_text_config.php
- rsce_image_text_list.html5
- rsce_image_text_list_config.php
- rsce_text.html5
- rsce_text_config.php
- rsce_text_list.html5
- rsce_text_list_config.php
```
---
### v1.5 StyleManager options
- removed form-design for form-submit buttons, use normal button-design instead
---
### v1.5 StyleManager archives
This version loads all style-manager options through a bundle configuration,
hence you do not need to import the style-manager-*.xml files anymore.

If you've never customized any of the following ThemeManager Archives (all), you are able to

**DELETE**

the following archives:
___
#### Archives from contao-thememanager/core
```
- layout
- headline
- text
- button
- icon
- image
- divider
- background
- formInputIcon
- formimage
- articleSpacing
- gridForm
- gridColumn
- gridOffset
- gridOrder
- gridAlignment
- gridGutter
- gridList
- leftSpacing
- rightSpacing
- spacing
- navigation
```
___
#### Archives from contao-thememanager/ctm-tiny-slider
```
- sliderConfig
- slider
- sliderXS
- sliderS
- sliderM
- sliderL
- sliderXL
```
___
#### Archives from contao-thememanager/ctm-estatemanager
```
- exposeHeaderArea
- exposeContentTopArea
- exposeContentArea
- exposeLeftArea
- exposeMainArea
- exposeRightArea
- exposeContentBottomArea
- exposeFooterArea
```

71 changes: 44 additions & 27 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,68 @@
{
"name":"contao-thememanager/core",
"type":"contao-bundle",
"description":"Contao Theme-Manager",
"keywords":["contao","theme","css","manager"],
"homepage":"https://www.oveleon.de/thememanager.html",
"license":"MIT",
"authors":[
"name": "contao-thememanager/core",
"type": "contao-bundle",
"description": "Contao Theme-Manager",
"keywords": ["contao","theme","css","manager"],
"homepage": "https://www.oveleon.de/thememanager.html",
"license": "MIT",
"authors": [
{
"name":"Oveleon",
"homepage":"https://oveleon.de/",
"role":"Developer"
"name": "Oveleon",
"homepage": "https://oveleon.de/",
"role": "Developer"
},
{
"name": "Daniele Sciannimanica",
"homepage": "https://github.com/doishub",
"role": "Developer"
},
{
"name": "Sebastian Zoglowek",
"homepage": "https://github.com/zoglo",
"role": "Developer"
},
{
"name": "Fabian Ekert",
"homepage": "https://github.com/eki89",
"role": "Developer"
}
],
"require":{
"php":"^7.0 || ^8.0",
"contao/core-bundle":"^4.4",
"oveleon/contao-component-style-manager":"^2.4",
"oveleon/contao-theme-compiler-bundle":"^1.1",
"oveleon/contao-config-driver-bundle":"^1.0",
"require": {
"ext-dom": "*",
"ext-simplexml": "*",
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.13",
"oveleon/contao-component-style-manager": "^3.0",
"oveleon/contao-theme-compiler-bundle": "^1.2",
"oveleon/contao-config-driver-bundle": "^1.1",
"madeyourday/contao-rocksolid-custom-elements": "^2.2",
"madeyourday/contao-rocksolid-icon-picker": "^2.0"
"madeyourday/contao-rocksolid-icon-picker": "^2.0",
"symfony/filesystem": "^5.4"
},
"require-dev": {
"contao/manager-plugin": "^2.0"
"contao/manager-plugin": "^2.3.1"
},
"conflict": {
"contao/core": "*",
"contao/core-bundle": "4.4.1",
"contao/manager-plugin": "<2.0 || >=3.0"
},
"autoload":{
"autoload": {
"psr-4": {
"ContaoThemeManager\\Core\\": "src/"
},
"classmap": [
"src/Resources/contao/"
"contao/"
],
"exclude-from-classmap": [
"src/Resources/contao/config/",
"src/Resources/contao/dca/",
"src/Resources/contao/languages/",
"src/Resources/contao/templates/"
"contao/config/",
"contao/dca/",
"contao/languages/",
"contao/templates/"
]
},
"extra":{
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
"dev-master": "1.5.x-dev"
},
"contao-manager-plugin": "ContaoThemeManager\\Core\\ContaoManager\\Plugin"
}
Expand Down
Loading

0 comments on commit bdec578

Please sign in to comment.