Skip to content

Commit 8e08ec6

Browse files
eugeniosanteugeniosant
committed
ENG-5473: Added resource delete message and disk size bar
1 parent c557b84 commit 8e08ec6

File tree

8 files changed

+144
-54
lines changed

8 files changed

+144
-54
lines changed

‎admin-console/src/main/java/com/agiletec/apsadmin/global-messages_en.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ label.template.preview=Template preview
8585

8686
label.key=Key
8787
label.info=Info
88+
label.warning=Warning
8889
label.description=Name
8990
label.empty.f=Empty
9091
label.empty.m=Empty

‎admin-console/src/main/java/com/agiletec/apsadmin/global-messages_it.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ label.filter=Filtro
9191

9292
label.key=Chiave
9393
label.info=Info
94+
label.warning=Attenzione
9495
label.description=Descrizione
9596
label.descr=Descrizione
9697
label.empty.f=Vuota

‎admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/filebrowser/filebrowser-list.jsp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@
2929
<br />
3030
<s:text name="label.disk.status" />&nbsp;:&nbsp;<s:property value="(#diskInfoVar.usedSpace / 1048576) > 0 ? (#diskInfoVar.usedSpace / 1048576) + ' Mb' : (#diskInfoVar.usedSpace / 1024) + ' Kb' " />&nbsp;<s:text name="label.disk.used" />&nbsp;/
3131
<s:property value="(#diskInfoVar.totalSize / 1048576) > 0 ? (#diskInfoVar.totalSize / 1048576) + ' Mb' : (#diskInfoVar.totalSize / 1024) + ' Kb' " />&nbsp;<s:text name="label.disk.available" />&nbsp;&ndash;
32-
<s:number name="%{(#diskInfoVar.usedSpace * 100 / #diskInfoVar.totalSize)}" type="percentage" minimumFractionDigits="2" />&nbsp;%&nbsp;<s:text name="label.disk.used.percentage" />
32+
<s:property value="%{(#diskInfoVar.usedSpace * 100 / #diskInfoVar.totalSize)}" var="percentUsedVar" />
33+
<s:number name="#percentUsedVar" type="percentage" minimumFractionDigits="2" />&nbsp;%&nbsp;<s:text name="label.disk.used.percentage" />
34+
<div class="progress">
35+
<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="5" aria-valuemin="0" aria-valuemax="100" style="width: <s:number name="#percentUsedVar" type="percentage" maximumFractionDigits="0" />%">
36+
<span class="sr-only"><s:number name="#percentUsedVar" type="percentage" maximumFractionDigits="0" />% Complete (danger)</span>
37+
</div>
38+
</div>
3339
</s:if>
3440
<s:else>
3541
<!-- disk info null -->

‎pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,6 @@
298298
</execution>
299299
</executions>
300300
</plugin>
301-
<plugin>
302-
<groupId>org.codehaus.mojo</groupId>
303-
<artifactId>license-maven-plugin</artifactId>
304-
<configuration>
305-
<executeOnlyOnRootModule>false</executeOnlyOnRootModule>
306-
</configuration>
307-
</plugin>
308301
</plugins>
309302
</build>
310303
<dependencyManagement>

‎versioning-plugin/src/main/java/com/agiletec/plugins/jpversioning/apsadmin/global-messages_en.properties‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ jpversioning.resources.images.help=TO be inserted
1717
jpversioning.recover.help=TO be inserted
1818
jpversioning.resourceManagement.resourceTrash.help=TO be inserted
1919

20-
title.jpversioning.contentHistoryManagement=History Management
20+
title.jpversioning.contentHistoryManagement=History Management
21+
22+
jpversioning.label.deletionWillBePermanent=The deletion will be permanent and cannot be undone
23+
24+
jpversioning.label.deletionCanBeUndone=The deletion can be undone throw the functionalities of versioning module
25+

‎versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jpversioning-tiles.xml‎

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,63 @@
44
"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
55

66
<tiles-definitions>
7-
8-
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Image.list">
9-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
10-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashImageArchive.jsp" />
11-
</definition>
12-
13-
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Attach.list">
14-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
15-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashAttachArchive.jsp" />
16-
</definition>
17-
18-
<definition extends="layout.default" name="admin.jpversioning.content.versioning.list">
19-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
20-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/contentFinding.jsp" />
21-
</definition>
22-
23-
<definition extends="layout.default" name="admin.jpversioning.content.versioning.history">
24-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
25-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/contentHistory.jsp" />
26-
</definition>
27-
28-
<definition extends="layout.default" name="admin.jpversioning.content.versioning.trash">
29-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
30-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/trashContentVersion.jsp" />
31-
</definition>
32-
33-
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Image.trash">
34-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
35-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashResource.jsp" />
36-
</definition>
7+
8+
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Image.list">
9+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
10+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashImageArchive.jsp" />
11+
</definition>
12+
13+
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Attach.list">
14+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
15+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashAttachArchive.jsp" />
16+
</definition>
17+
18+
<definition extends="layout.default" name="admin.jpversioning.content.versioning.list">
19+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
20+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/contentFinding.jsp" />
21+
</definition>
22+
23+
<definition extends="layout.default" name="admin.jpversioning.content.versioning.history">
24+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
25+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/contentHistory.jsp" />
26+
</definition>
27+
28+
<definition extends="layout.default" name="admin.jpversioning.content.versioning.trash">
29+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
30+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/trashContentVersion.jsp" />
31+
</definition>
32+
33+
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Image.trash">
34+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
35+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashResource.jsp" />
36+
</definition>
3737

3838
<definition extends="layout.default" name="admin.jpversioning.resource.trash.Attach.trash">
3939
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
4040
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/trashResource.jsp" />
4141
</definition>
4242

4343
<definition extends="layout.default" name="admin.jpversioning.content.versioning.viewPreview">
44-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
45-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/viewPreview.jsp" />
46-
<put-attribute name="extraResources" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/common/template/extraresources/viewPreview.jsp" />
47-
</definition>
44+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
45+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/viewPreview.jsp" />
46+
<put-attribute name="extraResources" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/common/template/extraresources/viewPreview.jsp" />
47+
</definition>
4848

49-
<definition extends="layout.default" name="admin.jpversioning.content.versioning.recover">
50-
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
51-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/recoverContent.jsp" />
52-
</definition>
49+
<definition extends="layout.default" name="admin.jpversioning.content.versioning.recover">
50+
<put-attribute name="title" value="title.jpversioning.contentHistoryManagement" />
51+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/versioning/recoverContent.jsp" />
52+
</definition>
5353

54-
<definition extends="layout.default" name="admin.jpversioning.Config">
55-
<put-attribute name="title" value="title.jpversioning.config" />
56-
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp" />
57-
</definition>
54+
<definition extends="layout.default" name="admin.jpversioning.Config">
55+
<put-attribute name="title" value="title.jpversioning.config" />
56+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/config/versioningSysConfig.jsp" />
57+
</definition>
58+
59+
<!-- default trash resource UI -->
60+
61+
<definition extends="layout.default" name="admin.jacms.resource.trash">
62+
<put-attribute name="title" value="title.resourceManagement" />
63+
<put-attribute name="body" value="/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/defaultTrashResource.jsp" />
64+
</definition>
5865

5966
</tiles-definitions>

‎versioning-plugin/src/main/webapp/WEB-INF/plugins/jpversioning/apsadmin/jsp/resource/defaultTrashResource.jsp‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<%@ taglib prefix="s" uri="/struts-tags" %>
2+
<%@ taglib uri="/aps-core" prefix="wp" %>
3+
<%@ taglib uri="/apsadmin-core" prefix="wpsa" %>
4+
<%@ taglib prefix="wpsf" uri="/apsadmin-form" %>
5+
6+
<s:set var="categoryTreeStyleVar"><wp:info key="systemParam" paramName="treeStyle_category"/></s:set>
7+
<s:set var="targetNS" value="%{'/do/jacms/Resource'}"/>
8+
<s:set var="targetParamName" value="%{'resourceTypeCode'}"/>
9+
<s:set var="targetParamValue" value="resourceTypeCode"/>
10+
11+
<ol class="breadcrumb page-tabs-header breadcrumb-position">
12+
<li><s:text name="breadcrumb.app"/></li>
13+
<li><s:text name="breadcrumb.jacms"/></li>
14+
<li>
15+
<s:property value="%{getText('title.' + resourceTypeCode + 'Management')}"/>
16+
</li>
17+
<li class="page-title-container">
18+
<s:text name="title.resourceManagement.resourceTrash"/>
19+
</li>
20+
</ol>
21+
<h1 class="page-title-container">
22+
<div>
23+
<s:text name="title.resourceManagement.resourceTrash"/>
24+
</div>
25+
</h1>
26+
<div class="text-right">
27+
<div class="form-group-separator"></div>
28+
</div>
29+
<br>
30+
31+
<div class="text-center">
32+
<s:form action="delete">
33+
34+
<p class="sr-only">
35+
<wpsf:hidden name="resourceId"/>
36+
<wpsf:hidden name="text" value="%{#parameters['text']}"/>
37+
<wpsf:hidden name="categoryCode" value="%{#parameters['categoryCode']}"/>
38+
<wpsf:hidden name="resourceTypeCode"/>
39+
<wpsf:hidden name="fileName" value="%{#parameters['fileName']}"/>
40+
<wpsf:hidden name="ownerGroupName" value="%{#parameters['ownerGroupName']}"/>
41+
<s:if test="#categoryTreeStyleVar == 'request'">
42+
<s:iterator value="%{#parameters['treeNodesToOpen']}" var="treeNodeToOpenVar"><wpsf:hidden
43+
name="treeNodesToOpen" value="%{#treeNodeToOpenVar}"/></s:iterator>
44+
</s:if>
45+
</p>
46+
47+
<i class="fa fa-exclamation esclamation-big" aria-hidden="true"></i>
48+
<p class="esclamation-underline"><s:text name="note.deleteResource.areYouSure"/></p>
49+
<p class="esclamation-underline-text"><s:property value="%{loadResource(resourceId).descr}"/>&#63;</p>
50+
51+
<s:set var="trashResourceActiveVar"><wp:info key="systemParam" paramName="jpversioning_trashResourceActive" /></s:set>
52+
<s:if test="#trashResourceActiveVar == 'true'">
53+
<div class="alert alert-info fade in">
54+
<strong style="font-size:24px;color:green"><i class="fa fa-info-circle"></i>&nbsp;<s:text name="label.info"/></strong>
55+
<p class="esclamation-underline-text" ><s:text name="jpversioning.label.deletionCanBeUndone" /></p>
56+
</div>
57+
</s:if>
58+
<s:else>
59+
<div class="alert alert-danger fade in">
60+
<strong style="font-size:24px;color:red"><i class="fa fa-warning"></i>&nbsp;<s:text name="label.warning"/></strong>
61+
<p class="esclamation-underline-text" ><s:text name="jpversioning.label.deletionWillBePermanent" /></p>
62+
</div>
63+
</s:else>
64+
65+
<div class="text-center margin-large-top">
66+
<a class="btn btn-default button-fixed-width" href="<s:url action="list" namespace="/do/jacms/Resource">
67+
<s:param name="resourceTypeCode">
68+
<s:property value="resourceTypeCode" />
69+
</s:param>
70+
</s:url>">
71+
<s:text name="label.back"/>
72+
</a>
73+
<wpsf:submit type="button" cssClass="btn btn-danger button-fixed-width">
74+
<s:text name="label.delete"/>
75+
</wpsf:submit>
76+
</div>
77+
</s:form>
78+
</div>

‎webapp/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
</context-param>
2121
<context-param>
2222
<param-name>Struts2Config</param-name>
23-
<param-value>struts-default.xml,struts-plugin.xml,struts.xml,entando-struts-plugin.xml,japs-struts-plugin.xml
24-
</param-value>
23+
<param-value>struts-default.xml,struts-plugin.xml,struts.xml,entando-struts-plugin.xml,japs-struts-plugin.xml</param-value>
2524
</context-param>
2625
<context-param>
2726
<param-name>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</param-name>
28-
<param-value>/WEB-INF/apsadmin/tiles.xml,/WEB-INF/plugins/**/apsadmin/**tiles.xml</param-value>
27+
<param-value>/WEB-INF/apsadmin/tiles.xml,/WEB-INF/plugins/**/apsadmin/**tiles.xml,/WEB-INF/plugins/jpversioning/apsadmin/jpversioning-tiles.xml</param-value>
2928
</context-param>
3029
<context-param>
3130
<param-name>contextClass</param-name>

0 commit comments

Comments
 (0)