Commit af55812d authored by Thomas Löffler's avatar Thomas Löffler

Updates to t3olayout v2

* Usage of bootstrap v4-beta
* Usage of gridelements
* Changes templates to fulfill bootstrap standard
parent 3deaa396
Pipeline #3005 passed with stages
in 5 minutes and 4 seconds
{ {
"name": "t3o/ter", "name": "t3o/ter",
"description": "Website for TYPO3 Extension Repository", "description": "Website for TYPO3 Extension Repository",
"minimum-stability": "stable", "minimum-stability": "dev",
"authors": [ "authors": [
{ {
"name": "t3o team", "name": "t3o team",
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"helhum/typo3-console": "^4.5", "helhum/typo3-console": "^4.5",
"dmitryd/typo3-realurl": "^2.2", "dmitryd/typo3-realurl": "^2.2",
"apache-solr-for-typo3/solr": "^7.0", "apache-solr-for-typo3/solr": "^7.0",
"t3o/t3olayout": "^1.0", "t3o/t3olayout": "^2.0",
"nikic/php-parser": "^3.1" "nikic/php-parser": "^3.1"
}, },
"config": { "config": {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "4929f989aa53adf1f1cca6a2c0557cb3", "content-hash": "83639c916b961cc3aa6b2d81095e9b83",
"packages": [ "packages": [
{ {
"name": "apache-solr-for-typo3/solr", "name": "apache-solr-for-typo3/solr",
...@@ -715,6 +715,40 @@ ...@@ -715,6 +715,40 @@
], ],
"time": "2014-09-09T13:34:57+00:00" "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", "name": "guzzlehttp/guzzle",
"version": "6.3.0", "version": "6.3.0",
...@@ -1624,13 +1658,14 @@ ...@@ -1624,13 +1658,14 @@
}, },
{ {
"name": "t3o/t3olayout", "name": "t3o/t3olayout",
"version": "1.0.10", "version": "2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git", "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
"reference": "2939bfe9ba8316730365fcd5fe78f2542960454a" "reference": "12fc4cdb182d40653b4940c29a9be45285561534"
}, },
"require": { "require": {
"gridelementsteam/gridelements": "dev-master",
"typo3-ter/ig-ldap-sso-auth": "^3.2" "typo3-ter/ig-ldap-sso-auth": "^3.2"
}, },
"type": "typo3-cms-extension", "type": "typo3-cms-extension",
...@@ -1647,7 +1682,7 @@ ...@@ -1647,7 +1682,7 @@
"keywords": [ "keywords": [
"TYPO3 CMS" "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", "name": "typo3-ter/ig-ldap-sso-auth",
...@@ -2088,7 +2123,7 @@ ...@@ -2088,7 +2123,7 @@
], ],
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "dev",
"stability-flags": [], "stability-flags": [],
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</h5> </h5>
</div> </div>
<div id="install-zip" class="collapse show" role="tabpanel" aria-labelledby="headingOne"> <div id="install-zip" class="collapse show" role="tabpanel" aria-labelledby="headingOne">
<div class="card-block"> <div class="card-body">
<ol> <ol>
<li> <li>
<f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 'zip'}"> <f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 'zip'}">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</h5> </h5>
</div> </div>
<div id="install-composer" class="collapse" role="tabpanel" aria-labelledby="headingTwo"> <div id="install-composer" class="collapse" role="tabpanel" aria-labelledby="headingTwo">
<div class="card-block"> <div class="card-body">
<ol> <ol>
<li> <li>
Go to your folder where the root composer.json file is located Go to your folder where the root composer.json file is located
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</h5> </h5>
</div> </div>
<div id="install-t3x" class="collapse" role="tabpanel" aria-labelledby="headingThree"> <div id="install-t3x" class="collapse" role="tabpanel" aria-labelledby="headingThree">
<div class="card-block"> <div class="card-body">
<ol> <ol>
<li> <li>
<f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 't3x'}"> <f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 't3x'}">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="card-header"> <div class="card-header">
<span class="facet-label">{facet.label}</span> <span class="facet-label">{facet.label}</span>
</div> </div>
<div class="card-block"> <div class="card-body">
<div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}"> <div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}">
<f:for each="{facet.options}" as="option" iteration="iteration"> <f:for each="{facet.options}" as="option" iteration="iteration">
<a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 mr-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}"> <a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 mr-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="card-header"> <div class="card-header">
<span class="facet-label">{facet.label}</span> <span class="facet-label">{facet.label}</span>
</div> </div>
<div class="card-block"> <div class="card-body">
<div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}"> <div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}">
<f:for each="{facet.options}" as="option" iteration="iteration"> <f:for each="{facet.options}" as="option" iteration="iteration">
<a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}"> <a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}">
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<s:translate key="sponsored" /> <s:translate key="sponsored" />
</div> </div>
</f:if> </f:if>
<div class="card-block"> <div class="card-body">
<div class="align-items-center"> <div class="align-items-center">
<h3 class="card-title"> <h3 class="card-title">
<f:if condition="{document.extensionIcon_stringS}"> <f:if condition="{document.extensionIcon_stringS}">
...@@ -52,11 +52,9 @@ ...@@ -52,11 +52,9 @@
</div> </div>
<f:if condition="{document.insecure_boolS}"> <f:if condition="{document.insecure_boolS}">
<f:else> <f:else>
<div class=""> <a class="btn btn-outline-primary btn-block mb-0" href="{document.extensionDownloadZipUrl_stringS}">
<a class="btn btn-outline-primary btn-block" href="{document.extensionDownloadZipUrl_stringS}">
<i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP <i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP
</a> </a>
</div>
</f:else> </f:else>
</f:if> </f:if>
</li> </li>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="card-header"> <div class="card-header">
<s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate> <s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate>
</div> </div>
<div class="card-block"> <div class="card-body">
<ul class="facets list-unstyled"> <ul class="facets list-unstyled">
<f:for each="{resultSet.facets.used}" as="facet"> <f:for each="{resultSet.facets.used}" as="facet">
<f:for each="{facet.allFacetItems.selected}" as="item"> <f:for each="{facet.allFacetItems.selected}" as="item">
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="input-group input-group-lg"> <div class="input-group input-group-lg">
<input type="text" class="form-control" placeholder="Search for extensions, tags, author..." name="tx_solr[q]" value="{q}"> <input type="text" class="form-control" placeholder="Search for extensions, tags, author..." name="tx_solr[q]" value="{q}">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-primary" type="button"> <button type="submit" class="btn btn-primary mb-0 mt-0" type="button">
<s:translate key="submit" default="Search" /> <s:translate key="submit" default="Search" />
</button> </button>
</span> </span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment