Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUGFIX: Fix readonly asset source action buttons #2119

Merged
merged 2 commits into from Jul 27, 2018
Merged

BUGFIX: Fix readonly asset source action buttons #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40ab99f
BUGFIX: Broken "view" button in list view for read-only asset sources
robertlemke Jul 27, 2018
e4c7093
TASK: Convert tabs to spaces in templates of Media Browser package
robertlemke Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions Neos.Media.Browser/Resources/Private/Layouts/Module/Default.html
View file
Open in desktop
@@ -1,18 +1,18 @@
<div class="{settings.bodyClasses}">
<div class="neos-media-options">
<f:render section="Options" optional="TRUE" />
</div>
<div class="neos-media-content{f:if(condition: '{tags -> f:count()} > 25', then: ' neos-media-aside-condensed')}">
<div class="neos-media-assets">
<div class="neos-notification-container">
<f:render partial="FlashMessages" />
</div>
<div class="neos-media-options">
<f:render section="Options" optional="TRUE"/>
</div>
<div class="neos-media-content{f:if(condition: '{tags -> f:count()} > 25', then: ' neos-media-aside-condensed')}">
<div class="neos-media-assets">
<div class="neos-notification-container">
<f:render partial="FlashMessages"/>
</div>

<f:render section="Content" />
</div>
<aside class="neos-media-aside">
<f:render section="Sidebar" />
</aside>
</div>
<f:render section="Content"/>
</div>
<aside class="neos-media-aside">
<f:render section="Sidebar"/>
</aside>
</div>
</div>
<f:render section="Scripts" optional="TRUE" />
<f:render section="Scripts" optional="TRUE"/>
6 changes: 3 additions & 3 deletions Neos.Media.Browser/Resources/Private/Layouts/Module/EditImage.html
View file
Open in desktop
@@ -1,6 +1,6 @@
<div class="{settings.bodyClasses}">
<f:render partial="FlashMessages" />
<f:render partial="FlashMessages"/>

<f:render section="Content" />
<f:render section="Content"/>
</div>
<f:render section="Scripts" optional="TRUE" />
<f:render section="Scripts" optional="TRUE"/>
10 changes: 5 additions & 5 deletions Neos.Media.Browser/Resources/Private/Layouts/Module/UploadImage.html
View file
Open in desktop
@@ -1,8 +1,8 @@
<div class="{settings.bodyClasses}">
<div class="neos-row-fluid">
<f:render partial="FlashMessages" />
<div class="neos-row-fluid">
<f:render partial="FlashMessages"/>

<f:render section="Content" />
</div>
<f:render section="Content"/>
</div>
</div>
<f:render section="Scripts" optional="TRUE" />
<f:render section="Scripts" optional="TRUE"/>
16 changes: 8 additions & 8 deletions Neos.Media.Browser/Resources/Private/Partials/FlashMessages.html
View file
Open in desktop
@@ -1,10 +1,10 @@
{namespace neos=Neos\Neos\ViewHelpers}
<f:flashMessages as="flashMessages">
<f:if condition="{flashMessages -> f:count()} > 0">
<ul id="neos-notifications-inline">
<f:for each="{flashMessages}" as="flashMessage">
<li data-type="{flashMessage.severity -> f:format.case(mode: 'lower')}">{neos:backend.translate(id: 'flashMessage.{flashMessage.code}', arguments: flashMessage.arguments, value: flashMessage)}</li>
</f:for>
</ul>
</f:if>
</f:flashMessages>
<f:if condition="{flashMessages -> f:count()} > 0">
<ul id="neos-notifications-inline">
<f:for each="{flashMessages}" as="flashMessage">
<li data-type="{flashMessage.severity -> f:format.case(mode: 'lower')}">{neos:backend.translate(id: 'flashMessage.{flashMessage.code}', arguments: flashMessage.arguments, value: flashMessage)}</li>
</f:for>
</ul>
</f:if>
</f:flashMessages>
218 changes: 109 additions & 109 deletions Neos.Media.Browser/Resources/Private/Partials/ListView.html
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions Neos.Media.Browser/Resources/Private/Partials/ThumbnailView.html
View file
Open in desktop
Expand Up @@ -2,24 +2,24 @@
{namespace mediaBrowser=Neos\Media\Browser\ViewHelpers}
{namespace neos=Neos\Neos\ViewHelpers}
<mediaBrowser:paginate queryResult="{assetProxies}" as="paginatedAssetProxies" configuration="{itemsPerPage: 30, maximumNumberOfLinks: 7}">
<ul class="neos-thumbnails asset-list">
<f:alias map="{
'editLabel': '{neos:backend.translate(id: \'edit\', package: \'Neos.Neos\')}',
'replaceLabel': '{neos:backend.translate(id: \'replace\', package: \'Neos.Media.Browser\')}',
'editAssetLabel': '{neos:backend.translate(id: \'editAsset\', package: \'Neos.Media.Browser\')}',
'replaceAssetResourceLabel': '{neos:backend.translate(id: \'replaceAssetResource\', package: \'Neos.Media.Browser\')}',
'deleteLabel': '{neos:backend.translate(id: \'delete\', package: \'Neos.Neos\')}',
'deleteAssetLabel': '{neos:backend.translate(id: \'deleteAsset\', package: \'Neos.Media.Browser\')}'
<ul class="neos-thumbnails asset-list">
<f:alias map="{
'editLabel': '{neos:backend.translate(id: \'edit\', package: \'Neos.Neos\')}',
'replaceLabel': '{neos:backend.translate(id: \'replace\', package: \'Neos.Media.Browser\')}',
'editAssetLabel': '{neos:backend.translate(id: \'editAsset\', package: \'Neos.Media.Browser\')}',
'replaceAssetResourceLabel': '{neos:backend.translate(id: \'replaceAssetResource\', package: \'Neos.Media.Browser\')}',
'deleteLabel': '{neos:backend.translate(id: \'delete\', package: \'Neos.Neos\')}',
'deleteAssetLabel': '{neos:backend.translate(id: \'deleteAsset\', package: \'Neos.Media.Browser\')}'
}">
<f:for each="{paginatedAssetProxies}" as="assetProxy">
<li class="asset">
<li class="asset">
<f:if condition="!{activeAssetSource.readOnly}">
<f:then>
<f:link.action action="edit" class="neos-thumbnail" arguments="{assetSourceIdentifier: activeAssetSource.identifier, assetProxyIdentifier: assetProxy.identifier}" data="{asset-identifier: '{assetProxy.identifier}', local-asset-identifier: '{assetProxy.localAssetIdentifier}', asset-source-identifier: '{assetProxy.assetSource.identifier}'}">
<div class="neos-img-container draggable-asset {f:if(condition: '{assetProxy.asset.tags -> f:count()} === 0', then: ' neos-media-untagged')}">
<f:if condition="{assetProxy.thumbnailUri}">
<f:then><img src="{assetProxy.thumbnailUri}" alt="" width="250" height="250" /></f:then>
<f:else><img src="{f:uri.resource(path:'Images/dummy-image.svg', package:'Neos.Neos')}" alt="" width="250" height="250" /></f:else>
<f:then><img src="{assetProxy.thumbnailUri}" alt="" width="250" height="250"/></f:then>
<f:else><img src="{f:uri.resource(path:'Images/dummy-image.svg', package:'Neos.Neos')}" alt="" width="250" height="250"/></f:else>
</f:if>
</div>
</f:link.action>
Expand All @@ -28,51 +28,51 @@
<f:link.action action="show" class="neos-thumbnail" arguments="{assetSourceIdentifier: activeAssetSource.identifier, assetProxyIdentifier: assetProxy.identifier}" data="{asset-identifier: '{assetProxy.identifier}', local-asset-identifier: '{assetProxy.localAssetIdentifier}', asset-source-identifier: '{assetProxy.assetSource.identifier}'}">
<div class="neos-img-container">
<f:if condition="{assetProxy.thumbnailUri}">
<f:then><img src="{assetProxy.thumbnailUri}" alt="" width="250" height="250" /></f:then>
<f:else><img src="{f:uri.resource(path:'Images/dummy-image.svg', package:'Neos.Neos')}" alt="" width="250" height="250" /></f:else>
<f:then><img src="{assetProxy.thumbnailUri}" alt="" width="250" height="250"/></f:then>
<f:else><img src="{f:uri.resource(path:'Images/dummy-image.svg', package:'Neos.Neos')}" alt="" width="250" height="250"/></f:else>
</f:if>
</div>
</f:link.action>
</div>
</f:link.action>
</f:else>
</f:if>
<div class="neos-img-label">
<div class="neos-img-label">
<m:fileTypeIcon filename="{assetProxy.filename}" height="32"/>
<f:if condition="!{activeAssetSource.readOnly}">
<div class="neos-dropdown neos-pull-right" id="neos-asset-actionmenu-{assetProxy.identifier}">
<a class="dropdown-toggle neos-button" href="#" data-neos-toggle="dropdown" data-target="#neos-asset-actionmenu-{assetProxy.identifier}">
<i class="fas fa-ellipsis-h"></i>
</a>
<div class="neos-dropdown-menu-list neos-pull-right" role="menu">
<ul>
<li>
<i class="fas fa-ellipsis-h"></i>
</a>
<div class="neos-dropdown-menu-list neos-pull-right" role="menu">
<ul>
<li>
<f:link.action action="edit" arguments="{assetSourceIdentifier: activeAssetSource.identifier, assetProxyIdentifier: assetProxy.identifier}" title="{editAssetLabel}" data="{neos-toggle: 'tooltip', placement: 'left'}">
<i class="fas fa-edit icon-white"></i> {editLabel}
</f:link.action>
</li>
<f:security.ifAccess privilegeTarget="Neos.Media.Browser:ReplaceAssetResource">
<li>
<i class="fas fa-edit icon-white"></i> {editLabel}
</f:link.action>
</li>
<f:security.ifAccess privilegeTarget="Neos.Media.Browser:ReplaceAssetResource">
<li>
<f:link.action action="replaceAssetResource" arguments="{asset: assetProxy.asset}" title="{replaceAssetResourceLabel}" data="{neos-toggle: 'tooltip', placement: 'left'}">
<i class="fas fa-random icon-white"></i> {replaceLabel}
</f:link.action>
</li>
</f:security.ifAccess>
<li>
<i class="fas fa-random icon-white"></i> {replaceLabel}
</f:link.action>
</li>
</f:security.ifAccess>
<li>
<a href="#" class="neos-media-delete" title="{deleteAssetLabel}"
data-neos-toggle="tooltip" data-placement="left"
data-modal="delete-asset-modal"
data-label="{assetProxy.label -> f:format.crop(maxCharacters: 50)}"
data-object-identifier="{assetProxy.identifier}">
<i class="fas fa-trash icon-white"></i> {deleteLabel}
</a>
</li>
</ul>
</div>
</div>
<i class="fas fa-trash icon-white"></i> {deleteLabel}
</a>
</li>
</ul>
</div>
</div>
</f:if>
<span class="neos-caption asset-label" title="{assetProxy.label}" data-neos-toggle="tooltip"><f:format.crop maxCharacters="100">{assetProxy.label}</f:format.crop></span>
</div>
</li>
</f:for>
</f:alias>
</ul>
</div>
</li>
</f:for>
</f:alias>
</ul>
</mediaBrowser:paginate>
126 changes: 63 additions & 63 deletions Neos.Media.Browser/Resources/Private/Templates/ViewHelpers/Asset/Index.html
View file
Open in desktop
@@ -1,72 +1,72 @@
<f:if condition="{configuration.insertAbove}">
<f:render section="paginator" arguments="{pagination: pagination}" />
<f:render section="paginator" arguments="{pagination: pagination}"/>
</f:if>

<f:renderChildren arguments="{contentArguments}" />
<f:renderChildren arguments="{contentArguments}"/>

<f:if condition="{configuration.insertBelow}">
<f:render section="paginator" arguments="{pagination: pagination}" />
<f:render section="paginator" arguments="{pagination: pagination}"/>
</f:if>

<f:section name="paginator">
<f:if condition="{pagination.numberOfPages} > 1">
<div class="page-navigation">
<ul class="neos-fluid-widget-paginator">
<f:if condition="{pagination.previousPage}">
<li class="previous">
<f:if condition="{pagination.previousPage} > 1">
<f:then>
<f:widget.link action="index" arguments="{currentPage: pagination.previousPage}">{f:translate(id: 'widget.paginate.previous', value: 'previous')}</f:widget.link>
</f:then>
<f:else>
<f:widget.link action="index">{f:translate(id: 'widget.paginate.previous', value: 'previous')}</f:widget.link>
</f:else>
</f:if>
</li>
</f:if>
<f:if condition="{pagination.displayRangeStart} > 1">
<li class="first">
<f:widget.link action="index">1</f:widget.link>
</li>
</f:if>
<f:if condition="{pagination.hasLessPages}">
<li>...</li>
</f:if>
<f:for each="{pagination.pages}" as="page">
<f:if condition="{page.isCurrent}">
<f:then>
<li class="current">
{page.number}
</li>
</f:then>
<f:else>
<li>
<f:if condition="{page.number} > 1">
<f:then>
<f:widget.link action="index" arguments="{currentPage: page.number}">{page.number}</f:widget.link>
</f:then>
<f:else>
<f:widget.link action="index">{page.number}</f:widget.link>
</f:else>
</f:if>
</li>
</f:else>
</f:if>
</f:for>
<f:if condition="{pagination.hasMorePages}">
<li>...</li>
</f:if>
<f:if condition="{pagination.displayRangeEnd} < {pagination.numberOfPages}">
<li class="last">
<f:widget.link action="index" arguments="{currentPage: pagination.numberOfPages}">{pagination.numberOfPages}</f:widget.link>
</li>
</f:if>
<f:if condition="{pagination.nextPage}">
<li class="next">
<f:widget.link action="index" arguments="{currentPage: pagination.nextPage}">{f:translate(id: 'widget.paginate.next', value: 'next')}</f:widget.link>
</li>
</f:if>
</ul>
</div>
</f:if>
<f:if condition="{pagination.numberOfPages} > 1">
<div class="page-navigation">
<ul class="neos-fluid-widget-paginator">
<f:if condition="{pagination.previousPage}">
<li class="previous">
<f:if condition="{pagination.previousPage} > 1">
<f:then>
<f:widget.link action="index" arguments="{currentPage: pagination.previousPage}">{f:translate(id: 'widget.paginate.previous', value: 'previous')}</f:widget.link>
</f:then>
<f:else>
<f:widget.link action="index">{f:translate(id: 'widget.paginate.previous', value: 'previous')}</f:widget.link>
</f:else>
</f:if>
</li>
</f:if>
<f:if condition="{pagination.displayRangeStart} > 1">
<li class="first">
<f:widget.link action="index">1</f:widget.link>
</li>
</f:if>
<f:if condition="{pagination.hasLessPages}">
<li>...</li>
</f:if>
<f:for each="{pagination.pages}" as="page">
<f:if condition="{page.isCurrent}">
<f:then>
<li class="current">
{page.number}
</li>
</f:then>
<f:else>
<li>
<f:if condition="{page.number} > 1">
<f:then>
<f:widget.link action="index" arguments="{currentPage: page.number}">{page.number}</f:widget.link>
</f:then>
<f:else>
<f:widget.link action="index">{page.number}</f:widget.link>
</f:else>
</f:if>
</li>
</f:else>
</f:if>
</f:for>
<f:if condition="{pagination.hasMorePages}">
<li>...</li>
</f:if>
<f:if condition="{pagination.displayRangeEnd} < {pagination.numberOfPages}">
<li class="last">
<f:widget.link action="index" arguments="{currentPage: pagination.numberOfPages}">{pagination.numberOfPages}</f:widget.link>
</li>
</f:if>
<f:if condition="{pagination.nextPage}">
<li class="next">
<f:widget.link action="index" arguments="{currentPage: pagination.nextPage}">{f:translate(id: 'widget.paginate.next', value: 'next')}</f:widget.link>
</li>
</f:if>
</ul>
</div>
</f:if>
</f:section>
3 changes: 3 additions & 0 deletions Neos.Media/Classes/Domain/Model/AssetSource/SupportsSortingInterface.php
View file
Open in desktop
Expand Up @@ -11,6 +11,9 @@
* source code.
*/

/**
* An interface for Asset Proxy Repositories which support sorting.
*/
interface SupportsSortingInterface
{
/**
Expand Down