Commit aa9328c6 authored by Markus Sommer's avatar Markus Sommer Committed by Thomas Löffler

[CLEANUP] CGL Fix

parent d852cf71
......@@ -20,9 +20,7 @@
<label index="tx_terfe2_domain_model_extension.downloads">Downloads of all versions</label>
<label index="tx_terfe2_domain_model_extension.repository_url">Link to repository</label>
<label index="tx_terfe2_domain_model_extension.repository_clone_url">Publicly accessible clone url</label>
<label index="tx_terfe2_domain_model_extension.repository_clone_url.description"><![CDATA[
The publicly accessible clone url will be used to fetch your repository for http://composer.typo3.org from the given url instead of the uploaded TER codebase. Therefore double check that the url is available for everyone. Otherwise your extension might disappear from http://composer.typo3.org.
]]></label>
<label index="tx_terfe2_domain_model_extension.repository_clone_url.description"><![CDATA[The publicly accessible clone url will be used to fetch your repository for http://composer.typo3.org from the given url instead of the uploaded TER codebase. Therefore double check that the url is available for everyone. Otherwise your extension might disappear from http://composer.typo3.org.]]></label>
<label index="tx_terfe2_domain_model_extension.external_manual">External manual</label>
<label index="tx_terfe2_domain_model_extension.donate_url">Sponsoring link</label>
......
......@@ -129,8 +129,6 @@
<label index="tx_terfe2_task_checkforexpiredextensions.name">[TER FE2] Check for expired extensions</label>
<label index="tx_terfe2_task_checkforexpiredextensions.description">Check for expired extensions, if extension is expired a mail to the owner is sent.</label>
<label index="tx_terfe2_provider_mirrorprovider.name">Mirror Servers</label>
<label index="tx_terfe2_provider_fileprovider.name">Local Filesystem</label>
<label index="tx_terfe2_provider_soapprovider.name">SOAP Server</label>
......
......@@ -19,7 +19,7 @@
</f:if>
</f:flashMessages>
<div class="tx_terfe2_content">
<f:render section="main"/>
<f:render section="main" />
</div>
</div>
</div>
......
......@@ -13,6 +13,6 @@
</f:widget.paginate>
</f:then>
<f:else>
<f:translate key="msg.no_entries_found"/>
<f:translate key="msg.no_entries_found" />
</f:else>
</f:if>
......@@ -3,7 +3,7 @@
<f:if condition="{extensions}">
<f:then>
<div class="ter-ext-list-count">
<f:translate key="extensions_found" arguments="{0: '{f:count(subject : extensions)}'}"/>
<f:translate key="extensions_found" arguments="{0: '{f:count(subject : extensions)}'}" />
</div>
<f:widget.paginate objects="{extensions}" as="paginateExtensions"
......@@ -14,7 +14,7 @@
<!-- Headline -->
<div class="ter-ext-list-row-head">
<terfe2:extensionIcon version="{extension.lastVersion}" alt="{extension.lastVersion.title}"
class="ter-ext-icon"/>
class="ter-ext-icon" />
<f:link.action controller="Extension" action="show" arguments="{extension : extension}">
{extension.lastVersion.title}
</f:link.action>
......@@ -27,7 +27,7 @@
<!-- Description -->
<div class="ter-ext-list-row-description">
<div class="ter-ext-list-meta">
<f:translate key="by"/>
<f:translate key="by" />
{extension.lastVersion.author.name}
</div>
<terfe2:crop length="{settings.descriptionLength}">{extension.lastVersion.description}
......@@ -39,15 +39,15 @@
<table>
<tr>
<th>
<f:translate key="version"/>
<f:translate key="version" />
</th>
<td>{extension.lastVersion.versionString} <span
class="ter-ext-state ter-ext-state-{extension.lastVersion.state}">{extension.lastVersion.state}</span>
class="ter-ext-state ter-ext-state-{extension.lastVersion.state}">{extension.lastVersion.state}</span>
</td>
</tr>
<tr>
<th>
<f:translate key="last_updated"/>
<f:translate key="last_updated" />
</th>
<td>
<terfe2:dateTime format="{settings.dateFormat}">
......@@ -57,13 +57,13 @@
</tr>
<tr>
<th>
<f:translate key="downloads"/>
<f:translate key="downloads" />
</th>
<td>{extension.downloads}</td>
</tr>
<tr>
<th>
<f:translate key="manual"/>
<f:translate key="manual" />
</th>
<td>{documentationLink}</td>
</tr>
......@@ -76,13 +76,13 @@
<f:link.action controller="Extension" action="download"
arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 't3x'}"
class="ter-download-icon ter-download-icon-t3x">
<f:translate key="download_t3x"/>
<f:translate key="download_t3x" />
</f:link.action>
<f:if condition="{extension.lastVersion.hasZipFile}">
<f:link.action controller="Extension" action="download"
arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 'zip'}"
class="ter-download-icon ter-download-icon-zip">
<f:translate key="download_zip"/>
<f:translate key="download_zip" />
</f:link.action>
</f:if>
</div>
......@@ -92,6 +92,6 @@
</f:widget.paginate>
</f:then>
<f:else>
<f:translate key="msg.no_entries_found"/>
<f:translate key="msg.no_entries_found" />
</f:else>
</f:if>
<div class="ter-ext-list-search">
<form method="post" action="{f:uri.action(controller:'Extension', action:'search', noCacheHash: 1)}">
<f:form.textfield name="tx_terfe2_pi1[search][needle]" id="ter-ext-list-search-needle" value="{search.needle}"/>
<f:form.submit value="{f:translate(key: 'search')}" class="bu"/>
<f:form.textfield name="tx_terfe2_pi1[search][needle]" id="ter-ext-list-search-needle" value="{search.needle}" />
<f:form.submit value="{f:translate(key: 'search')}" class="bu" />
<span class="ter-ext-list-search-sorting cl">
<label for="ter-ext-list-search-sorting"><f:translate key="sorting"/>: </label>
<label for="ter-ext-list-search-sorting">
<f:translate key="sorting" />:
</label>
<f:form.select name="tx_terfe2_pi1[search][sorting]" id="ter-ext-list-search-sorting" class="jsSubmit"
value="{search.sorting}" options="{
updated: '{f:translate(key:\'sorting.updated\')}',
downloads: '{f:translate(key:\'sorting.downloads\')}',
title: '{f:translate(key:\'sorting.title\')}'
}"/>
value="{search.sorting}" options="{updated: '{f:translate(key:\'sorting.updated\')}',downloads: '{f:translate(key:\'sorting.downloads\')}',title: '{f:translate(key:\'sorting.title\')}'}" />
</span>
</form>
</div>
......@@ -2,16 +2,30 @@
<dl class="dl-horizontal">
<f:if condition="{extension.lastVersion.author}">
<dt><f:translate key="author" /></dt>
<dt>
<f:translate key="author" />
</dt>
<dd>{extension.lastVersion.author.name}</dd>
</f:if>
<dt>Last update</dt>
<dd><f:format.date format="%d. %b %Y">@{extension.lastVersion.uploadDate}</f:format.date></dd>
<dt><f:translate key="first_upload" /></dt>
<dd><f:format.date format="%d. %b %Y">{extension.crdate}</f:format.date></dd>
<dt><f:translate key="downloads" /></dt>
<dd><f:format.number decimals="0" thousandsSeparator="," decimalSeparator=".">{extension.downloads}</f:format.number></dd>
<dt><f:translate key="category" /></dt>
<dd>
<f:format.date format="%d. %b %Y">@{extension.lastVersion.uploadDate}</f:format.date>
</dd>
<dt>
<f:translate key="first_upload" />
</dt>
<dd>
<f:format.date format="%d. %b %Y">{extension.crdate}</f:format.date>
</dd>
<dt>
<f:translate key="downloads" />
</dt>
<dd>
<f:format.number decimals="0" thousandsSeparator="," decimalSeparator=".">{extension.downloads}</f:format.number>
</dd>
<dt>
<f:translate key="category" />
</dt>
<dd>
<f:if condition="{extension.lastVersion.emCategory}">
<f:then>
......@@ -22,8 +36,12 @@
</f:else>
</f:if>
</dd>
<dt><f:translate key="dependencies" /></dt>
<dd><f:render partial="InlineRelationList" arguments="{relations: extension.lastVersion.dependencies}" /></dd>
<dt>
<f:translate key="dependencies" />
</dt>
<dd>
<f:render partial="InlineRelationList" arguments="{relations: extension.lastVersion.dependencies}" />
</dd>
<f:if condition="{extension.lastVersion.conflicts}">
<dt>
<f:translate key="conflicts" />
......@@ -32,7 +50,9 @@
<f:render partial="InlineRelationList" arguments="{relations: extension.lastVersion.conflicts}" />
</dd>
</f:if>
<dt><f:translate key="manual" /></dt>
<dt>
<f:translate key="manual" />
</dt>
<dd>
<f:if condition="{documentationLink}">
<f:then>
......@@ -57,7 +77,7 @@
</f:if>
</f:else>
</f:if>
</dd>
</dd>
<f:if condition="{extension.forgeLink}">
<dt>
<f:translate key="bugtracker" />
......
......@@ -30,6 +30,6 @@
</ul>
</f:then>
<f:else>
<f:translate key="none"/>
<f:translate key="none" />
</f:else>
</f:if>
......@@ -9,6 +9,6 @@
</ul>
</f:then>
<f:else>
<f:translate key="msg.no_entries_found"/>
<f:translate key="msg.no_entries_found" />
</f:else>
</f:if>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<h2>
<f:translate key="edit_author"/>
<f:translate key="edit_author" />
</h2>
<f:form method="post" action="update" name="author" object="{author}">
<label for="name">
<f:translate key="tx_terfe2_domain_model_author.name"/>
</label><br/>
<f:form.textfield property="name"/>
<br/>
<f:translate key="tx_terfe2_domain_model_author.name" />
</label><br />
<f:form.textfield property="name" />
<br />
<label for="email">
<f:translate key="tx_terfe2_domain_model_author.email"/>
</label><br/>
<f:form.textfield property="email"/>
<br/>
<f:translate key="tx_terfe2_domain_model_author.email" />
</label><br />
<f:form.textfield property="email" />
<br />
<label for="company">
<f:translate key="tx_terfe2_domain_model_author.company"/>
</label><br/>
<f:form.textfield property="company"/>
<br/>
<f:translate key="tx_terfe2_domain_model_author.company" />
</label><br />
<f:form.textfield property="company" />
<br />
<label for="forge_link">
<f:translate key="tx_terfe2_domain_model_author.forge_link"/>
</label><br/>
<f:form.textfield property="forgeLink"/>
<br/><br/>
<f:translate key="tx_terfe2_domain_model_author.forge_link" />
</label><br />
<f:form.textfield property="forgeLink" />
<br /><br />
<f:form.submit value="{f:translate(key:'edit')}"/>
<f:form.submit value="{f:translate(key:'edit')}" />
</f:form>
<f:link.action controller="Author" action="list">
<f:translate key="back_to_list"/>
<f:translate key="back_to_list" />
</f:link.action>
</f:section>
\ No newline at end of file
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<f:render partial="AuthorList" arguments="{authors: authors}"/>
<br/>
<f:render partial="AuthorList" arguments="{authors: authors}" />
<br />
<f:link.action controller="Author" action="new">
<f:translate key="create_author"/>
<f:translate key="create_author" />
</f:link.action>
</f:section>
\ No newline at end of file
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<h2>
<f:translate key="single_author"/>
<f:translate key="single_author" />
</h2>
<div class="ter-author-info">
<table>
<tr>
<th>
<f:translate key="tx_terfe2_domain_model_author.name"/>
<f:translate key="tx_terfe2_domain_model_author.name" />
:
</th>
<td>{author.name}</td>
</tr>
<tr>
<th>
<f:translate key="tx_terfe2_domain_model_author.email"/>
<f:translate key="tx_terfe2_domain_model_author.email" />
:
</th>
<td>
<f:link.email email="{author.email}"/>
<f:link.email email="{author.email}" />
</td>
</tr>
<tr>
<th>
<f:translate key="tx_terfe2_domain_model_author.company"/>
<f:translate key="tx_terfe2_domain_model_author.company" />
:
</th>
<td>{author.company}</td>
......@@ -33,7 +33,7 @@
<f:if condition="{author.forgeLink}">
<tr>
<th>
<f:translate key="tx_terfe2_domain_model_author.forge_link"/>
<f:translate key="tx_terfe2_domain_model_author.forge_link" />
:
</th>
<td>
......@@ -46,21 +46,21 @@
<f:if condition="{settings.show.authorExtensions}">
<h3>
<f:translate key="author_extensions"/>
<f:translate key="author_extensions" />
</h3>
<div class="ter-author-extensions">
<f:render partial="ExtensionList" arguments="{extensions : authorExtensions}"/>
<f:render partial="ExtensionList" arguments="{extensions : authorExtensions}" />
</div>
</f:if>
<hr/>
<hr />
<div class="ter-author-single-links cl">
<div class="ter-author-single-back">
<f:link.action controller="Extension" action="index" class="bu dark-grey">
<f:translate key="back_to_extension_list"/>
<f:translate key="back_to_extension_list" />
</f:link.action>
</div>
</div>
</f:section>
\ No newline at end of file
</f:section>
......@@ -51,7 +51,9 @@
<div class="form-group row">
<label for="flattrUsername" class="col-3 col-form-label">
flattr username<br />
<span class="small"><f:link.external uri="http://wiki.typo3.org/How_to_add_flattr_to_TER" target="_blank">[How to set up flattr]</f:link.external></span>
<span class="small">
<f:link.external uri="http://wiki.typo3.org/How_to_add_flattr_to_TER" target="_blank">[How to set up flattr]</f:link.external>
</span>
</label>
<div class="col-9">
<f:form.textfield class="form-control" id="flattrUsername" property="flattrUsername" additionalAttributes="{placeholder:'Put in your flattr username'}" />
......
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<f:if condition="{settings.show.extensionSearch}">
<f:render partial="ExtensionSearchForm" arguments="{search : search}"/>
<f:render partial="ExtensionSearchForm" arguments="{search : search}" />
</f:if>
<f:render partial="ExtensionList" arguments="{extensions : extensions, documentationLink : documentationLink}"/>
<f:render partial="ExtensionList" arguments="{extensions : extensions, documentationLink : documentationLink}" />
<f:if condition="{settings.show.categoryOverview}">
<f:render partial="CategoryList" arguments="{categories : categories}"/>
<f:render partial="CategoryList" arguments="{categories : categories}" />
</f:if>
<f:if condition="{settings.show.tagOverview}">
<f:render partial="TagList" arguments="{tags : tags}"/>
<f:render partial="TagList" arguments="{tags : tags}" />
</f:if>
<f:if condition="{settings.show.authorOverview}">
<f:render partial="AuthorList" arguments="{authors: authors}"/>
<f:render partial="AuthorList" arguments="{authors: authors}" />
</f:if>
</f:section>
\ No newline at end of file
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<h2>
<f:translate key="new_extension"/>
<f:translate key="new_extension" />
</h2>
<f:form method="post" action="create" name="newExtension" object="{newExtension}">
<label for="extKey">
<f:translate key="tx_terfe2_domain_model_extension.ext_key"/>
</label><br/>
<f:form.textfield property="extKey"/>
<br/>
<f:translate key="tx_terfe2_domain_model_extension.ext_key" />
</label><br />
<f:form.textfield property="extKey" />
<br />
<label for="forgeLink">
<f:translate key="tx_terfe2_domain_model_extension.forge_link"/>
</label><br/>
<f:form.textfield property="forgeLink"/>
<br/>
<f:translate key="tx_terfe2_domain_model_extension.forge_link" />
</label><br />
<f:form.textfield property="forgeLink" />
<br />
<label for="tags">
<f:translate key="tx_terfe2_domain_model_extension.tags"/>
</label><br/>
<f:translate key="tx_terfe2_domain_model_extension.tags" />
</label><br />
<f:form.select property="tags" options="{tags}" optionValueField="uid" optionLabelField="title" multiple="1"
size="5"></f:form.select>
<br/><br/>
<br /><br />
<f:form.submit value="{f:translate(key:'create')}"/>
<f:form.submit value="{f:translate(key:'create')}" />
</f:form>
<f:link.action action="index">
<f:translate key="back_to_list"/>
<f:translate key="back_to_list" />
</f:link.action>
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<f:if condition="{settings.show.extensionSearch}">
<f:render partial="ExtensionSearchForm" arguments="{search : search}"/>
<f:render partial="ExtensionSearchForm" arguments="{search : search}" />
</f:if>
<f:render partial="ExtensionList" arguments="{extensions : extensions}"/>
<f:render partial="ExtensionList" arguments="{extensions : extensions}" />
<f:if condition="{settings.show.tagOverview}">
<f:render partial="TagList" arguments="{tags : tags}"/>
<f:render partial="TagList" arguments="{tags : tags}" />
</f:if>
<f:if condition="{settings.show.authorOverview}">
<f:render partial="AuthorList" arguments="{authors: authors}"/>
<f:render partial="AuthorList" arguments="{authors: authors}" />
</f:if>
</f:section>
......@@ -2,10 +2,11 @@ Dear extension owner,
You have {extensions -> f:count()} extension key[s] in your repository (username: "{user.username}") which have never had an upload or weren't touched for one year.
Due to cleanup process we want to inform you that these extension keys will expire in 30 days unless you take action (see below):
<f:for each="{extensions}" as="extension">
# {extension.ext_key}</f:for>
# {extension.ext_key}
</f:for>
Log into extensions.typo3.org and head to https://extensions.typo3.org/my-extensions/ to get a list of these keys and available actions:
* Releasing the extension key to the public, so another developer can use this key
......@@ -18,6 +19,6 @@ Best regards,
Your typo3.org maintenance and Extension Coordination team
--
--
This is an automatic message from the typo3.org system
Contact us: https://typo3.org/teams-committees/typo3org/ or just reply to this email
\ No newline at end of file
Contact us: https://typo3.org/teams-committees/typo3org/ or just reply to this email
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<f:render partial="ExtensionAdminPane" arguments="{adminExtensions: adminExtensions}"/>
</f:section>
\ No newline at end of file
<f:render partial="ExtensionAdminPane" arguments="{adminExtensions: adminExtensions}" />
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
<h2>
<f:translate key="modifiy-extension-key"/>
<f:translate key="modifiy-extension-key" />
</h2>
<hr/>
<hr />
<!-- check if a frontend user is logged in -->
<f:if condition="{loggedIn}">
......@@ -17,21 +17,21 @@
<div class="register-wrapper">
<div class="registerkey-label">
<label>
<f:translate key="extensionKey"/>
<f:translate key="extensionKey" />
</label>
</div>
<div class="register-input b-form-inputs">
<f:form.textfield readonly="readonly" property="extKey"/>
<f:form.textfield readonly="readonly" property="extKey" />
</div>
</div>
<hr style="clear:both;"/>
<hr style="clear:both;" />
<div class="register-wrapper">
<div class="registerkey-label">
<label>&nbsp;</label>
</div>
<f:form.submit class="bu bu-mini" value="{f:translate(key: 'save')}"/>
<f:form.submit class="bu bu-mini" value="{f:translate(key: 'save')}" />
</div>
</f:form>
......@@ -41,4 +41,4 @@
Please log in to manage your extension or to register a new extension key.
</f:else>
</f:if>
</f:section>
\ No newline at end of file
</f:section>
<f:layout name="Default"/>
<f:layout name="Default" />
<f:section name="main">
......@@ -10,10 +10,10 @@
<thead>
<tr>
<th colspan="3">
<f:translate key="extensionKey"/>
<f:translate key="extensionKey" />
</th>
<th class="transfer-colum">
<f:translate key="transferToUser"/>
<f:translate key="transferToUser" />
</th>
</tr>
</thead>
......@@ -30,7 +30,7 @@
<td class="no-borders">
<f:link.action class="url bu bu-mini" action="edit" controller="Registerkey"
arguments="{extension: extension}">
<f:translate key="modifiy-button"/>
<f:translate key="modifiy-button" />
</f:link.action>
</td>
<td class="no-border-left">
......@@ -38,15 +38,15 @@
onclick="if (confirm('Really delete!!')) return true; else return false;"
action="delete" controller="Registerkey"