From af55812d70e85f14930278aa247282d29f247171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Fri, 8 Dec 2017 14:35:31 +0100 Subject: [PATCH] Updates to t3olayout v2 * Usage of bootstrap v4-beta * Usage of gridelements * Changes templates to fulfill bootstrap standard --- composer.json | 4 +- composer.lock | 45 ++++++++++++++++--- .../Private/Partials/InstallationHowTo.html | 6 +-- .../Partials/Solr/Facets/OptionsTags.html | 2 +- .../Partials/Solr/Facets/OptionsTypo3.html | 2 +- .../Partials/Solr/Result/Document.html | 10 ++--- .../Private/Partials/Solr/Result/Facets.html | 2 +- .../Private/Partials/Solr/Search/Form.html | 2 +- 8 files changed, 53 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 4660d185..ae4649c5 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "t3o/ter", "description": "Website for TYPO3 Extension Repository", - "minimum-stability": "stable", + "minimum-stability": "dev", "authors": [ { "name": "t3o team", @@ -27,7 +27,7 @@ "helhum/typo3-console": "^4.5", "dmitryd/typo3-realurl": "^2.2", "apache-solr-for-typo3/solr": "^7.0", - "t3o/t3olayout": "^1.0", + "t3o/t3olayout": "^2.0", "nikic/php-parser": "^3.1" }, "config": { diff --git a/composer.lock b/composer.lock index 421a57e6..a8b42742 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "4929f989aa53adf1f1cca6a2c0557cb3", + "content-hash": "83639c916b961cc3aa6b2d81095e9b83", "packages": [ { "name": "apache-solr-for-typo3/solr", @@ -715,6 +715,40 @@ ], "time": "2014-09-09T13:34:57+00:00" }, + { + "name": "gridelementsteam/gridelements", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://git.typo3.org/TYPO3CMS/Extensions/gridelements.git", + "reference": "e4ca6909c31ac02296a6b28f5c27a8d837538a8a" + }, + "require": { + "typo3/cms-core": "~8.0" + }, + "replace": { + "gridelements": "self.version", + "typo3-ter/gridelements": "self.version" + }, + "type": "typo3-cms-extension", + "autoload": { + "psr-4": { + "GridElementsTeam\\Gridelements\\": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "This extension integrates the grid layout concept to regular content elements.", + "homepage": "https://forge.typo3.org/projects/extension-gridelements2", + "keywords": [ + "Gridelements", + "TYPO3 CMS", + "grids" + ], + "time": "2017-09-21T07:38:47+00:00" + }, { "name": "guzzlehttp/guzzle", "version": "6.3.0", @@ -1624,13 +1658,14 @@ }, { "name": "t3o/t3olayout", - "version": "1.0.10", + "version": "2.0.0", "source": { "type": "git", "url": "https://git-t3o.typo3.org/t3o/t3olayout.git", - "reference": "2939bfe9ba8316730365fcd5fe78f2542960454a" + "reference": "12fc4cdb182d40653b4940c29a9be45285561534" }, "require": { + "gridelementsteam/gridelements": "dev-master", "typo3-ter/ig-ldap-sso-auth": "^3.2" }, "type": "typo3-cms-extension", @@ -1647,7 +1682,7 @@ "keywords": [ "TYPO3 CMS" ], - "time": "2017-09-18T09:57:57+00:00" + "time": "2017-12-08T12:47:15+00:00" }, { "name": "typo3-ter/ig-ldap-sso-auth", @@ -2088,7 +2123,7 @@ ], "packages-dev": [], "aliases": [], - "minimum-stability": "stable", + "minimum-stability": "dev", "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, diff --git a/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html b/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html index 67ebe00e..99669cdb 100644 --- a/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html +++ b/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html @@ -9,7 +9,7 @@
-
+
  1. @@ -43,7 +43,7 @@
-
+
  1. Go to your folder where the root composer.json file is located @@ -66,7 +66,7 @@
-
+
  1. diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html index b036d748..74bde752 100644 --- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html +++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html @@ -6,7 +6,7 @@
    {facet.label}
    -
    +
    diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html index 1ccd2d22..7fe45cae 100644 --- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html +++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html @@ -5,7 +5,7 @@
    {facet.label}
    -
    +
    diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html index 32422159..088f397c 100644 --- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html +++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html @@ -14,7 +14,7 @@
    -
    +

    @@ -52,11 +52,9 @@

    -     + + Download version {document.extensionVersion_stringS} as ZIP +
    2. diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html index d0abe866..89001656 100644 --- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html +++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html @@ -10,7 +10,7 @@
    Used facets
    -
    +
      diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html index f4994a2c..7bb46e6d 100644 --- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html +++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html @@ -12,7 +12,7 @@
      - -- GitLab