Skip to content

Commit

Permalink
Merge branch 'release/v.1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thejuse committed Jun 26, 2018
2 parents fdd77ca + e0b6fb8 commit c557176
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 30 deletions.
40 changes: 26 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
# Changelog
All notable changes to this project will be documented in this file.

## 1.2.0
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.2.1] - 2018-06-26
### Changed
- Text of Constants description
- Updated Changelog.md
- Description of Extension

## [1.2.0] - 2018-03-22
### Added
* Positions of cookieconsent
* Subcategorys for constants
* Layouts of cookieconsent
- Positions of cookieconsent
- Subcategorys for constants
- Layouts of cookieconsent

## 1.1.0
## [1.1.0] - 2018-03-15
### Added
* Changelog.md
- Changelog

### Changed
* headerData to footerData
* minifyed Javascript code
* ConstantNames -> Added Prefix
- headerData to footerData
- minifyed Javascript code
- ConstantNames -> Added Prefix

## 1.0.1
## [1.0.1] - 2018-03-14
### Changed
* id of headerData
* Description of Constants in Constanteditor
- Id of headerData
- Constants description

## 1.0.0
* Initial Release
## [1.0.0] - 2018-03-14
- Initial Release
26 changes: 13 additions & 13 deletions cookiebanner/Configuration/TypoScript/constants.typoscript
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@
##### ####
################################
cookiebanner{
# cat=cookiebanner:Advanced/paths; type=string; label= Private Directory : Diractory for the Private Folder
# cat=cookiebanner:Advanced/paths; type=string; label= Private Path : Path to private folder of extension
privateDir = EXT:cookiebanner/Resources/Private
# cat=cookiebanner:Advanced/paths; type=string; label= Public Directory : Diractory for the Public Folder
# cat=cookiebanner:Advanced/paths; type=string; label= Public Path : Path to public folder of extension
publicDir = EXT:cookiebanner/Resources/Public

# cat=cookiebanner:Advanced/config; type=boolean; label= CSS Force Top : Force the CSS to be Top
# cat=cookiebanner:Advanced/config; type=boolean; label= CSS Force Top : Force the css to be on the top
cssTop = 1
# cat=cookiebanner:Advanced/config; type=boolean; label= JavaScript Force Top : Force the JavaScript to be Top
# cat=cookiebanner:Advanced/config; type=boolean; label= JavaScript Force Top : Force the JavaScript to be on the top
jsTop = 1

# cat=cookiebanner/content; type=string; label= Banner-Text : Change the text of banner
# cat=cookiebanner/content; type=string; label= Banner-Text : Text of the Banner
bannerText = Diese Webseite verwendet Cookies, um die Bedienfreundlichkeit zu erhöhen
# cat=cookiebanner/content; type=string; label= Dismiss-Text : Change the text of Dismiss Button
# cat=cookiebanner/content; type=string; label= Dismiss-Text : Text of the dismiss button
dismissText = OK
# cat=cookiebanner/content; type=string; label= ReadMore-Text : Change the text of the Readmore
# cat=cookiebanner/content; type=string; label= ReadMore-Text : Text of the more link
moreText = Mehr lesen
# cat=cookiebanner/content; type=string; label= ReadMore-Link : Change the Link of the Readmore
# cat=cookiebanner/content; type=string; label= ReadMore-Link : URL of the more link
moreLink = https://www.jseidl.at/datenschutz

# cat=cookiebanner/design; type=options[Bottom=bottom,Top=top,Left=left,Right=right]; label= Position : Position of the banner
bannerPosition = bottom
# cat=cookiebanner/design; type=options[Block=block,Classic=classic,Edgeless=edgeless]; label= Layout : Change the layout of the banner
# cat=cookiebanner/design; type=options[Block=block,Classic=classic,Edgeless=edgeless]; label= Layout : Layout of the banner
bannerLayout = block

# cat=cookiebanner/colors; type=string; label= Color-Button-Text : The Button Text Color
# cat=cookiebanner/colors; type=string; label= Button Text Color : Background-color of the button
colorTextButton = #780c0d
# cat=cookiebanner/colors; type=string; label= Color-Button Background : Change the Button Background color
# cat=cookiebanner/colors; type=string; label= Button Background-Color: Text-color of the button
colorButton = #ffffff

# cat=cookiebanner/colors; type=string; label= Color Text : Change the color of the Text
# cat=cookiebanner/colors; type=string; label= Banner Text Color : Text-color of the banner
colorText = #ffffff
# cat=cookiebanner/colors; type=string; label= Color Background : Change the color of the Background
# cat=cookiebanner/colors; type=string; label= Banner Background-Color : Background-color of the banner
colorBG = #780c0d
}
6 changes: 3 additions & 3 deletions cookiebanner/ext_emconf.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php
$EM_CONF[$_EXTKEY] = [
'title' => 'Cookiebanner',
'description' => 'Adds a Cookieconsent-banner',
'description' => 'Cookieconsent-Banner for DSGVO/GDPR',
'category' => 'plugin',
'author' => 'Julian Seidl',
'author_email' => '[email protected]',
'state' => 'stable',
'internal' => '',
'uploadfolder' => '0',
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '1.2.0',
'clearCacheOnLoad' => 1,
'version' => '1.2.1',
'constraints' => [
'depends' => [
'typo3' => '8.7.0-8.7.99',
Expand Down

0 comments on commit c557176

Please sign in to comment.