Skip to content

Commit

Permalink
[BUGFIX] Fix deprecated semi-colons in jsp imports
Browse files Browse the repository at this point in the history
  • Loading branch information
buschettu committed Dec 1, 2015
1 parent f4985ff commit 9bbefa6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion webroot/WEB-INF/jsp/contents/guests_form.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<jsp:include page="../templates/guest.mustache.jsp"/>

<%@ page import="java.util.Locale"%>
<%@ page import="com.opensymphony.xwork2.ActionContext;"%>
<%@ page import="com.opensymphony.xwork2.ActionContext"%>
<%@ taglib uri="/struts-tags" prefix="s"%>

<div id="ie_clearing">&nbsp;</div>
Expand Down
6 changes: 3 additions & 3 deletions webroot/WEB-INF/jsp/facilitiesJson.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
</head>
<body>
<%@ page import="net.sf.json.*" %>
<%@ page import="model.Facility;" %>
<%@ page import="model.Facility" %>
<%
Facility roomfac = (Facility) request.getAttribute("roomFacility");
//JSONUtil json = new JSONUtil();
//JSONUtil.serialize(roomfac);
JSONArray jsonArray = JSONArray.fromObject(roomfac);
System.out.println( jsonArray );
JSONArray jsonArray = JSONArray.fromObject(roomfac);
System.out.println( jsonArray );
%>
</body>
</html>
20 changes: 10 additions & 10 deletions webroot/WEB-INF/jsp/layout/footer.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ page import="java.util.Locale"%>
<%@ page import="com.opensymphony.xwork2.ActionContext;"%>
<%@ page import="com.opensymphony.xwork2.ActionContext"%>
<%@ taglib uri="/struts-tags" prefix="s"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<div id="ie_clearing">&nbsp;</div>
<!-- End: IE Column Clearing -->

<!-- begin: #footer -->
<div id="footer" role="contentinfo">
<img src="images/labos.png" id="labos" alt="Laboratorio Open Source" class="left" height="7%" width="20%"/>
<img src="images/sardegna_ricerche.png" alt="Sardegna Ricerche" class="left" height="7%" width="7%" />
<img src="images/european_union.png" id="eu" alt="European Union" class="right" height="7%" width="7%" />
<img src="images/repubblica.png" alt="Repubblica Italiana" class="right" height="7%" width="7%"/>
<img src="images/regione_sardegna.png" alt="Regione Autonoma della Sardegna" class="right" height="7%" width=7%/>
<img src="images/labos.png" id="labos" alt="Laboratorio Open Source" class="left" height="7%" width="20%"/>
<img src="images/sardegna_ricerche.png" alt="Sardegna Ricerche" class="left" height="7%" width="7%" />
<img src="images/european_union.png" id="eu" alt="European Union" class="right" height="7%" width="7%" />
<img src="images/repubblica.png" alt="Repubblica Italiana" class="right" height="7%" width="7%"/>
<img src="images/regione_sardegna.png" alt="Regione Autonoma della Sardegna" class="right" height="7%" width=7%/>
<span class="center"><s:text name="titleExtended"/><br/><br/><br/></span>
</div>
<!-- end: #footer -->
Expand Down Expand Up @@ -59,7 +59,7 @@
String lang ="en";
Locale locale = ActionContext.getContext().getLocale();
if (locale != null){
lang = locale.getLanguage();
}
%>
Expand All @@ -81,7 +81,7 @@ I18NSettings.language = '<s:property value="#request.locale.getLanguage()" />';
String dPageDefault = "planner";
String dPage = request.getParameter("sect");
dPage = (dPage == null) ? dPageDefault : dPage;
out.println("\n var section= \'" + dPage + "\';");
out.println("\n var section= \'" + dPage + "\';");
%>
var text_tab = $("#" + section).children("a").hide().text();
$("#" + section).addClass("active").prepend("<strong>" + text_tab + "</strong>");
Expand All @@ -102,7 +102,7 @@ I18NSettings.language = '<s:property value="#request.locale.getLanguage()" />';
width: 99% !important;
}
</style>
<![endif]-->
<![endif]-->

</body>
</html>

0 comments on commit 9bbefa6

Please sign in to comment.