Commit 689005cf authored by Matija Obreza's avatar Matija Obreza
Browse files

Minor fixes: JSP formatted, article editing

parent 3d20b91f
......@@ -357,9 +357,9 @@ html[dir="rtl"] #content{
}
}
@media (max-width: 992px) {
html[dir="rtl"] .navbar-nav > li {
/* html[dir="rtl"] .navbar-nav > li {
float: none;
}
} */
html[dir="rtl"] .container.network .header-info.row {
.middle-block{
margin-right: 0;
......
......@@ -5,7 +5,7 @@
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:schema="http://schema.org/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dwc="http://rs.tdwg.org/dwc/terms/"
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#"
xmlns:germplasmType="http://purl.org/germplasm/germplasmType#"
......@@ -54,26 +54,26 @@
<body>
<div class="site-wrapper">
<security:authentication var="user" property="principal" />
<security:authentication var="user" property="principal" />
<%@include file="header.jsp" %>
<%@include file="menu.jsp" %>
<div id="content" class="clearfix">
<div id="content-header">
<sitemesh:write property="page.header" />
</div>
<div class="container">
<div id="dialog"></div>
<div class="clearfix" typeof="<sitemesh:write property="body.typeof" />">
<sitemesh:write property="body" />
<%@include file="header.jsp"%>
<%@include file="menu.jsp"%>
<div id="content" class="clearfix">
<div id="content-header">
<sitemesh:write property="page.header" />
</div>
<div class="container">
<div id="dialog"></div>
<div class="clearfix" typeof="<sitemesh:write property="body.typeof" />">
<sitemesh:write property="body" />
</div>
</div>
</div>
</div>
</div>
<%@include file="footer.jsp" %>
<%@include file="footer.jsp"%>
<sitemesh:write property="page.javascript" />
<%@include file="ga.jsp" %>
<%@include file="ga.jsp"%>
</body>
</html>
......@@ -8,6 +8,7 @@
<title>${title}</title>
</head>
<body>
<div class="main-col">
<h1>
<spring:message code="article.edit-article"/>
</h1>
......@@ -73,6 +74,7 @@
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
</form>
</div>
<content tag="javascript">
<script type="text/javascript">
......
......@@ -7,34 +7,37 @@
<title>${title}</title>
</head>
<body>
<content tag="header">
<div class="top-title">
<div class="banner-<c:out value="${article.slug}" />"></div>
<c:if test="${title ne ''}">
<div class="container">
<h1><c:out value="${title}" escapeXml="false"/></h1>
</div>
</c:if>
</div>
</content>
<content tag="header">
<div class="top-title">
<div class="banner-<c:out value="${article.slug}" />"></div>
<c:if test="${title ne ''}">
<div class="container">
<h1>
<c:out value="${title}" escapeXml="false" />
</h1>
</div>
</c:if>
</div>
</content>
<c:if test="${article.lang != pageContext.response.locale.language}">
<%@include file="/WEB-INF/jsp/not-translated.jsp" %>
<%@include file="/WEB-INF/jsp/not-translated.jsp"%>
</c:if>
<div class="article" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}">
<div class="right-side main-col col-md-9">
<security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
<a href="<c:url value="/content/${article.slug}/edit" />" class="close">
<spring:message code="edit"/>
</a>
<a href="<c:url value="/content/${article.slug}/edit#raw" />" class="close">
<spring:message code="edit"/>
</a> </security:authorize>
<c:out value="${article.body}" escapeXml="false"/>
<%-- <div class="share-article">
<div class="right-side main-col col-md-9">
<security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
<a href="<c:url value="/content/${article.slug}/edit" />" class="close">
<spring:message code="edit" />
</a>
<a href="<c:url value="/content/${article.slug}/edit#raw" />" class="close">
<spring:message code="edit" />
</a>
</security:authorize>
<c:out value="${article.body}" escapeXml="false" />
<%-- <div class="share-article">
<p><spring:message code="article.share" /></p>
<ul class="list-inline">
<li class="envelope"><a href=""><i class="fa fa-envelope-o"></i></a></li>
......@@ -43,7 +46,7 @@
</ul>
</div> --%>
<!-- <div class="see-also">
<!-- <div class="see-also">
<h3><span>see also</span></h3>
<div class="three-see-also clearfix">
<div class="three-1">
......@@ -58,37 +61,43 @@
</div>
</div> -->
</div>
<c:if test="${article.slug == 'disclaimer'}" >
<div class="col-md-3 sidebar-nav col-xs-12">
<ul class="list-unstyled">
<li><a href="<c:url value="/content/disclaimer" />"><spring:message code="menu.disclaimer" /></a></li>
<li><a href="<c:url value="/content/terms" />"><spring:message code="menu.terms" /></a></li>
<li><a href="<c:url value="/content/copying" />"><spring:message code="menu.copying" /></a></li>
<li><a href="<c:url value="/content/privacy" />"><spring:message code="menu.privacy" /></a></li>
</ul>
</div>
</c:if>
<c:if test="${article.slug == 'about'}">
<div class="col-md-3 sidebar-nav col-xs-12">
<ul class="list-unstyled">
<li><a href="<c:url value="/content/about" />" rel="nofollow"><spring:message code="menu.about" /></a></li>
<li><a href="<c:url value="/content/contact" />" rel="nofollow"><spring:message code="menu.contact" /></a></li>
<li><a href="" rel="nofollow">WHO USES GENESYS?</a></li>
<li><a href="" rel="nofollow">HOW TO USE GENESYS?</a></li>
<li><a href="" rel="nofollow">HISTORY OF GENESYS</a></li>
<li><a href="" rel="nofollow">ABOUT GENESYS DATA</a></li>
<li><a href="<c:url value="/wiews/" />" rel="nofollow">GENESYS NEWTORK</a></li>
<li><a href="<c:url value="/wiews/active" />" rel="nofollow">GENESYS NEWS</a></li>
<li><a href="<c:url value="/profile/${user.username}" />" rel="nofollow">MY GENESYS</a></li>
<li><a href="<c:url value="/content/contact" />" rel="nofollow">CONTACT US</a></li>
</ul>
</div>
</c:if>
</div>
<div class="col-md-3 sidebar-nav col-xs-12">
<ul class="list-unstyled">
<li>
<a href="<c:url value="/content/disclaimer" />">
<spring:message code="menu.disclaimer" />
</a>
</li>
<li>
<a href="<c:url value="/content/terms" />">
<spring:message code="menu.terms" />
</a>
</li>
<li>
<a href="<c:url value="/content/copying" />">
<spring:message code="menu.copying" />
</a>
</li>
<li>
<a href="<c:url value="/content/privacy" />">
<spring:message code="menu.privacy" />
</a>
</li>
<li>
<a href="<c:url value="/content/about" />" rel="nofollow">
<spring:message code="menu.about" />
</a>
</li>
<li>
<a href="<c:url value="/content/contact" />" rel="nofollow">
<spring:message code="menu.contact" />
</a>
</li>
</ul>
</div>
</div>
</body>
</html>
\ No newline at end of file
......@@ -19,7 +19,7 @@
<content-processor>
<tag-rule-bundle class="org.genesys2.sitemesh3.ContentTagRuleBundle" />
</content-processor>
<mime-type>text/html</mime-type>
<mapping path="/welcome" decorator="/WEB-INF/decorator/entry.jsp" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment