Skip to content

Commit d509389

Browse files
mmoquimmoqui
committed
Bug #14491
In kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp and kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp, replace some Java plain codes by JSTL codes. Fix javascript code to please Sonar.
1 parent b578888 commit d509389

File tree

2 files changed

+197
-166
lines changed

2 files changed

+197
-166
lines changed

‎kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp

Lines changed: 92 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -31,82 +31,81 @@
3131
response.setDateHeader("Expires", -1); //prevents caching at the proxy server
3232
%>
3333
<%-- Import area --%>
34-
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.frame.Frame"%>
35-
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttonpanes.ButtonPane"%>
36-
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttons.Button"%>
37-
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.window.Window"%>
38-
<%@ page import="org.silverpeas.core.web.util.viewgenerator.html.GraphicElementFactory"%>
39-
<%@ page import="org.silverpeas.kernel.bundle.ResourceLocator"%>
4034
<%@page import="org.silverpeas.core.web.treemenu.process.TreeHandler"%>
4135
<%@page import="org.silverpeas.core.web.treemenu.model.MenuConstants"%>
4236

37+
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
38+
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
39+
<%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %>
4340
<%@ taglib uri="http://www.silverpeas.com/tld/menuTree" prefix="menuTree"%>
4441
<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%>
42+
<%@ taglib prefix="fmr" uri="http://java.sun.com/jsp/jstl/fmt" %>
4543

46-
<%
47-
GraphicElementFactory gef = (GraphicElementFactory) session.getAttribute("SessionGraphicElementFactory");
48-
String language = (String) session.getAttribute("WYSIWYG_Language");
49-
LocalizationBundle message = ResourceLocator.getLocalizationBundle("org.silverpeas.wysiwyg.multilang.wysiwygBundle", language);
50-
String contextName = ResourceLocator.getGeneralSettingBundle().getString("ApplicationURL");
51-
%>
44+
<fmt:setLocale value="${sessionScope.WYSIWYG_Language}"/>
45+
<view:setBundle basename="org.silverpeas.wysiwyg.multilang.wysiwygBundle"/>
46+
<c:set value="${silfn:applicationURL()}" var="webContext"/>
47+
<fmt:message key="Close" var="closeLabel"/>
5248

5349
<%@ page import="org.silverpeas.kernel.bundle.LocalizationBundle" %>
5450
<%@ page import="org.owasp.encoder.Encode" %>
55-
<html>
56-
<head>
57-
<title></title>
58-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
59-
<link rel="stylesheet" type="text/css" href="<%=contextName %>/kmelia/jsp/styleSheets/kmelia.css">
60-
<view:looknfeel/>
51+
<view:sp-page>
52+
<view:sp-head-part>
53+
<link rel="stylesheet" type="text/css" href="${webContext}/kmelia/jsp/styleSheets/kmelia.css">
6154
<%-- load the css and js file used by tree menu --%>
62-
<menuTree:head displayCssFile="true" displayJavascriptFile="true" displayIconsStyles="false" contextName="<%=contextName%>"></menuTree:head>
55+
<menuTree:head displayCssFile="true"
56+
displayJavascriptFile="true"
57+
displayIconsStyles="false"
58+
contextName="${webContext}"/>
6359

64-
<script language="JavaScript" type="text/javascript">
60+
<script>
6561
function returnHtmlEditor() {
6662
window.close();
6763
}
6864
69-
var context ='<%=contextName %>';
70-
var currentNodeId;
71-
var currentNodeIndex;
72-
var currentComponent;
73-
var menuType='<%=MenuConstants.THEME_MENU_TYPE%>';
65+
const context = '${webContext}';
66+
let currentNodeId;
67+
let currentNodeIndex;
68+
let currentComponent;
69+
const menuType = '<%=MenuConstants.THEME_MENU_TYPE%>';
70+
7471
function buildTree() {
75-
//create a new tree:
72+
let mes;
73+
//create a new tree:
7674
tree = new YAHOO.widget.TreeView("treeDiv1");
7775
//turn dynamic loading on for entire tree:
7876
tree.setDynamicLoad(loadNodeData, 0);
7977
//get root node for tree:
80-
var root = tree.getRoot();
81-
82-
//add child nodes for tree; our top level nodes are
83-
try{
84-
var mes = [];
85-
mes =YAHOO.lang.JSON.stringify(<%=TreeHandler.processMenu(request,MenuConstants.THEME_MENU_TYPE)%>);
86-
mes = YAHOO.lang.JSON.parse(mes);
87-
}catch(x){
78+
const root = tree.getRoot();
79+
80+
//add child nodes for tree; our top level nodes are
81+
try {
82+
mes = [];
83+
mes = YAHOO.lang.JSON.stringify(<%=TreeHandler.processMenu(request,MenuConstants.THEME_MENU_TYPE, false)%>);
84+
mes = YAHOO.lang.JSON.parse(mes);
85+
} catch(x){
8886
notyError("JSON Parse failed: "+x);
8987
return;
90-
}
91-
for (var i=0, j=mes.length; i<j; i++) {
92-
var tempNode = new YAHOO.widget.TextNode(mes[i], root, false);
93-
tempNode.multiExpand =false;
94-
}
88+
}
89+
for (let i=0, j=mes.length; i<j; i++) {
90+
const tempNode = new YAHOO.widget.TextNode(mes[i], root, false);
91+
tempNode.multiExpand =false;
92+
}
9593
//render tree with these toplevel nodes; all descendants of these nodes
9694
//will be generated as needed by the dynamic loader.
9795
tree.draw();
9896
//action when a user click on a node
9997
tree.subscribe('clickEvent',function(oArgs) {
10098
currentComponent = oArgs.node.data.componentId;
10199
// highlight selected node
102-
$("#ygtvcontentel"+currentNodeIndex).css({'font-weight':'normal'});
100+
const $currentNode = $("#ygtvcontentel"+currentNodeIndex);
101+
$currentNode.css({'font-weight':'normal'});
103102
setCurrentNodeId(oArgs.node.data.id);
104103
currentNodeIndex = oArgs.node.index;
105-
$("#ygtvcontentel"+currentNodeIndex).css({'font-weight':'bold'});
104+
$currentNode.css({'font-weight':'bold'});
106105
//if node is a theme display the publications
107-
if(oArgs.node.data.componentId!='undefined' && oArgs.node.data.nodeType=='THEME'){
106+
if (oArgs.node.data.componentId !== undefined && oArgs.node.data.nodeType === 'THEME') {
108107
displayPublications(oArgs.node.data.componentId,getCurrentNodeId());
109-
}else{
108+
} else {
110109
displayHomeMessage();
111110
}
112111
});
@@ -130,25 +129,34 @@ function hidePublicationOperations () {
130129
}
131130
132131
function doPagination(index, nbItemsPerPage){
133-
var ieFix = new Date().getTime();
134-
$.get('<%=contextName%>/RAjaxPublicationsListServlet', {Index:index,NbItemsPerPage:nbItemsPerPage,ComponentId:currentComponent,attachmentLink:1,IEFix:ieFix},
135-
function(data){
136-
$('#pubList').html(data);
137-
},"html");
132+
const ieFix = new Date().getTime();
133+
$.get('${webContext}/RAjaxPublicationsListServlet', {
134+
Index: index,
135+
NbItemsPerPage: nbItemsPerPage,
136+
ComponentId: currentComponent,
137+
attachmentLink: 1,
138+
IEFix: ieFix
139+
}, function(data) {
140+
$('#pubList').html(data);
141+
}, "html");
138142
}
139143
140144
function displayPublications(CompoId,topicId){
141-
var ieFix = new Date().getTime();
142-
$.get('<%=contextName%>/RAjaxPublicationsListServlet', {ComponentId:CompoId,Id:topicId,attachmentLink:1,IEFix:ieFix},
143-
function(data){
144-
$('#pubList').html(data);
145-
},"html");
145+
const ieFix = new Date().getTime();
146+
$.get('${webContext}/RAjaxPublicationsListServlet', {
147+
ComponentId: CompoId,
148+
Id: topicId,
149+
attachmentLink: 1,
150+
IEFix: ieFix
151+
}, function(data) {
152+
$('#pubList').html(data);
153+
}, "html");
146154
}
147155
148-
149-
150156
function displayHomeMessage(){
151-
document.getElementById('pubList').innerHTML = '<p align="center" ><%=message.getString("storageFile.home.title")%></p> <p align="center"> <br><br><%=message.getString("storageFile.home.description")%> ';
157+
document.getElementById('pubList').innerHTML =
158+
'<p align="center" ><fmt:message key="storageFile.home.title"/></p>' +
159+
'<p align="center"><br><br><fmt:message key="storageFile.home.description"/> ';
152160
}
153161
154162
function selectAttachment(url,img,label){
@@ -162,33 +170,31 @@ function selectAttachment(url,img,label){
162170
163171
</script>
164172

165-
</head>
166-
<body class="yui-skin-sam">
167-
168-
<table class="dimensionTable">
169-
<tr valign="top">
170-
<td class="firstTd">
171-
<div id="treeDiv1" class="treeDivDisplay"></div>
172-
</td>
173-
<td class="secondTd">
174-
<div id="pubList" class="publistDisplay">
175-
<p align="center"><%=message.getString("storageFile.home.title")%></p>
176-
<p align="center"><br>
177-
<br><%=message.getString("storageFile.home.description")%></p>
178-
</div>
179-
<div align="center">
180-
<%
181-
Window window = gef.getWindow();
182-
Frame frame = gef.getFrame();
183-
ButtonPane buttonPane = gef.getButtonPane();
184-
Button button = gef.getFormButton(message.getString("Close"),
185-
"javascript:onClick=returnHtmlEditor()", false);
186-
buttonPane.addButton(button);
187-
out.println("<center><br>" + buttonPane.print() + "</center>");
188-
%>
189-
</div>
190-
</td>
191-
</tr>
192-
</table>
193-
</body>
194-
</html>
173+
</view:sp-head-part>
174+
<view:sp-body-part cssClass="yui-skin-sam">
175+
176+
<table class="dimensionTable">
177+
<th></th>
178+
<tr style="vertical-align: top">
179+
<td class="firstTd">
180+
<div id="treeDiv1" class="treeDivDisplay"></div>
181+
</td>
182+
<td class="secondTd">
183+
<div id="pubList" class="publistDisplay">
184+
<p style="text-align: center"><fmt:message key="storageFile.home.title"/></p>
185+
<p style="text-align: center"><br><br>
186+
<fmt:message key="storageFile.home.description"/>
187+
</p>
188+
</div>
189+
<div style="text-align: center">
190+
<view:buttonPane>
191+
<view:button label="${closeLabel}"
192+
action="javascript:onClick=returnHtmlEditor()"/>
193+
</view:buttonPane>
194+
</div>
195+
</td>
196+
</tr>
197+
</table>
198+
199+
</view:sp-body-part>
200+
</view:sp-page>

0 commit comments

Comments
 (0)