Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
c6c5c567
Commit
c6c5c567
authored
Sep 24, 2013
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes for bootstrap3
parent
ef4ac611
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
100 additions
and
55 deletions
+100
-55
src/main/webapp/WEB-INF/decorator/entry.jsp
src/main/webapp/WEB-INF/decorator/entry.jsp
+5
-3
src/main/webapp/WEB-INF/decorator/main.jsp
src/main/webapp/WEB-INF/decorator/main.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/accession/details.jsp
src/main/webapp/WEB-INF/jsp/accession/details.jsp
+3
-3
src/main/webapp/WEB-INF/jsp/content/include/activity-post.jsp
...main/webapp/WEB-INF/jsp/content/include/activity-post.jsp
+3
-3
src/main/webapp/WEB-INF/jsp/country/details.jsp
src/main/webapp/WEB-INF/jsp/country/details.jsp
+12
-10
src/main/webapp/WEB-INF/jsp/filter/index.jsp
src/main/webapp/WEB-INF/jsp/filter/index.jsp
+2
-2
src/main/webapp/WEB-INF/jsp/index.jsp
src/main/webapp/WEB-INF/jsp/index.jsp
+2
-2
src/main/webapp/WEB-INF/jsp/login.jsp
src/main/webapp/WEB-INF/jsp/login.jsp
+19
-16
src/main/webapp/WEB-INF/jsp/metadata/view.jsp
src/main/webapp/WEB-INF/jsp/metadata/view.jsp
+3
-2
src/main/webapp/WEB-INF/jsp/search/index.jsp
src/main/webapp/WEB-INF/jsp/search/index.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/selection/index.jsp
src/main/webapp/WEB-INF/jsp/selection/index.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
+2
-2
src/main/webapp/html/css/custom.css
src/main/webapp/html/css/custom.css
+46
-9
No files found.
src/main/webapp/WEB-INF/decorator/entry.jsp
View file @
c6c5c567
...
...
@@ -80,9 +80,11 @@
<div
class=
"navbar pull-right"
>
<sec:authorize
access=
"isAnonymous()"
>
<div
style=
"line-height: 20px; padding: 10px 15px;"
>
<a
href=
"
<c:url
value=
"/login"
/>
"
>
Login
</a>
<%-- or <a href="<c:url value="/registration" />"><spring:message code="user.create-new-account" /></a> --%>
</div>
<ul
class=
"nav"
>
<li>
<a
href=
"
<c:url
value=
"/login"
/>
"
>
Login
</a>
<%-- or <a href="<c:url value="/registration" />"><spring:message code="user.create-new-account" /></a> --%>
</li>
</ul>
</sec:authorize>
<sec:authorize
access=
"isAuthenticated()"
>
<ul
class=
"nav"
>
...
...
src/main/webapp/WEB-INF/decorator/main.jsp
View file @
c6c5c567
...
...
@@ -55,7 +55,7 @@
<div
class=
"input-group"
>
<input
type=
"text"
name=
"q"
class=
"form-control"
placeholder=
"
<spring:message
code=
"search.input.placeholder"
/>
"
/>
<span
class=
"input-group-btn"
>
<button
type=
"submit"
class=
"btn
notimportant
"
><spring:message
code=
"search.button.label"
/></button>
<button
type=
"submit"
class=
"btn"
><spring:message
code=
"search.button.label"
/></button>
</span>
</div>
</form>
...
...
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
c6c5c567
...
...
@@ -20,19 +20,19 @@
</div>
<c:if
test=
"
${
accession
.
inTrust
eq
true
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"accession.inTrust.true"
/>
</div>
</c:if>
<c:if
test=
"
${
accession
.
inSvalbard
eq
true
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"accession.inSvalbard.true"
/>
</div>
</c:if>
<c:if
test=
"
${
accession
.
mlsStatus
eq
true
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"accession.mlsStatus.true"
/>
</div>
</c:if>
...
...
src/main/webapp/WEB-INF/jsp/content/include/activity-post.jsp
View file @
c6c5c567
...
...
@@ -2,14 +2,14 @@
<sec:authorize
access=
"hasRole('ADMINISTRATOR')"
>
<form
class=
"form-vertical
"
action=
"
<c:url
value=
"/content/activity/add-post-x"
/>
"
method=
"post"
>
<div
class=
"
control
-group"
>
<form
role=
"form"
class=
"
"
action=
"
<c:url
value=
"/content/activity/add-post-x"
/>
"
method=
"post"
>
<div
class=
"
form
-group"
>
<label
for=
"post-title"
class=
"control-label"
><spring:message
code=
"activitypost.post-title"
/></label>
<div
class=
"controls"
>
<input
type=
"text"
id=
"post-title"
name=
"title"
class=
"span9 required html-editor"
/>
</div>
</div>
<div
class=
"
control
-group"
>
<div
class=
"
form
-group"
>
<label
for=
"post-body"
class=
"control-label"
><spring:message
code=
"activitypost.post-body"
/></label>
<div
class=
"controls"
>
<textarea
id=
"post-body"
name=
"body"
class=
"span9 required html-editor"
></textarea>
...
...
src/main/webapp/WEB-INF/jsp/country/details.jsp
View file @
c6c5c567
...
...
@@ -13,30 +13,32 @@
</h1>
<c:if
test=
"
${
not
country
.
current
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"country.page.not-current"
/>
</div>
</c:if>
<
c:if
test=
"
${
blurp
ne
null
}
"
>
<
div
class=
"free-text
"
>
<
div
class=
"jumbotron
"
>
<
c:if
test=
"
${
blurp
ne
null
}
"
>
<c:out
value=
"
${
blurp
.
body
}
"
escapeXml=
"false"
/>
</c:if>
<div>
<spring:message
code=
"country.stat.countByOrigin"
arguments=
"
${
countByOrigin
}
"
/>
<c:if
test=
"
${
countByOrigin
gt
0
}
"
>
<a
href=
"
<c:url
value=
"/geo/${country.code3.toLowerCase()}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
</c:if>
</div>
</
c:if
>
</
div
>
<div>
ISO-3166 3-alpha:
<c:out
value=
"
${
country
.
code3
}
"
/><br
/>
ISO-3166 2-alpha:
<c:out
value=
"
${
country
.
code2
}
"
/>
</div>
<h3>
<%--
<h3>
<spring:message code="country.statistics" />
</h3>
<div>
<spring:message
code=
"country.stat.countByOrigin"
arguments=
"
${
countByOrigin
}
"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3.toLowerCase()}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
</div>
--%>
<h3>
<spring:message
code=
"country.stat.countByLocation"
arguments=
"
${
countByLocation
}
"
/>
</h3>
...
...
src/main/webapp/WEB-INF/jsp/filter/index.jsp
View file @
c6c5c567
...
...
@@ -18,13 +18,13 @@
<div
class=
"filter-values pull-left"
></div>
<c:choose>
<c:when
test=
"
${
filter
.
type
==
'NUMERIC'
}
"
>
<div
class=
"filter-new
pull-left"
>
Min:
<input
class=
"span1"
type=
"text"
/>
Max:
<input
class=
"span1"
type=
"text"
/>
<button
class=
"
notimportant"
>
+
</button></div>
<div
class=
"filter-new
form-group pull-left"
>
Min:
<input
class=
"span1 form-control"
type=
"text"
/>
Max:
<input
class=
"span1 form-control"
type=
"text"
/>
<button
class=
"btn
notimportant"
>
+
</button></div>
</c:when>
<%-- <c:when test="${filter.type=='BOOLEAN'}">
<div class="filter-new pull-left"><input type="checkbox" id="check.${filter.name}" /> <label for="check.${filter.name}">Yes</label> <button class="notimportant">+</button></div>
</c:when> --%>
<c:otherwise>
<div
class=
"filter-new
pull-left"
><input
class=
"span2"
type=
"text"
/><button
class=
"notimportant"
>
+
</butto
n></div>
<div
class=
"filter-new
form-group pull-left input-group"
><span
class=
"input-group-btn"
><input
class=
"span2 form-control"
type=
"text"
/><button
class=
"btn notimportant"
>
+
</button></spa
n></div>
</c:otherwise>
</c:choose>
</div>
...
...
src/main/webapp/WEB-INF/jsp/index.jsp
View file @
c6c5c567
...
...
@@ -14,7 +14,7 @@
<h1><spring:message
code=
"crop.croplist"
/></h1>
<sec:authorize
access=
"hasRole('ADMINISTRATOR')"
>
<form
method=
"post"
action=
"
<c:url
value=
"/c/rebuild"
/>
"
>
<input
type=
"submit"
value=
"Rebuild"
/>
<input
type=
"submit"
class=
"btn form-control"
value=
"Rebuild"
/>
</form>
</sec:authorize>
<ul
class=
"funny-list"
>
...
...
@@ -26,7 +26,7 @@
</div>
<c:if
test=
"
${
lastNews
ne
null
}
"
>
<div
class=
"content-block"
>
<div
class=
"content-block"
style=
"overflow: auto;"
>
<h1><spring:message
code=
"activity.recent-activity"
/></h1>
<%@include
file=
"/WEB-INF/jsp/content/include/activity-post.jsp"
%>
...
...
src/main/webapp/WEB-INF/jsp/login.jsp
View file @
c6c5c567
...
...
@@ -7,36 +7,39 @@
<title><spring:message
code=
"page.login"
/></title>
</head>
<body>
<h1><spring:message
code=
"page.login"
/></h1>
<c:if
test=
"
${
param
[
'error'
]
ne
null
}
"
>
<div
class=
"alert alert-error"
><spring:message
code=
"sample.error.wrong.credentials"
/></div>
</c:if>
<form
method=
"POST"
action=
"/login-attempt"
class=
"form-horizontal"
>
<div
class=
"
control
-group"
>
<label
for=
"j_username"
class=
"control-label"
><spring:message
code=
"sample.message.username"
/></label>
<div
class=
"co
ntrols
"
>
<input
type=
"text"
id=
"j_username"
name=
"j_username"
class=
"
span3
"
/>
<form
role=
"form"
method=
"POST"
action=
"/login-attempt"
class=
"form-horizontal"
>
<div
class=
"
form
-group"
>
<label
for=
"j_username"
class=
"co
l-lg-2 co
ntrol-label"
><spring:message
code=
"sample.message.username"
/></label>
<div
class=
"co
l-lg-3
"
>
<input
type=
"text"
id=
"j_username"
name=
"j_username"
class=
"
form-control
"
/>
</div>
</div>
<div
class=
"
control
-group"
>
<label
for=
"j_password"
class=
"control-label"
><spring:message
code=
"sample.message.password"
/></label>
<div
class=
"co
ntrols
"
>
<input
type=
"password"
id=
"j_password"
name=
"j_password"
class=
"
span3
"
/>
<div
class=
"
form
-group"
>
<label
for=
"j_password"
class=
"co
l-lg-2 co
ntrol-label"
><spring:message
code=
"sample.message.password"
/></label>
<div
class=
"co
l-lg-3
"
>
<input
type=
"password"
id=
"j_password"
name=
"j_password"
class=
"
form-control
"
/>
</div>
</div>
<div
class=
"
control
-group"
>
<div
class=
"co
ntrols
"
>
<label
class=
"
forCheckbox checkbox inline
"
for=
'_spring_security_remember_me'
>
<div
class=
"
form
-group"
>
<div
class=
"co
l-lg-offset-2 col-lg-3
"
>
<label
class=
""
for=
'_spring_security_remember_me'
>
<input
type=
'checkbox'
name=
'_spring_security_remember_me'
id=
'_spring_security_remember_me'
/>
Remember me
</label>
</div>
</div>
<div
class=
"form-actions clearfix"
>
<input
type=
"submit"
value=
"Login"
class=
"btn btn-primary"
/>
<a
href=
"registration"
id=
"registration"
class=
"btn"
><spring:message
code=
"sample.message.registration"
/></a>
<%--<a href="forgot-password" id="forgot-password" class="btn pull-right">Forgot password</a>--%>
<div
class=
"form-group"
>
<div
class=
"col-lg-offset-2 col-lg-3"
>
<input
type=
"submit"
value=
"Login"
class=
"btn btn-primary"
/>
<a
href=
"registration"
id=
"registration"
class=
"btn btn-default"
><spring:message
code=
"sample.message.registration"
/></a>
<%--<a href="forgot-password" id="forgot-password" class="btn pull-right">Forgot password</a>--%>
</div>
</div>
</form>
</body>
...
...
src/main/webapp/WEB-INF/jsp/metadata/view.jsp
View file @
c6c5c567
...
...
@@ -60,7 +60,8 @@
</div>
<table
class=
"accessions"
>
<div
class=
"table-responsive"
>
<table
class=
"accessions table wide-table"
>
<thead>
<tr>
<td
class=
"idx-col"
></td>
...
...
@@ -105,6 +106,6 @@
</c:forEach>
</tbody>
</table>
</div>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/search/index.jsp
View file @
c6c5c567
...
...
@@ -13,7 +13,7 @@
</form>
<c:if
test=
"
${
pagedData
.
totalElements
eq
0
}
"
>
<div
class=
"alert"
><spring:message
code=
"search.no-results"
/></div>
<div
class=
"alert
alert-info
"
><spring:message
code=
"search.no-results"
/></div>
</c:if>
<c:if
test=
"
${
pagedData
ne
null
and
pagedData
.
totalElements
gt
0
}
"
>
...
...
src/main/webapp/WEB-INF/jsp/selection/index.jsp
View file @
c6c5c567
...
...
@@ -12,7 +12,7 @@
</h1>
<c:if
test=
"
${
pagedData
==
null
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"selection.empty-list-warning"
/>
</div>
</c:if>
...
...
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @
c6c5c567
...
...
@@ -14,13 +14,13 @@
</h1>
<c:if
test=
"
${
countByInstitute
eq
0
}
"
>
<div
class=
"alert"
>
<div
class=
"alert
alert-info
"
>
<spring:message
code=
"faoInstitute.no-accessions-registered"
/>
</div>
</c:if>
<%-- <c:if test="${not faoInstitutes.current}">
<div class="alert"><spring:message code="faoInstitutes.page.not-current"/></div>
<div class="alert
alert-info
"><spring:message code="faoInstitutes.page.not-current"/></div>
</c:if> --%>
<div>
...
...
src/main/webapp/html/css/custom.css
View file @
c6c5c567
...
...
@@ -5,7 +5,7 @@
}
.content-block
{
overflow
:
auto
;
}
...
...
@@ -20,6 +20,14 @@
}
}
@media
(
max-width
:
780px
)
{
.container
{
padding-left
:
0
;
padding-right
:
0
;
}
}
@media
(
max-width
:
500px
)
{
#crops-menu
{
margin-bottom
:
10px
;
...
...
@@ -40,9 +48,10 @@
}
#header-searcher
button
{
display
:
none
;
/* display: none; */
}
.notimportant
,
td
.idx-col
,
#nav-main
ul
li
.notimportant
,
#nav-foot
ul
li
.notimportant
{
display
:
none
;
}
...
...
@@ -106,7 +115,7 @@ a.disabled {
padding
:
1em
0
;
color
:
#999999
;
display
:
block
;
font-size
:
11px
;
/* font-size: 11px; */
font-weight
:
bold
;
line-height
:
20px
;
text-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0.5
);
...
...
@@ -122,17 +131,20 @@ a.disabled {
}
table
{
width
:
100%
;
width
:
100%
;
font-size
:
12px
;
border-spacing
:
0
3px
;
border-collapse
:
separate
;
border-collapse
:
separate
;
}
table
.wide-table
tr
td
{
white-space
:
nowrap
;
}
table
thead
td
{
font-size
:
16px
;
font-weight
:
normal
;
padding
:
0.5em
0.2em
;
font-size
:
16px
;
/*
font-weight: normal;
padding: 0.5em 0.2em;
*/
}
h1
,
h2
,
h3
,
h4
{
...
...
@@ -145,6 +157,7 @@ h1 {
td
{
/* vertical-align: top; */
padding
:
0.5em
0.5em
;
font-size
:
12px
;
}
ul
.funny-list
li
{
...
...
@@ -231,6 +244,7 @@ ul.funny-list {
ul
.funny-list
li
{
list-style-type
:
none
;
/* font-size: 14px; */
}
/* body {
...
...
@@ -444,4 +458,27 @@ tr.acn .sel.picked {
}
.page-header
{
margin
:
20px
0
10px
;
\ No newline at end of file
margin
:
20px
0
10px
;
}
#header
.nav
>
li
>
a
:hover
,
#header
.nav
.open
>
a
,
#header
.nav
.open
>
a
:hover
,
#header
.nav
.open
>
a
:focus
{
background-color
:
Black
;
}
.container
.jumbotron
{
padding
:
20px
;
}
.table-responsive
{
overflow-x
:
scroll
;
overflow-y
:
hidden
;
width
:
100%
;
}
.table
thead
>
tr
>
th
,
.table
tbody
>
tr
>
th
,
.table
tfoot
>
tr
>
th
,
.table
thead
>
tr
>
td
,
.table
tbody
>
tr
>
td
,
.table
tfoot
>
tr
>
td
{
border-top
:
none
;
line-height
:
1.42857
;
padding
:
8px
;
vertical-align
:
top
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment