LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Bugfixes for asset picker

pull/10/head
Jens Pelzetter 2021-06-02 20:49:41 +02:00
parent b46634f5ec
commit 025e48aae0
6 changed files with 176 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml
View File

@ -1,12 +1,12 @@
<!DOCTYPE html [<!ENTITY times '&#215;'>]>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap" xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
xmlns:cc="http://xmlns.jcp.org/jsf/composite" xmlns:cc="http://xmlns.jcp.org/jsf/composite"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<cc:interface shortDescription="An component for selecting assets."> <cc:interface shortDescription="An component for selecting assets.">
<cc:attribute name="action" <cc:attribute name="actionUrl"
required="true" required="true"
shortDescription="Action to trigger when an asset has been selected." shortDescription="Base URL for the actions of the asset picker."
type="String" /> type="String" />
<cc:attribute name="assetType" <cc:attribute name="assetType"
required="false" required="false"
@ -38,12 +38,11 @@
default="3" default="3"
type="int" /> type="int" />
</cc:interface> </cc:interface>
<cc:implementation> <cc:implementation>
<!-- <div class="ccm-cms-asset-picker" <div class="ccm-cms-asset-picker"
data-assettype="#{cc.attrs.assetType}" data-assettype="#{cc.attrs.assetType}"
data-contentsection="#{cc.attrs.contentSection}">--> data-contentsection="#{cc.attrs.contentSection}">
<!-- <div aria-hidden="true" <div aria-hidden="true"
aria-labelledby="#{cc.attrs.assetPickerId}-dialog-title" aria-labelledby="#{cc.attrs.assetPickerId}-dialog-title"
class="modal fade" class="modal fade"
id="#{cc.attrs.assetPickerId}-dialog" id="#{cc.attrs.assetPickerId}-dialog"
@ -88,7 +87,7 @@
<bootstrap:svgIcon icon="x" /> <bootstrap:svgIcon icon="x" />
</button> </button>
</div> </div>
<form action="#{cc.attrs.action}" <form action="#{cc.attrs.actionUrl}"
class="modal-content" class="modal-content"
method="post"> method="post">
<input class="assetpicker-param" <input class="assetpicker-param"
@ -136,10 +135,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>--> </div>
<!--</div>--> </div>
</cc:implementation> </cc:implementation>
</html> </html>

14
ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPickerButton.xhtml
View File

@ -10,12 +10,24 @@
required="true" required="true"
shortDescription="ID of the asset picker" shortDescription="ID of the asset picker"
type="String" /> type="String" />
<cc:attribute name="buttonText"
required="true"
shortDescription="Text of the asset picker button"
type="String" />
<cc:attribute name="buttonIcon"
default="pen"
required="false"
shortDescription="Icon of the asset picker button"
type="String" />
</cc:interface> </cc:interface>
<cc:implementation> <cc:implementation>
<button class="btn btn-primary" <button class="btn btn-primary"
data-toggle="modal" data-toggle="modal"
data-target="##{cc.attrs.assetPickerId}-dialog" data-target="##{cc.attrs.assetPickerId}-dialog"
type="button" /> type="button">
<bootstrap:svgIcon icon="#{cc.attrs.buttonIcon}" />
<span class="sr-only">#{buttonText}</span>
</button>
</cc:implementation> </cc:implementation>
</html> </html>

21
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/edit-contactable.xhtml
View File

@ -71,6 +71,11 @@
</div> </div>
</div> </div>
<c:choose>
<c:when test="#{CmsContactableEditStepModel.contactEntries.isEmpty()}">
<p>#{CmsAssetsStepsDefaultMessagesBundle['contactable.contactentries.none']}</p>
</c:when>
<c:otherwise>
<table> <table>
<thead> <thead>
<tr> <tr>
@ -199,29 +204,34 @@
</c:forEach> </c:forEach>
</tbody> </tbody>
</table> </table>
</c:otherwise>
</c:choose>
<h3>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.title']}</h3> <h3>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.title']}</h3>
<librecms:assetPicker <librecms:assetPicker
action="#{actionBaseUrl}/postaladdress" actionUrl="#{actionBaseUrl}/postaladdress"
assetType="#{CmsContactableEditStepModel.postalAddressType}" assetType="#{CmsContactableEditStepModel.postalAddressType}"
assetPickerId="postaladdress-picker" assetPickerId="postaladdress-picker"
contentSection="#{ContentSectionModel.sectionName}" contentSection="#{ContentSectionModel.sectionName}"
formParamName="postalAddressIdentifier" formParamName="postalAddressIdentifier"
/> />
<c:choose> <c:choose>
<c:when test="#{CmsContactableEditStepModel.postalAddress == null}"> <c:when test="#{CmsContactableEditStepModel.postalAddress == null}">
<!-- <div class="text-right"> <div class="text-right">
<librecms:assetPickerButton <librecms:assetPickerButton
assetPickerId="postaladdress-picker" assetPickerId="postaladdress-picker"
buttonText="#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.set']}"
/> />
</div> </div>
<p>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.none']}</p>--> <p>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.none']}</p>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<!-- <div class="text-right"> <div class="text-right">
<librecms:assetPickerButton <librecms:assetPickerButton
assetPickerId="postaladdress-picker" assetPickerId="postaladdress-picker"
buttonText="#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.set']}"
/> />
<button class="btn btn-danger" <button class="btn btn-danger"
data-toggle="modal" data-toggle="modal"
@ -295,8 +305,7 @@
<dt>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.country']}</dt> <dt>#{CmsAssetsStepsDefaultMessagesBundle['contactable.postaladdress.country']}</dt>
<dd>#{CmsContactableEditStepModel.postalAddressCountry}) (#{CmsContactableEditStepModel.postalAddress.isoCountryCode})</dd> <dd>#{CmsContactableEditStepModel.postalAddressCountry}) (#{CmsContactableEditStepModel.postalAddress.isoCountryCode})</dd>
</div> </div>
</dl>
</dl>-->
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/person/edit-person.xhtml
View File

@ -33,7 +33,7 @@
tabindex="-1" tabindex="-1"
> >
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/asset/#{CmsSelectedAssetModel.assetPath}/@person-edit/personnames/@add" <form action="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSelectedAssetModel.assetPath}/@person-edit/personnames/@add"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">

5
ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties
View File

@ -268,3 +268,8 @@ person.description=Contact information of a person
person.createform.title=Create new Person person.createform.title=Create new Person
person.personnames.col.actions=Actions person.personnames.col.actions=Actions
person.personnames.none=No person names yet. person.personnames.none=No person names yet.
contactable.contactentries.none=No contact entries yet.
contactable.postaladdress.set=Set postal address
person.personname.givenname.label=Given name
person.personname.add.dialog.close=Cancel
person.personname.add.dialog.submit=Add person name

5
ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties
View File

@ -268,3 +268,8 @@ person.description=Kontaktinformationen einer Person
person.createform.title=Neue Person anlegen person.createform.title=Neue Person anlegen
person.personnames.col.actions=Aktionen person.personnames.col.actions=Aktionen
person.personnames.none=Noch keine Personennamen vorhanden. person.personnames.none=Noch keine Personennamen vorhanden.
contactable.contactentries.none=Es wurden noch keine Kontaktdaten-Eintr\u00e4ge angelegt.
contactable.postaladdress.set=Postanschrift setzen
person.personname.givenname.label=Vorname
person.personname.add.dialog.close=Abbrechen
person.personname.add.dialog.submit=Personenamen hinzuf\u00fcgen