Commit d2298412 authored by Matija Obreza's avatar Matija Obreza
Browse files

Views

parent 6a3bdf93
......@@ -62,10 +62,10 @@ public class HtmlController extends BaseController {
@RequestMapping("/")
public String welcome() {
return "redirect:/index.html";
return "redirect:/welcome";
}
@RequestMapping(value = "index.html")
@RequestMapping(value = "welcome")
public String index(ModelMap model) {
List<Permissions> permissionsList = Arrays.asList(Permissions.values());
model.addAttribute("permissionsList", permissionsList);
......
......@@ -29,9 +29,9 @@ sample.error.not.unique.name=Name {0} must be unique
sample.error.not.unique.email=Email {0} must be unique
#Messages
sample.message.index.title=Welcome
sample.message.index.title=Welcome to this service\!
sample.message.login.title=Login page
sample.message.welcome=Welcome
sample.message.welcome=Welcome to Genesys
sample.message.change.locale=Change locale
sample.message.locale.en=English
sample.message.locale.ru=Russian
......
<!DOCTYPE html>
<%@include file="../init.jsp"%>
<%@include file="/WEB-INF/jsp/init.jsp"%>
<html>
<head>
<%@include file="../head-init.jsp"%>
<title><spring:message code="sample.message.index.title" /></title>
<link type="text/css" href="/html/css/jquery-ui.css" rel="stylesheet" />
<link type="text/css" href="/html/css/jquery.dataTables.css" rel="stylesheet" />
<%--Fallback for older browsers--%>
<script type="text/javascript" src="/html/js/json2.js"></script>
<script type="text/javascript" src="/html/js/globalize.js"></script>
<script type="text/javascript" src="/html/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/html/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="/html/js/handlebars.js"></script>
<script type="text/javascript" src="/html/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/html/js/main.js"></script>
</head>
<body>
<div class="container">
<div id="header">
<div class="page-header clearfix">
<h4 class="pull-left">
<spring:message code="sample.message.welcome" />
</h4>
<div class="navbar pull-right">
<div class="nav-collapse">
<ul class="nav">
<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" title="<spring:message code="sample.message.change.locale"/>"> <spring:message code="sample.message.current.locale" /> <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="?lang=en"><spring:message code="sample.message.locale.en" /></a></li>
<li><a href="?lang=ru"><spring:message code="sample.message.locale.ru" /></a></li>
</ul></li>
</ul>
</div>
</div>
</div>
</div>
<div id="content">
<div class="page-header">
<a id="show-users" href="#" class="btn">Users</a>
</div>
<div id="dialog"></div>
<p>Showing data now!</p>
<a href="..">Go back!</a>
<h3>
<a href="/data/view/${dataset.id}"><c:out value="${dataset.name}" /></a>
</h3>
<p>
<fmt:formatNumber value="${entrySize}" /> Entries in this dataset.
<fmt:formatNumber value="${dataSize}" /> Data points in this dataset.
</p>
<p>
<c:out value="${descriptors.size()}" /> distinct Descriptors in this dataset.
</p>
<table>
<c:forEach items="${descriptors}" var="descriptor">
<tr>
<td><c:out value="${descriptor.title}" /></td>
<td><c:out value="${descriptor.code}" /></td>
<td><c:out value="${descriptor.description}" /></td>
</tr>
</c:forEach>
</table>
<p>
<c:out value="${dataset.source}" />
</p>
<p>
<fmt:formatDate value="${dataset.uploadDate}" />
</p>
<div>
<c:out value="${dataset.description}" escapeXml="false" />
</div>
</div>
<h3>
<a href="/data/view/${dataset.id}"><c:out value="${dataset.name}" /></a>
</h3>
<p>
<fmt:formatNumber value="${entrySize}" />
Entries in this dataset.
<fmt:formatNumber value="${dataSize}" />
Data points in this dataset.
</p>
<p>
<c:out value="${descriptors.size()}" />
distinct Descriptors in this dataset.
</p>
<table>
<c:forEach items="${descriptors}" var="descriptor">
<tr>
<td><c:out value="${descriptor.title}" /></td>
<td><c:out value="${descriptor.code}" /></td>
<td><c:out value="${descriptor.description}" /></td>
</tr>
</c:forEach>
</table>
<p>
<c:out value="${dataset.source}" />
</p>
<p>
<fmt:formatDate value="${dataset.uploadDate}" />
</p>
<div>
<c:out value="${dataset.description}" escapeXml="false" />
</div>
</body>
</html>
\ No newline at end of file
......@@ -5,34 +5,8 @@
<html>
<head>
<title><spring:message code="sample.message.index.title"/></title>
<%@include file="handelbars-scripts.jsp" %>
<script type="">
//Actions dockbar for data-table
var mRenderFn = Handlebars.compile($("#editLink").html());
//setup locales
Globalize.addCultureInfo("<c:out value="${locale}" default="en"/>", {
messages: {
"sample.js.message.confirm.deleting": "<spring:message code="sample.js.message.confirm.deleting"/>",
"sample.js.error.delete": "<spring:message code="sample.js.error.delete"/>",
"sample.js.error.retrieve": "<spring:message code="sample.js.error.retrieve"/>",
"sample.js.error.update": "<spring:message code="sample.js.error.update"/>"
}
});
</script>
<%@include file="index-user-js.jsp"%>
</head>
<body>
<table id="jqTable" class="table table-bordered table-striped"></table>
<%--<security:authorize access="hasAnyRole('ADMINISTRATOR,,NETWORK_ADMINISTRATOR')">--%>
<div>
<input type="button" value="<spring:message code="sample.message.add"/>" class="edit btn" data-id="0">
</div>
<%--</security:authorize>--%>
</body>
</html>
\ No newline at end of file
......@@ -20,6 +20,14 @@
color: #fff;
}
table {
font-size: 12px;
}
h1, h2, h3, h4 {
}
td {
vertical-align: top;
padding: 0.2em 0.5em;
}
\ No newline at end of file
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