Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
efbf85ee
Commit
efbf85ee
authored
Mar 30, 2016
by
Matija Obreza
Browse files
/1/ GUI
parent
f24071a6
Changes
9
Hide whitespace changes
Inline
Side-by-side
Gruntfile.js
View file @
efbf85ee
...
...
@@ -153,7 +153,25 @@ module.exports = function(grunt) {
cwd
:
'
bower_components/webfont-notosans/regular/
'
,
src
:
'
*
'
,
dest
:
'
<%= app.dist1 %>/styles/fonts
'
},
/* {
},
{
// tinyMCE
expand
:
true
,
cwd
:
'
bower_components/tinymce/skins
'
,
src
:
[
'
**
'
],
dest
:
'
<%= app.dist1 %>/js/skins
'
},
{
// leaflet
expand
:
true
,
cwd
:
'
bower_components/leaflet/dist/
'
,
src
:
[
'
leaflet.css
'
,
'
images/*.png
'
],
dest
:
'
<%= app.dist1 %>/styles
'
},
{
// simplecolorpicker
expand
:
true
,
cwd
:
'
bower_components/jquery-simplecolorpicker/
'
,
src
:
[
'
jquery.simplecolorpicker.css
'
,
'
jquery.simplecolorpicker-regularfont.css
'
],
dest
:
'
<%= app.dist1 %>/styles
'
},
/* {
expand : true,
cwd : 'bower_components/jquery-ui/themes/base/',
src : [ 'jquery-ui.css' ],
...
...
@@ -288,10 +306,12 @@ module.exports = function(grunt) {
dist1
:
{
files
:
{
'
<%= app.dist1 %>/styles/bootstrap.min.css
'
:
[
'
<%= app.dist1 %>/styles/bootstrap.css
'
],
'
<%= app.dist1 %>/styles/other.min.css
'
:
[
'
<%= app.dist1 %>/styles/forza.css
'
],
'
<%= app.dist1 %>/styles/other.min.css
'
:
[
'
<%= app.dist1 %>/styles/forza.css
'
,
'
<%= app.dist1 %>/styles/leaflet.css
'
,
'
<%= app.dist1 %>/styles/jquery.simplecolorpicker.css
'
,
'
<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css
'
],
'
<%= app.dist1 %>/styles/genesys.min.css
'
:
[
'
<%= app.dist1 %>/styles/genesys.css
'
],
'
<%= app.dist1 %>/styles/all.min.css
'
:
[
'
<%= app.dist1 %>/styles/bootstrap.css
'
,
'
<%= app.dist1 %>/styles/forza.css
'
,
'
<%= app.dist1 %>/styles/forza.css
'
,
'
<%= app.dist1 %>/styles/leaflet.css
'
,
'
<%= app.dist1 %>/styles/jquery.simplecolorpicker.css
'
,
'
<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css
'
,
'
<%= app.dist1 %>/styles/genesys.css
'
],
}
}
...
...
pom.xml
View file @
efbf85ee
...
...
@@ -663,7 +663,7 @@
<doctype>
book
</doctype>
<sourceHighlighter>
coderay
</sourceHighlighter>
<attributes>
<stylesheet>
${basedir}/src/main/webapp/html/
0
/styles/ascii-doc.css
</stylesheet>
<stylesheet>
${basedir}/src/main/webapp/html/
1
/styles/ascii-doc.css
</stylesheet>
<copycss>
true
</copycss>
<!-- <linkcss /> -->
<toc>
left
</toc>
...
...
src/main/resources/spring/spring.properties
View file @
efbf85ee
...
...
@@ -28,7 +28,7 @@ db.url=jdbc:mysql://localhost/genesys20150630?useUnicode=true&characterEncoding=
db.driverClassName
=
com.mysql.jdbc.Driver
db.username
=
root
db.password
=
db.showSql
=
fals
e
db.showSql
=
tru
e
db.hbm2ddl
=
true
hibernate.dialect
=
org.hibernate.dialect.MySQL5InnoDBDialect
...
...
src/main/sourceapp/1/styles/ascii-doc.scss
View file @
efbf85ee
...
...
@@ -111,10 +111,6 @@ body.toc2.toc-right #toc.toc2 {
padding-right
:
0
;
}
#toc
.toc2
{
width
:
20em
;
}
#toc
.toc2
#toctitle
{
font-size
:
1
.375em
;
}
...
...
src/main/sourceapp/1/styles/genesys.scss
View file @
efbf85ee
...
...
@@ -35,6 +35,17 @@ body {
font-family
:
FontAwesome
;
}
div
[
x-href
]
{
cursor
:
pointer
;
}
/** Custom .container for narrow content */
.container
{
margin
:
0
;
padding
:
0
;
background-color
:
#e0e0e0
;
}
#content-header
{
#admin-menu
a
{
display
:
block
;
...
...
@@ -112,6 +123,14 @@ footer {
}
}
.padding10
{
padding
:
10px
;
}
.white-background
{
background-color
:
White
;
}
h1
.page-title
{
background-color
:
rgb
(
136
,
186
,
66
);
...
...
@@ -225,3 +244,232 @@ ul.funny-list {
margin-left
:
1em
;
}
}
/** Map */
.gis-map
{
width
:
100%
;
height
:
300px
;
margin-top
:
1em
;
}
.gis-map-square
{
height
:
600px
;
}
/** Articles & Docs */
.article
{
.right-side
{
background-color
:
#fff
;
padding
:
32px
30px
;
}
.sidebar-nav
{
ul
{
margin
:
38px
0
0
15px
;
li
a
{
font-size
:
120%
;
color
:
#006db4
;
padding
:
10px
0
10px
;
display
:
block
;
}
}
}
}
/** Intro page */
#content
.entry-page
.row.no-space
{
/*margin-left: 0;
margin-right: 0;*/
>
div
{
padding-left
:
0
;
padding-right
:
0
;
}
}
.entry-page
.row.intro
{
.intro-image
{
height
:
300px
;
overflow
:
hidden
;
img
{
min-height
:
300px
;
width
:
100%
;
}
}
.intro-text
{
height
:
300px
;
padding
:
20px
;
font-size
:
110%
;
background-color
:
#88ba42
;
color
:
White
;
h1
{
margin-top
:
10px
;
margin-bottom
:
20px
;
font-size
:
28px
;
color
:
white
;
text-transform
:
none
;
em
{
font-weight
:
normal
;
font-style
:
normal
;
}
}
.btn-default
,
.btn-default
:focus
,
,
.btn-default
:active
{
color
:
White
;
border-color
:
White
;
background-color
:
transparent
;
text-transform
:
uppercase
;
@media
(
min-width
:
767px
)
{
position
:
absolute
;
bottom
:
20px
;
}
}
@media
(
max-width
:
767px
)
{
height
:
auto
;
}
}
}
.entry-page
{
#content-body-content
.row
{
margin-bottom
:
15px
;
}
/** Entry page: See also */
div
.see-also-block
{
min-height
:
200px
;
height
:
200px
;
position
:
relative
;
background-size
:
cover
;
/*contain*/
background-repeat
:
no-repeat
;
background-position
:
top
center
;
div
.content
{
position
:
absolute
;
bottom
:
0
;
z-index
:
20
;
width
:
100%
;
div
.body
{
min-height
:
80px
;
}
}
}
#stats
{
background-color
:
#C8C8C8
;
height
:
300px
;
}
#globalmap
.gis-map
{
height
:
300px
;
margin-top
:
0
;
background-image
:
url("/html/0/images/mapshot.png")
;
background-repeat
:
no-repeat
;
background-size
:
cover
;
background-position
:
center
;
}
.tab-content
{
background
:
#fff
;
}
h2
{
background
:
#88ba42
;
color
:
#fff
;
font-size
:
14px
;
font-weight
:
bold
;
margin
:
0
;
padding
:
10px
;
text-transform
:
uppercase
;
&
.short
{
width
:
auto
;
display
:
inline-block
;
padding-right
:
40px
;
}
}
#crop-list-dropdown
,
#crop-list
{
background-color
:
#d7d5cf
;
}
#crop-list
{
.all-crops
{
font-weight
:
bold
;
}
a
{
&
:hover
,
&
:active
{
font-weight
:
bold
;
background-color
:
#cfcdc7
;
}
}
}
#right-col
{
.content-block
{
margin-bottom
:
15px
;
}
.blurp
{
padding
:
5px
;
background-color
:
White
;
}
}
.all-posts
{
padding
:
10px
;
}
.post
{
padding-bottom
:
30px
;
.post-head
{
display
:
table
;
}
.user-icon
{
display
:
table-cell
;
width
:
37px
;
vertical-align
:
middle
;
}
.post-head-content
{
display
:
table-cell
;
vertical-align
:
middle
;
font-weight
:
bold
;
font-size
:
120%
;
padding
:
0
0
0
15px
;
html
[
dir
=
"rtl"
]
&
{
padding
:
0
15px
0
0px
;
}
>
p
{
margin
:
0
;
}
}
.post-content
{
/*background: #e7e5df;
border: 1px solid #d2d0cb;
margin: 10px 10px 0 50px;*/
padding
:
10px
0
;
}
.post-actions
{
/*margin: 10px 0 10px 55px;*/
font-size
:
80%
;
}
}
#show-moar-news
{
width
:
100%
;
display
:
block
;
color
:
White
;
background-color
:
#BBB
;
border
:
solid
1px
#999
;
text-align
:
center
;
padding
:
10px
;
}
}
src/main/webapp/WEB-INF/decorator/1/menu.jsp
View file @
efbf85ee
...
...
@@ -83,6 +83,14 @@
<spring:message
code=
"menu.institutes"
/>
</a>
</li>
<li>
<a
href=
"
<c:url
value=
"/1/sel/"
/>
"
>
<spring:message
code=
"menu.my-list"
/>
<span
class=
"badge"
x-size=
"${selection.size() gt 0 ? selection.size() : '0'}"
id=
"selcounter"
>
${selection.size() gt 0 ? selection.size() : '0'}
</span>
</a>
</li>
<%--<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Dropdown
...
...
@@ -218,4 +226,10 @@
</div>
<!--/.nav-collapse -->
</div>
</nav>
\ No newline at end of file
</nav>
<form
id=
"logoutForm"
action=
"/logout"
method=
"post"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
</form>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/1/content/article.jsp
0 → 100644
View file @
efbf85ee
<!DOCTYPE html>
<%@include
file=
"/WEB-INF/jsp/init.jsp"
%>
<html>
<head>
<title>
${title}
</title>
<local:content
-headers description="${jspHelper.htmlToText(article.summary, 150)}" title="${title}"
/>
</head>
<body>
<content
tag=
"header"
>
<div
class=
"hidden-xs top-image"
>
<img
src=
"
<c:url
value=
"/html/0/images/aim/banner-${jspHelper.randomInt(1, 4)}.jpg"
/>
"
title=
"${title}"
/>
</div>
<div
class=
""
>
<div
class=
"banner-
<c:out
value=
"
${
article
.
slug
}
"
/>
"
></div>
<c:if
test=
"
${
title
ne
''
}
"
>
<div
class=
""
>
<security:authorize
access=
"hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')"
>
<form
class=
"inline-form pull-right"
method=
"post"
action=
"
<c:url
value=
"/content/transifex"
/>
"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<input
id=
"articleSlug"
type=
"hidden"
name=
"slug"
value=
"${article.slug eq "
blurp
"?
"".
concat
(
article.classPk.shortName
).
concat
("
-
").
concat
(
article.targetId
)
:
article.slug
}"
/>
<c:choose>
<c:when
test=
"
${
article
.
targetId
ne
null
}
"
>
<a
class=
"btn btn-default"
href=
"
<c:url
value=
"/content/edit/${article.slug}/${article.classPk.shortName}/${article.targetId}/${article.lang}"
/>
"
><spring:message
code=
"edit"
/></a>
</c:when>
<c:otherwise>
<a
class=
"btn btn-default"
href=
"
<c:url
value=
"/content/edit/${article.slug}/${article.lang}"
/>
"
><spring:message
code=
"edit"
/></a>
</c:otherwise>
</c:choose>
<input
type=
"submit"
name=
"fetch-all"
class=
"btn btn-default"
value=
"
<spring:message
code=
"article.fetch-from-transifex"
/>
"
/>
</form>
</security:authorize>
</div>
</c:if>
</div>
</content>
<h1>
<c:out
value=
"
${
title
}
"
escapeXml=
"false"
/>
</h1>
<c:if
test=
"
${
article
.
lang
!=
pageContext
.
response
.
locale
.
language
}
"
>
<%@include
file=
"/WEB-INF/jsp/not-translated.jsp"
%>
</c:if>
<%@include
file=
"/WEB-INF/jsp/content/transifex-responses.jsp"
%>
<div
class=
"article"
>
<div
class=
"right-side main-col col-md-9"
>
<div
class=
"free-text"
dir=
"${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}"
>
<c:out
value=
"
${
article
.
body
}
"
escapeXml=
"false"
/>
</div>
<div
class=
"article-timestamp"
>
<local:prettyTime
date=
"
${
article
.
postDate
.
time
}
"
locale=
"
${
pageContext
.
response
.
locale
}
"
/>
</div>
<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>
--%>
<li
class=
"twitter"
>
<local:tweet
text=
"
${
article
.
title
}
"
hashTags=
"GenesysPGR"
/>
</li>
<li
class=
"linkedin"
>
<local:linkedin
-share text="${article.title}" summary="${article.body}"
/>
</li>
</ul>
</div>
<%-- <div class="see-also">
<h3>
<span>
<spring:message code="heading.see-also" />
</span>
</h3>
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/0/images/pic_news_1.png" />')">
<h2>History of Genesys</h2>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/0/images/pic_news_1.png" />')">
<h2>How to use Genesys</h2>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/0/images/pic_news_1.png" />')">
<h2>About Genesys Data 123 </h2>
</div>
</div>
</div>
</div> --%>
</div>
<div
class=
"col-md-3 sidebar-nav col-xs-12"
>
<cms:menu
key=
"
${
menu
.
key
}
"
items=
"
${
menu
.
items
}
"
/>
</div>
</div>
<content
tag=
"javascript"
>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
()
{
$
(
'
a[href="
'
+
window
.
location
.
pathname
+
'
"]
'
).
parent
().
addClass
(
'
active-link
'
);
});
</script>
</content>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/1/content/ascii-doc.jsp
0 → 100644
View file @
efbf85ee
<!DOCTYPE html>
<%@include
file=
"/WEB-INF/jsp/init.jsp"
%>
<html>
<head>
<c:out
value=
"
${
head
}
"
escapeXml=
"false"
/>
<title>
${title}
</title>
</head>
<body>
<content
tag=
"header"
>
<div
class=
"hidden-xs top-image"
>
<img
src=
"
<c:url
value=
"/html/0/images/aim/banner-${jspHelper.randomInt(1, 4)}.jpg"
/>
"
title=
"${title}"
/>
</div>
</content>
<h1>
<c:out
value=
"
${
title
}
"
escapeXml=
"false"
/>
</h1>
<div
class=
"article"
>
<div
class=
"right-side main-col col-md-9"
>
<div
class=
"free-text"
>
<c:out
value=
"
${
bodyHeader
}
"
escapeXml=
"false"
/>
<c:out
value=
"
${
bodyContent
}
"
escapeXml=
"false"
/>
<c:out
value=
"
${
bodyFooter
}
"
escapeXml=
"false"
/>
</div>
</div>
<div
class=
"col-md-3 col-xs-12"
>
<c:out
value=
"
${
menu
}
"
escapeXml=
"false"
/>
</div>
</div>
<content
tag=
"javascript"
>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
()
{
$
(
'
a[href="
'
+
window
.
location
.
pathname
+
'
"]
'
).
parent
().
addClass
(
'
active-link
'
);
});
</script>
</content>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/1/index.jsp
0 → 100644
View file @
efbf85ee
<!DOCTYPE html>
<%@include
file=
"/WEB-INF/jsp/init.jsp"
%>
<%@ taglib
prefix=
"sec"
uri=
"http://www.springframework.org/security/tags"
%>
<html>
<head>
<title><spring:message
code=
"page.home.title"
/></title>
</head>
<body
class=
"entry-page"
>
<div
class=
"row no-space intro"
>
<div
class=
"hidden-xs col-sm-6"
>
<div
class=
"intro-image"
>
<img
src=
"
<c:url
value=
"/html/0/images/aim/svalbard.jpg"
/>
"
/>
</div>
</div>
<div
class=
"col-xs-12 col-sm-6"
>
<div
class=
"intro-text"
>
<c:if
test=
"
${
welcomeBlurp
ne
null
}
"
>
<div
class=
""
>
<c:set
var=
"blurp"
value=
"
${
welcomeBlurp
}
"
/>
<%@include
file=
"/WEB-INF/jsp/content/include/blurp-display.jsp"
%>
<c:remove
var=
"blurp"
/>
<a
class=
"btn btn-default"
href=
"
<c:url
value=
"/content/about/about"
/>
"
><spring:message
code=
"welcome.read-more"
/></a>
</div>
</c:if>
</div>
</div>
</div>
<div
class=
"row no-space"
>
<div
id=
"stats"
class=
"col-sm-4"
>
<h2
class=
"short"
>
<spring:message
code=
"maps.accession-map"
/>
</h2>
<div
class=
"stats-map padding10"
>
<p><spring:message
code=
"maps.accession-map.intro"
/></p>
<div
class=
"all-stats"
>
<%-- <div class="one-stat"><a href="<c:url value="/geo/" />"><spring:message code="stats.number-of-countries" arguments="${numberOfCountries}" /></a></div> --%>
<div
class=
"one-stat"
>
<a
href=
"
<c:url
value=
"/explore"
/>
"
>
<spring:message
code=
"stats.number-of-accessions"
arguments=
"
${
numberOfActiveAccessions
}
"
/>
</a>
</div>
<%-- <div class="one-stat">
<a href="<c:url value="/explore"><c:param name="filter" value='{"historic":[true]}' /></c:url>">
<spring:message code="stats.number-of-historic-accessions" arguments="${numberOfHistoricAccessions}" />
</a>
</div> --%>
<div
class=
"one-stat"
>
<a
href=
"
<c:url
value=
"/wiews/active"
/>
"
>
<spring:message
code=
"stats.number-of-institutes"
arguments=
"
${
numberOfInstitutes
}
"
/>
</a>
</div>
</div>
</div>
</div>
<div
class=
"col-sm-8"
>
<%-- <h2>
<spring:message code="maps.accession-map" />
</h2> --%>
<div
class=
""
>
<div
id=
"globalmap"
x-href=
"
<c:url
value=
"/explore/map"
/>
"
class=
"gis-map"
></div>
</div>
</div>
</div>
<div
class=
"hidden-xs row see-also-row"
>
<div
class=
"col-sm-4"
>
<div
class=
"see-also-block"
style=
"background-image: url('
<c:url
value=
"/html/0/images/aim/three-1.jpg"
/>
')"
>
<div
class=
"content"
>
<h2
class=
"short"
>