diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php b/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
index 85be651692379ef9e99d6b1388485fc0f18256a5..7a31516727b4f66852495f512577fd0b92ece24b 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DistributionController.php
@@ -34,11 +34,35 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
class DistributionController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
/**
- * Displays welcoming page of a package
+ * @var \TYPO3\CMS\Core\Package\PackageManager
+ * @inject
+ */
+ protected $packageManager;
+
+ /**
+ * Shows information about the distribution
*
* @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
*/
- public function welcomeAction(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension) {
+ public function showAction(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension) {
+ $extensionKey = $extension->getExtensionKey();
+ // Check if extension/package is installed
+ $active = $this->packageManager->isPackageActive($extensionKey);
+
+ // Create link for extension configuration
+ if ($active && file_exists(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extensionKey) . 'ext_conf_template.txt')) {
+ $uriBuilder = $this->controllerContext->getUriBuilder();
+ $action = 'showConfigurationForm';
+ $configurationLink = $uriBuilder->reset()->uriFor(
+ $action,
+ array('extension' => array('key' => $extensionKey)),
+ 'Configuration'
+ );
+ } else {
+ $configurationLink = FALSE;
+ }
+ $this->view->assign('distributionActive', $active);
+ $this->view->assign('configurationLink', $configurationLink);
$this->view->assign('extension', $extension);
}
}
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 1fc708985ffcee30b901debdbf2335c0948a75c3..c4c34d607ab05d6f2fbe1714007e593ac70e3863 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -135,13 +135,19 @@ class DownloadController extends \TYPO3\CMS\Extensionmanager\Controller\Abstract
->assign('result', $result)
->assign('errorMessage', $errorMessage);
} else {
+ // FlashMessage that extension is installed
+ $this->addFlashMessage(
+ \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('distribution.welcome.message', 'extensionmanager')
+ . ' <strong>' . $extension->getExtensionKey() . '</strong>',
+ \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('distribution.welcome.headline', 'extensionmanager')
+ );
+
+ // Redirect to show action
$this->redirect(
- 'showConfigurationForm',
- 'Configuration',
+ 'show',
+ 'Distribution',
NULL,
- array(
- 'extension' => $this->installUtility->enrichExtensionWithDetails($extension->getExtensionKey())
- )
+ array('extension' => $extension)
);
}
}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf b/typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf
index 07c942f706c224ceadc6981105ffb45535d2d8ac..cdcd34df058cff1c0fee2893eb75afa4da66ebb3 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf
@@ -295,6 +295,9 @@
<trans-unit id="extensionList.distribution.version" xml:space="preserve">
<source>Version:</source>
</trans-unit>
+ <trans-unit id="extensionList.distribution.downloads" xml:space="preserve">
+ <source>Downloads</source>
+ </trans-unit>
<trans-unit id="extensionList.distribution.lastUpdated" xml:space="preserve">
<source>Last Update:</source>
</trans-unit>
@@ -352,6 +355,18 @@
<trans-unit id="distribution.welcome.openPageModule" xml:space="preserve">
<source>Start editing your website</source>
</trans-unit>
+ <trans-unit id="distribution.dependency.headline" xml:space="preserve">
+ <source>Dependencies, conflics and suggestions</source>
+ </trans-unit>
+ <trans-unit id="distribution.dependency.identifier" xml:space="preserve">
+ <source>Identifier</source>
+ </trans-unit>
+ <trans-unit id="distribution.dependency.type" xml:space="preserve">
+ <source>Type</source>
+ </trans-unit>
+ <trans-unit id="distribution.dependency.version" xml:space="preserve">
+ <source>Version</source>
+ </trans-unit>
<trans-unit id="task.updateExtensionListTask.name" xml:space="preserve">
<source>Update extension list</source>
</trans-unit>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
index 71fadf03f3aab0824280de87edb26db307cfdf93..69871ae78dc8135f329a6a9d03c23bafdd14950c 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/Distribution.html
@@ -9,7 +9,7 @@
/>
<div class="distribution-hover">
<div class="distribution-hover-inner">
- <dl class="distribution-info">
+ <dl class="description-horizontal">
<dt><f:translate key="extensionList.distribution.title" /></dt>
<dd>{distribution.title}</dd>
<dt><f:translate key="extensionList.distribution.key" /></dt>
@@ -24,7 +24,11 @@
</div>
</div>
<div class="distribution-meta">
- <h2 class="distribution-title">{distribution.title}</h2>
+ <h2 class="distribution-title">
+ <f:link.action action="show" controller="Distribution" arguments="{extension:distribution}" class="distribution-more">
+ {distribution.title}
+ </f:link.action>
+ </h2>
<div class="distribution-install">
<f:link.action action="installDistribution" controller="Download" arguments="{extension:distribution}" class="t3-button t3-button-action-installdistribution">
<span class="t3-icon t3-icon-actions t3-icon-system-extension-import"> </span><f:translate key="extensionList.installDistribution">Install</f:translate>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Scss/main.scss b/typo3/sysext/extensionmanager/Resources/Private/Scss/main.scss
index c78d38c46b54275a654d249c261a9f974a8c754b..bc32b39f662d91723d8e2315313d96bcd01e368b 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Scss/main.scss
+++ b/typo3/sysext/extensionmanager/Resources/Private/Scss/main.scss
@@ -14,7 +14,8 @@
@import "helpers/mixins";
// Import Modules
-@import "modules/tabs";
+@import "modules/tabs",
+ "modules/description";
// Appearance of the page
@import "page/base",
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Scss/modules/_description.scss b/typo3/sysext/extensionmanager/Resources/Private/Scss/modules/_description.scss
new file mode 100644
index 0000000000000000000000000000000000000000..9f5f7d38eddf5263658c2503259cd2c0a021abb5
--- /dev/null
+++ b/typo3/sysext/extensionmanager/Resources/Private/Scss/modules/_description.scss
@@ -0,0 +1,24 @@
+.description-horizontal {
+ @include clearfix();
+ margin-top: 0;
+ dt {
+ font-weight: bold;
+ float: left;
+ width: 60px;
+ clear: left;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ dd {
+ margin-left: 70px;
+ }
+ &.description-horizontal-wide {
+ dt {
+ width: 100px;
+ }
+ dd {
+ margin-left: 110px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_base.scss b/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_base.scss
index aaa2e6201817c40b6f29818e33668be4f239b39a..9ebb6c5f160eb40539a90b3a76ab1c391ed43a0b 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_base.scss
+++ b/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_base.scss
@@ -106,6 +106,28 @@
color: #fff;
}
+.alpha {
+ color: $alpha;
+}
+.beta {
+ color: $beta;
+}
+.stable {
+ color: $stable;
+}
+.experimental {
+ color: $experimental;
+}
+.test {
+ color: $test;
+}
+.obsolete {
+ color: $obsolete;
+}
+.excludeFromUpdates {
+ color: $excludeFromUpdates;
+}
+
.typo3-extension-list td.icons {
width: 140px;
}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_distribution.scss b/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_distribution.scss
index 377b0def2954bbce260030159ede5aa6ef2920ae..174d39013d0e17e3aca815da40fc8a9906704f0b 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_distribution.scss
+++ b/typo3/sysext/extensionmanager/Resources/Private/Scss/page/_distribution.scss
@@ -1,3 +1,6 @@
+/**
+ * Extension List View
+ **/
.distribution {
border: 1px solid darken($gray-lighter,15%);
background-color: $gray-lighter;
@@ -11,6 +14,9 @@
top: 0px;
opacity: 1;
}
+ .distribution-more {
+ text-decoration: underline;
+ }
}
}
.distribution-holder {
@@ -71,19 +77,52 @@
color: #FFFFFF;
}
}
-.distribution-info {
+
+
+/**
+ * Extension Detail View
+ **/
+.distribution-detail-flashmessage {
+ margin-bottom: 2.5em;
+ p {
+ padding-bottom: 0;
+ }
+}
+.distribution-detail {
@include clearfix();
- margin-top: 0;
- dt {
- font-weight: bold;
- float: left;
- width: 60px;
- clear: left;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ min-width: 750px;
+}
+.distribution-detail-previewpane {
+ float: left;
+ margin-right: 30px;
+}
+.distribution-detail-preview {
+ display: block;
+ border: 1px solid darken($gray-lighter,15%);
+}
+.distribution-detail-body {
+ overflow: hidden;
+ zoom: 1;
+}
+.distribution-detail-header {
+ h1 {
+ margin-bottom: 0.5em;
}
- dd {
- margin-left: 70px;
+ p {
+ padding: 0px;
+ max-width: 500px;
+ margin-bottom: 1.25em;
}
+ margin-bottom: 2.5em;
+}
+.distribution-detail-summary {
+ margin-top: 2.5em;
+ margin-bottom: 2.5em;
}
+.distribution-installed {
+ hr {
+ margin: 2.5em 0;
+ border: 0;
+ border-top: 1px solid darken($gray-lighter,15%);
+ }
+}
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Scss/var/_settings.scss b/typo3/sysext/extensionmanager/Resources/Private/Scss/var/_settings.scss
index 21e717fb36cbc4b891af0d9813d4254cbdd0dead..970bc8a36e6592d6be699cde071df37905f24707 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Scss/var/_settings.scss
+++ b/typo3/sysext/extensionmanager/Resources/Private/Scss/var/_settings.scss
@@ -1,8 +1,16 @@
// Colors
-$gray-darker: lighten(#000000, 13.5%); // #222222
-$gray-dark: lighten(#000000, 20%); // #333333
-$gray: lighten(#000000, 33.5%); // #555555
-$gray-medium: lighten(#000000, 60%); // #999999
-$gray-light: lighten(#000000, 92%); // #EBEBEB
-$gray-lighter: lighten(#000000, 98%); // #FAFAFA
-$brand-color: #ff8600;
\ No newline at end of file
+$gray-darker: lighten(#000000, 13.5%); // #222222
+$gray-dark: lighten(#000000, 20%); // #333333
+$gray: lighten(#000000, 33.5%); // #555555
+$gray-medium: lighten(#000000, 60%); // #999999
+$gray-light: lighten(#000000, 92%); // #EBEBEB
+$gray-lighter: lighten(#000000, 98%); // #FAFAFA
+$brand-color: #ff8600;
+
+$alpha: #f14400;
+$beta: #f4bd00;
+$stable: #3db900;
+$experimental: #000;
+$test: #000;
+$obsolete: #8c8c8c;
+$excludeFromUpdates: #000;
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
new file mode 100644
index 0000000000000000000000000000000000000000..fb843bcdb7926b40e8fdc78d384910eea9f64d9d
--- /dev/null
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -0,0 +1,92 @@
+{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
+<f:layout name="main" />
+
+<f:section name="docheader-buttons">
+ <f:be.buttons.icon uri="{f:uri.action(controller: 'List',action: 'distributions')}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
+</f:section>
+
+<f:section name="module-headline">
+</f:section>
+
+<f:section name="Content">
+ <f:flashMessages class="distribution-detail-flashmessage" renderMode="div" />
+ <div class="distribution-detail">
+ <div class="distribution-detail-previewpane">
+ <em:image
+ src="EXT:{extension.extensionKey}/Resources/Public/Images/DistributionWelcome.png" alt="{distribution.title}"
+ class="distribution-detail-preview"
+ />
+ </div>
+ <div class="distribution-detail-body">
+ <div class="distribution-detail-header">
+ <h1>{extension.title}</h1>
+ <p>{extension.description}</p>
+ </div>
+ <ul class="list-unstyled">
+ <f:if condition="{distributionActive}">
+ <f:else>
+ <li>
+ <f:link.action action="installDistribution" controller="Download" arguments="{extension:extension}" class="t3-button t3-button-action-installdistribution">
+ <f:be.buttons.icon icon="actions-system-extension-import" /><f:translate key="extensionList.installDistribution">Install</f:translate>
+ </f:link.action>
+ </li>
+ </f:else>
+ <f:then>
+ <f:if condition="{configurationLink}">
+ <li>
+ <a href="{configurationLink}" class="distribution-openViewModule t3-button" onclick="top.goToModule('web_ViewpageView');">
+ <f:be.buttons.icon icon="actions-system-extension-configure" /><f:translate key="extensionList.configure" />
+ </a>
+ </li>
+ </f:if>
+ <li>
+ <button class="distribution-openViewModule t3-button" onclick="top.goToModule('web_ViewpageView');">
+ <f:be.buttons.icon icon="actions-document-view" /><f:translate key="distribution.welcome.openViewModule" />
+ </button>
+ </li>
+ <li>
+ <button class="distribution-openPageModule t3-button" onclick="top.goToModule('web_page');">
+ <f:be.buttons.icon icon="actions-document-open" /><f:translate key="distribution.welcome.openPageModule" />
+ </button>
+ </li>
+ </f:then>
+ </f:if>
+ </ul>
+ <dl class="description-horizontal description-horizontal-wide distribution-detail-summary">
+ <dt><f:translate key="extensionList.distribution.title" /></dt>
+ <dd>{extension.title}</dd>
+ <dt><f:translate key="extensionList.distribution.key" /></dt>
+ <dd>{extension.extensionKey}</dd>
+ <dt><f:translate key="extensionList.distribution.version" /></dt>
+ <dd>{extension.version} (<f:format.date format="d.m.Y">{extension.lastUpdated}</f:format.date>)<br><span class="{extension.stateString}">{extension.stateString}</span></dd>
+ <dt><f:translate key="extensionList.distribution.author" /></dt>
+ <dd>{extension.authorName}</dd>
+ <dt><f:translate key="extensionList.distribution.downloads" /></dt>
+ <dd>{extension.alldownloadcounter}</dd>
+ </dl>
+ <f:if condition="{extension.dependencies}">
+ <h2><f:translate key="distribution.dependency.headline" /></h2>
+ <table class="t3-table">
+ <thead>
+ <tr class="t3-row-header">
+ <td><f:translate key="distribution.dependency.identifier" /></td>
+ <td><f:translate key="distribution.dependency.type" /></td>
+ <td><f:translate key="distribution.dependency.version" /></td>
+ </tr>
+ </thead>
+ <tbody>
+ <f:for each="{extension.dependencies}" as="dependency">
+ <tr>
+ <td>{dependency.identifier}</td>
+ <td>{dependency.type}</td>
+ <td>
+ {dependency.lowestVersion}<f:if condition="{dependency.highestVersion}">-{dependency.highestVersion}</f:if>
+ </td>
+ </tr>
+ </f:for>
+ </tbody>
+ </table>
+ </f:if>
+ </div>
+ </div>
+</f:section>
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Welcome.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Welcome.html
deleted file mode 100644
index 95c10b616d599a4efc3509bdded1d329840ef7e3..0000000000000000000000000000000000000000
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Welcome.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
-<f:layout name="main" />
-
-<f:section name="docheader-buttons">
-</f:section>
-
-<f:section name="module-headline">
-</f:section>
-
-<f:section name="Content">
- <div class="em-distribution-welcome">
- <h1>
- <f:translate key="distribution.welcome.headline" />
- </h1>
- <em:image
- src="EXT:{distribution.extensionKey}/Resources/Public/Images/DistributionWelcome.png" alt="{distribution.title}"
- fallbackImage="EXT:extensionmanager/Resources/Public/Images/DistributionWelcome.png"
- />
- <div class="em-distribution-welcome-text">
- <f:translate key="distribution.welcome.message" /> <strong>{extension.extensionKey}</strong>
- <h2><f:translate key="distribution.welcome.nextSteps" /></h2>
- <ul>
- <li><a href="#" class="distribution-openViewModule" onclick="top.goToModule('web_ViewpageView');"><f:translate key="distribution.welcome.openViewModule" /></a></li>
- <li><a href="#" class="distribution-openPageModule" onclick="top.goToModule('web_page');">
- <f:translate key="distribution.welcome.openPageModule" />
- </a></li>
- </ul>
- </div>
- </div>
-</f:section>
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/Resources/Public/Css/main.css b/typo3/sysext/extensionmanager/Resources/Public/Css/main.css
index 40334f5c94f4c6408d057ac5410df3ced9d33d85..2d4c9021e8a3eb3c02a4056f64676671b2be8839 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/Css/main.css
+++ b/typo3/sysext/extensionmanager/Resources/Public/Css/main.css
@@ -1,432 +1 @@
-/*
- * Created: 2012-08-13
- *
- * CSS in SASS's SCSS dialect for
- * TYPO3 Extension Manager
- * Questions can be submitted to info@drublic.de
- *
- */
-#typo3-extension-main-menu .tabs ul,
-#typo3-extension-configuration-forms .tabs ul {
- list-style: none;
- padding: 0;
- margin-bottom: -1px; }
- #typo3-extension-main-menu .tabs ul:after,
- #typo3-extension-configuration-forms .tabs ul:after {
- display: table;
- content: "";
- clear: both; }
- #typo3-extension-main-menu .tabs ul > li,
- #typo3-extension-configuration-forms .tabs ul > li {
- cursor: pointer; }
- #typo3-extension-main-menu .tabs ul > li.ui-tabs-active a,
- #typo3-extension-main-menu .tabs ul > li a.current,
- #typo3-extension-configuration-forms .tabs ul > li.ui-tabs-active a,
- #typo3-extension-configuration-forms .tabs ul > li a.current {
- background: white;
- color: black;
- border-bottom: 0;
- padding-top: 8px;
- cursor: default; }
- #typo3-extension-main-menu .tabs ul > li a,
- #typo3-extension-configuration-forms .tabs ul > li a {
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
- float: left;
- height: 15px;
- background: #dadada;
- padding: 7px 15px;
- margin-top: -1px;
- margin-right: 2px;
- border: 1px solid #adadad;
- color: #606060;
- outline: none; }
- #typo3-extension-main-menu .tabs ul > li a:hover,
- #typo3-extension-configuration-forms .tabs ul > li a:hover {
- background-color: #eee;
- border-color: #adadad;
- color: #606060; }
-
-.ui-widget-header {
- background: none;
- border: none;
- font-weight: normal; }
-
-.dataTable {
- border-right: 1px solid #a2aab8;
- border-bottom: 1px solid #a2aab8;
- border-left: 1px solid #a2aab8; }
-
-.dataTables_info {
- font-size: 10px;
- color: #444;
- float: left; }
-
-.paging_two_button .ui-button {
- float: left;
- cursor: pointer; }
-
-.paging_full_numbers .ui-button {
- padding: 2px 6px;
- margin: 0;
- cursor: pointer;
- color: #333 !important; }
-
-.dataTables_paginate .ui-button {
- margin-right: -0.1em !important; }
-
-.paging_full_numbers {
- float: right; }
-
-.dataTables_paginate {
- width: auto; }
-
-#typo3-extension-configuration-forms {
- min-width: 400px;
- max-width: 900px; }
- #typo3-extension-configuration-forms .category {
- background-repeat: repeat-x;
- background-color: #fff;
- border: 1px solid #adadad;
- padding: 15px; }
- #typo3-extension-configuration-forms .group {
- margin-bottom: 30px; }
- #typo3-extension-configuration-forms .group label {
- display: block;
- padding-bottom: 10px; }
-
-#typo3-extension-configuration-forms #typo3-docheader-row2 .back {
- float: right; }
-
-#typo3-extension-configuration-forms input.submit {
- margin-top: 10px; }
-
-#typo3-extension-configuration-forms .error,
-#typo3-extension-configuration-forms .invalid {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
- -webkit-box-shadow: 0 0 6px #dddddd;
- box-shadow: 0 0 6px #dddddd;
- /* supply height to ensure consistent positioning for every browser */
- height: 15px;
- background-color: #ff2262;
- border: 1px solid #e1e16d;
- font-size: 11px;
- color: #000;
- padding: 3px 10px;
- margin-left: -2px; }
-
-.t3-table td.alpha {
- color: #f14400; }
-
-.t3-table td.beta {
- color: #f4bd00; }
-
-.t3-table td.stable {
- color: #3db900; }
-
-.t3-table td.experimental {
- color: #000; }
-
-.t3-table td.test {
- color: #000; }
-
-.t3-table td.obsolete {
- color: #8c8c8c; }
-
-.t3-table td.excludeFromUpdates {
- color: #000; }
-
-.alpha,
-.beta,
-.stable,
-.experimental,
-.test,
-.obsolete,
-.excludeFromUpdates {
- font-weight: bold;
- color: #fff; }
-
-.typo3-extension-list td.icons {
- width: 140px; }
-
-.typo3-extension-list .icons a {
- display: none; }
-
-.typo3-extension-list tr:hover .icons a {
- display: inline; }
-
-#typo3-extension-configuration-forms .info {
- color: #666;
- font-weight: normal; }
-
-.typo3-extension-list tr.installed td {
- background-color: #c8ffaa; }
-
-.typo3-extension-list tr.available td {
- background-color: #E1E1aa; }
-
-.typo3-extension-manager .insecure {
- color: #ff2262; }
-
-.typo3-extension-manager .outdated {
- color: #0c08ff; }
-
-.typo3-extension-list .inactive {
- color: #aaaaaa; }
-
-.headerTooltip,
-.tooltip {
- -webkit-box-shadow: 2px 2px 11px #666666;
- box-shadow: 2px 2px 11px #666666;
- display: none;
- width: 400px;
- background-color: #ffa;
- border: 1px solid #cc9;
- padding: 3px;
- font-size: 13px;
- z-index: 1000; }
-
-.headerTooltip {
- width: 150px; }
-
-p {
- padding-bottom: 20px; }
-
-.typo3-extensionmanager-headerRowLeft {
- display: inline-block; }
- .typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper {
- display: inline-block;
- position: relative; }
- .typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper input {
- height: 15px; }
- .typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper .t3-icon-input-clear {
- position: absolute;
- right: 3px;
- top: 4px; }
-
-.headerRow {
- overflow: auto;
- width: 100%; }
-
-.typo3-extensionmanager-headerRowLeft {
- float: left; }
-
-.typo3-extensionmanager-headerRowRight {
- float: right; }
-
-.ui-toolbar {
- margin-bottom: 5px; }
- .ui-toolbar .dataTables_filter {
- float: left; }
-
-.typo3-extension-list th {
- min-width: 53px;
- cursor: pointer; }
- .typo3-extension-list th .DataTables_sort_icon {
- display: inline-block;
- vertical-align: middle;
- margin-left: 5px; }
- .typo3-extension-list th .DataTables_sort_icon.ui-icon-carat-2-n-s {
- background: none; }
-.typo3-extension-list .ext-icon {
- max-height: 16px;
- width: auto; }
-
-.dataTables_info {
- display: none; }
-
-.dataTables_paginate {
- float: left;
- margin: 10px 0 0; }
-
-.uploadForm {
- background-color: #ededed;
- border-top: 1px solid #cdcdcd;
- border-bottom: 1px solid #cdcdcd;
- padding: 12px;
- margin-bottom: 24px; }
- .uploadForm form .control-group {
- clear: both;
- margin-bottom: 5px; }
- .uploadForm form label {
- float: left;
- height: 20px;
- padding: 4px 0;
- line-height: 20px;
- width: 90px; }
- .uploadForm form .control {
- min-height: 20px;
- padding: 4px 0;
- margin-left: 110px; }
-
-#terTableWrapper {
- position: relative; }
- #terTableWrapper .splash-receivedata {
- display: none;
- position: absolute;
- top: 50%;
- left: 50%;
- margin: -20px 0 0 -150px; }
- #terTableWrapper .splash-receivedata a {
- display: inline-block;
- width: 200px;
- vertical-align: top;
- padding: 3px 20px; }
- #terTableWrapper .splash-receivedata.is-shown {
- display: block; }
- #terTableWrapper .spinner {
- display: inline-block; }
- #terTableWrapper .ui-icon {
- width: 16px;
- height: 16px;
- background-image: url("../Images/ui-icons_222222_256x240.png");
- background-position: -64px -16px; }
-
-.time-since-last-update {
- font-weight: bold;
- padding-right: 0.4em;
- cursor: help; }
-
-.is-loading {
- opacity: 0; }
-
-.is-hidden {
- display: none; }
-
-.typo3-extension-list .t3-icon,
-.typo3-extension-list .t3-icon:hover {
- border: none;
- background-color: transparent; }
-.typo3-extension-list .author {
- display: none; }
-
-.versions-all {
- display: inline-block;
- width: 20px;
- text-indent: -200px;
- overflow: hidden; }
-
-.currentVersionInfo {
- padding: 0 0 20px 0; }
- .currentVersionInfo td {
- padding: 4px 0; }
- .currentVersionInfo th {
- font-weight: normal;
- color: #8c8c8c;
- padding: 4px 20px 4px 0; }
-
-span.ter-ext-state {
- padding: 0 0 0 5px;
- font-weight: bold;
- text-transform: capitalize; }
-
-span.ter-ext-state-obsolete {
- color: #8c8c8c;
- font-weight: normal; }
-
-span.ter-ext-state-stable {
- color: #3db900; }
-
-span.ter-ext-state-beta {
- color: #f4bd00; }
-
-span.ter-ext-state-alpha {
- color: #f14400; }
-
-#typo3-docbody form.download {
- margin-bottom: 0; }
-
-.distribution {
- border: 1px solid #d4d4d4;
- background-color: #fafafa;
- margin-bottom: 20px;
- margin-left: 20px;
- width: 300px;
- float: left; }
- .distribution:hover {
- background-color: #f2f2f2; }
- .distribution:hover .distribution-hover {
- top: 0px;
- opacity: 1; }
-
-.distribution-holder {
- top: 0px;
- bottom: 0px;
- margin-left: -20px; }
- .distribution-holder:before, .distribution-holder:after {
- content: " ";
- display: table; }
- .distribution-holder:after {
- clear: both; }
-
-.distribution-image {
- position: relative;
- width: 300px;
- height: 225px;
- overflow: hidden; }
- .distribution-image img {
- display: block;
- height: 100%;
- width: 100%; }
-
-.distribution-hover {
- background-color: #fafafa;
- position: absolute;
- top: 100%;
- left: 0px;
- width: 300px;
- height: 225px;
- overflow: hidden;
- opacity: 0;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out; }
-
-.distribution-hover-inner {
- padding: 15px; }
-
-.distribution-meta {
- border-top: 1px solid #e0e0e0;
- padding: 15px; }
- .distribution-meta .distribution-title {
- margin: 0;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- font-size: 14px; }
- .distribution-meta .distribution-install {
- margin-top: 0.5em; }
- .distribution-meta .t3-button {
- margin: 0;
- padding-right: 8px; }
- .distribution-meta .distribution-official {
- border: 1px solid #ff8600;
- background-color: #ff8600;
- border-radius: 2px;
- display: inline-block;
- padding: 3px 8px;
- vertical-align: middle;
- color: #FFFFFF; }
-
-.distribution-info {
- margin-top: 0; }
- .distribution-info:before, .distribution-info:after {
- content: " ";
- display: table; }
- .distribution-info:after {
- clear: both; }
- .distribution-info dt {
- font-weight: bold;
- float: left;
- width: 60px;
- clear: left;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap; }
- .distribution-info dd {
- margin-left: 70px; }
+#typo3-extension-main-menu .tabs ul,#typo3-extension-configuration-forms .tabs ul{list-style:none;padding:0;margin-bottom:-1px}#typo3-extension-main-menu .tabs ul:after,#typo3-extension-configuration-forms .tabs ul:after{display:table;content:"";clear:both}#typo3-extension-main-menu .tabs ul>li,#typo3-extension-configuration-forms .tabs ul>li{cursor:pointer}#typo3-extension-main-menu .tabs ul>li.ui-tabs-active a,#typo3-extension-main-menu .tabs ul>li a.current,#typo3-extension-configuration-forms .tabs ul>li.ui-tabs-active a,#typo3-extension-configuration-forms .tabs ul>li a.current{background:white;color:black;border-bottom:0;padding-top:8px;cursor:default}#typo3-extension-main-menu .tabs ul>li a,#typo3-extension-configuration-forms .tabs ul>li a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;float:left;height:15px;background:#dadada;padding:7px 15px;margin-top:-1px;margin-right:2px;border:1px solid #adadad;color:#606060;outline:none}#typo3-extension-main-menu .tabs ul>li a:hover,#typo3-extension-configuration-forms .tabs ul>li a:hover{background-color:#eee;border-color:#adadad;color:#606060}.description-horizontal{margin-top:0}.description-horizontal:before,.description-horizontal:after{content:" ";display:table}.description-horizontal:after{clear:both}.description-horizontal dt{font-weight:bold;float:left;width:60px;clear:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.description-horizontal dd{margin-left:70px}.description-horizontal.description-horizontal-wide dt{width:100px}.description-horizontal.description-horizontal-wide dd{margin-left:110px}.ui-widget-header{background:none;border:none;font-weight:normal}.dataTable{border-right:1px solid #a2aab8;border-bottom:1px solid #a2aab8;border-left:1px solid #a2aab8}.dataTables_info{font-size:10px;color:#444;float:left}.paging_two_button .ui-button{float:left;cursor:pointer}.paging_full_numbers .ui-button{padding:2px 6px;margin:0;cursor:pointer;color:#333 !important}.dataTables_paginate .ui-button{margin-right:-0.1em !important}.paging_full_numbers{float:right}.dataTables_paginate{width:auto}#typo3-extension-configuration-forms{min-width:400px;max-width:900px}#typo3-extension-configuration-forms .category{background-repeat:repeat-x;background-color:#fff;border:1px solid #adadad;padding:15px}#typo3-extension-configuration-forms .group{margin-bottom:30px}#typo3-extension-configuration-forms .group label{display:block;padding-bottom:10px}#typo3-extension-configuration-forms #typo3-docheader-row2 .back{float:right}#typo3-extension-configuration-forms input.submit{margin-top:10px}#typo3-extension-configuration-forms .error,#typo3-extension-configuration-forms .invalid{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;-webkit-box-shadow:0 0 6px #ddd;box-shadow:0 0 6px #ddd;height:15px;background-color:#ff2262;border:1px solid #e1e16d;font-size:11px;color:#000;padding:3px 10px;margin-left:-2px}.t3-table td.alpha{color:#f14400}.t3-table td.beta{color:#f4bd00}.t3-table td.stable{color:#3db900}.t3-table td.experimental{color:#000}.t3-table td.test{color:#000}.t3-table td.obsolete{color:#8c8c8c}.t3-table td.excludeFromUpdates{color:#000}.alpha,.beta,.stable,.experimental,.test,.obsolete,.excludeFromUpdates{font-weight:bold;color:#fff}.alpha{color:#f14400}.beta{color:#f4bd00}.stable{color:#3db900}.experimental{color:#000}.test{color:#000}.obsolete{color:#8c8c8c}.excludeFromUpdates{color:#000}.typo3-extension-list td.icons{width:140px}.typo3-extension-list .icons a{display:none}.typo3-extension-list tr:hover .icons a{display:inline}#typo3-extension-configuration-forms .info{color:#666;font-weight:normal}.typo3-extension-list tr.installed td{background-color:#c8ffaa}.typo3-extension-list tr.available td{background-color:#E1E1aa}.typo3-extension-manager .insecure{color:#ff2262}.typo3-extension-manager .outdated{color:#0c08ff}.typo3-extension-list .inactive{color:#aaa}.headerTooltip,.tooltip{-webkit-box-shadow:2px 2px 11px #666;box-shadow:2px 2px 11px #666;display:none;width:400px;background-color:#ffa;border:1px solid #cc9;padding:3px;font-size:13px;z-index:1000}.headerTooltip{width:150px}p{padding-bottom:20px}.typo3-extensionmanager-headerRowLeft{display:inline-block}.typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper{display:inline-block;position:relative}.typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper input{height:15px}.typo3-extensionmanager-headerRowLeft .typo3-extensionmanager-searchTerFieldWrapper .t3-icon-input-clear{position:absolute;right:3px;top:4px}.headerRow{overflow:auto;width:100%}.typo3-extensionmanager-headerRowLeft{float:left}.typo3-extensionmanager-headerRowRight{float:right}.ui-toolbar{margin-bottom:5px}.ui-toolbar .dataTables_filter{float:left}.typo3-extension-list th{min-width:53px;cursor:pointer}.typo3-extension-list th .DataTables_sort_icon{display:inline-block;vertical-align:middle;margin-left:5px}.typo3-extension-list th .DataTables_sort_icon.ui-icon-carat-2-n-s{background:none}.typo3-extension-list .ext-icon{max-height:16px;width:auto}.dataTables_info{display:none}.dataTables_paginate{float:left;margin:10px 0 0}.uploadForm{background-color:#ededed;border-top:1px solid #cdcdcd;border-bottom:1px solid #cdcdcd;padding:12px;margin-bottom:24px}.uploadForm form .control-group{clear:both;margin-bottom:5px}.uploadForm form label{float:left;height:20px;padding:4px 0;line-height:20px;width:90px}.uploadForm form .control{min-height:20px;padding:4px 0;margin-left:110px}#terTableWrapper{position:relative}#terTableWrapper .splash-receivedata{display:none;position:absolute;top:50%;left:50%;margin:-20px 0 0 -150px}#terTableWrapper .splash-receivedata a{display:inline-block;width:200px;vertical-align:top;padding:3px 20px}#terTableWrapper .splash-receivedata.is-shown{display:block}#terTableWrapper .spinner{display:inline-block}#terTableWrapper .ui-icon{width:16px;height:16px;background-image:url("../Images/ui-icons_222222_256x240.png");background-position:-64px -16px}.time-since-last-update{font-weight:bold;padding-right:0.4em;cursor:help}.is-loading{opacity:0}.is-hidden{display:none}.typo3-extension-list .t3-icon,.typo3-extension-list .t3-icon:hover{border:none;background-color:transparent}.typo3-extension-list .author{display:none}.versions-all{display:inline-block;width:20px;text-indent:-200px;overflow:hidden}.currentVersionInfo{padding:0 0 20px 0}.currentVersionInfo td{padding:4px 0}.currentVersionInfo th{font-weight:normal;color:#8c8c8c;padding:4px 20px 4px 0}span.ter-ext-state{padding:0 0 0 5px;font-weight:bold;text-transform:capitalize}span.ter-ext-state-obsolete{color:#8c8c8c;font-weight:normal}span.ter-ext-state-stable{color:#3db900}span.ter-ext-state-beta{color:#f4bd00}span.ter-ext-state-alpha{color:#f14400}#typo3-docbody form.download{margin-bottom:0}.distribution{border:1px solid #d4d4d4;background-color:#fafafa;margin-bottom:20px;margin-left:20px;width:300px;float:left}.distribution:hover{background-color:#f2f2f2}.distribution:hover .distribution-hover{top:0px;opacity:1}.distribution:hover .distribution-more{text-decoration:underline}.distribution-holder{top:0px;bottom:0px;margin-left:-20px}.distribution-holder:before,.distribution-holder:after{content:" ";display:table}.distribution-holder:after{clear:both}.distribution-image{position:relative;width:300px;height:225px;overflow:hidden}.distribution-image img{display:block;height:100%;width:100%}.distribution-hover{background-color:#fafafa;position:absolute;top:100%;left:0px;width:300px;height:225px;overflow:hidden;opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.distribution-hover-inner{padding:15px}.distribution-meta{border-top:1px solid #e0e0e0;padding:15px}.distribution-meta .distribution-title{margin:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:14px}.distribution-meta .distribution-install{margin-top:0.5em}.distribution-meta .t3-button{margin:0;padding-right:8px}.distribution-meta .distribution-official{border:1px solid #ff8600;background-color:#ff8600;border-radius:2px;display:inline-block;padding:3px 8px;vertical-align:middle;color:#FFFFFF}.distribution-detail-flashmessage{margin-bottom:2.5em}.distribution-detail-flashmessage p{padding-bottom:0}.distribution-detail{min-width:750px}.distribution-detail:before,.distribution-detail:after{content:" ";display:table}.distribution-detail:after{clear:both}.distribution-detail-previewpane{float:left;margin-right:30px}.distribution-detail-preview{display:block;border:1px solid #d4d4d4}.distribution-detail-body{overflow:hidden;zoom:1}.distribution-detail-header{margin-bottom:2.5em}.distribution-detail-header h1{margin-bottom:0.5em}.distribution-detail-header p{padding:0px;max-width:500px;margin-bottom:1.25em}.distribution-detail-summary{margin-top:2.5em;margin-bottom:2.5em}.distribution-installed hr{margin:2.5em 0;border:0;border-top:1px solid #d4d4d4}
diff --git a/typo3/sysext/extensionmanager/ext_tables.php b/typo3/sysext/extensionmanager/ext_tables.php
index 5139355ce6dbb3db2f03f567fcdf04812b44b343..3727ab8c6ad60bae3dd04bb1d523c269c5235c52 100644
--- a/typo3/sysext/extensionmanager/ext_tables.php
+++ b/typo3/sysext/extensionmanager/ext_tables.php
@@ -15,7 +15,7 @@ if (TYPO3_MODE === 'BE') {
'UpdateScript' => 'show',
'UpdateFromTer' => 'updateExtensionListFromTer',
'UploadExtensionFile' => 'form,extract',
- 'Distribution' => 'welcome'
+ 'Distribution' => 'show'
),
array(
'access' => 'admin',