Skip to content
GitLab
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
702aa1e9
Commit
702aa1e9
authored
Oct 07, 2015
by
Matija Obreza
Browse files
Buttons layout fixed on Explore page (too many buttons)
parent
6fc0670f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/resources/content/language.properties
View file @
702aa1e9
...
...
@@ -591,6 +591,7 @@ session.expiry-warning-title=Session expiration warning
session.expiry-warning
=
Your current session is about to expire. Do you wish to extend this session?
session.expiry-extend
=
Extend session
download
=
Download
download.kml
=
Download KML
data-overview
=
Statistical overview
...
...
src/main/sourceapp/styles/genesys.scss
View file @
702aa1e9
...
...
@@ -2115,35 +2115,30 @@ table.terms-table td {
.mobile-header
{
display
:
none
;
.header-top
{
background
:
#2b2924
;
.navbar-nav
{
float
:
right
;
margin
:
5px
0
0
0
;
}
.mobile-menu-show
,
.mobile-menu-hide
{
display
:
inline-block
;
padding
:
10px
;
}
}
.logo-container
{
background
:
#4d4c46
;
padding
:
5px
0
10px
0
;
}
}
.mobile-header
.header-top
{
background
:
#2b2924
;
}
.mobile-header
.header-top
.navbar-nav
{
float
:
right
;
margin
:
5px
0
0
0
;
}
.mobile-header
.header-top
.mobile-menu-show
,
.mobile-header
.header-top
.mobile-menu-hide
{
display
:
inline-block
;
padding
:
10px
;
}
.mobile-header
.logo-container
{
background
:
#4d4c46
;
padding
:
5px
0
10px
0
;
}
/* @media ( max-width : 1200px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog {
width: 970px;
}
@media
(
max-width
:
1200px
)
{
#search
{
width
:
35%
;
}
}
*/
}
/*
@media ( max-width : 1024px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog {
...
...
@@ -2445,3 +2440,12 @@ div[x-href] {
.white-background
{
background-color
:
White
;
}
.btn
{
&
.btn-inline
{
border
:
none
;
background-color
:
inherit
;
color
:
inherit
;
display
:
inline
;
}
}
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
View file @
702aa1e9
...
...
@@ -17,7 +17,7 @@
<spring:message
code=
"accessions.number"
arguments=
"
${
pagedData
.
totalElements
}
"
/>
</div>
<div
class=
"row"
>
<div
class=
"col-md-12 col-lg-
6
"
>
<div
class=
"col-md-12 col-lg-
5
"
>
<form
method=
"get"
action=
""
>
<input
type=
"hidden"
name=
"filter"
value=
"
<c:out
value=
"
${
jsonFilter
}
"
/>
"
/>
<div
class=
"pagination"
>
...
...
@@ -28,7 +28,7 @@
</div>
</form>
</div>
<div
class=
"col-md-12 col-lg-
6
text-right"
style=
"padding-top: 12px"
>
<div
class=
"col-md-12 col-lg-
7
text-right"
style=
"padding-top: 12px"
>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
id=
"menuShareLink"
>
<span
class=
"glyphicon glyphicon-share"
></span><span><spring:message
code=
"share.link"
/></span>
<span
class=
"caret"
></span>
...
...
@@ -42,18 +42,29 @@
</div>
<c:if
test=
"
${
pagedData
.
totalElements
le
200000
}
"
>
<form
style=
"display: inline-block"
method=
"post"
action=
"
<c:url
value=
"/download/explore/dwca"
/>
"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<input
type=
"hidden"
name=
"filter"
value=
"
<c:out
value=
"
${
jsonFilter
}
"
/>
"
/>
<button
class=
"btn btn-default"
type=
"submit"
><span
class=
"glyphicon glyphicon-download"
></span><span><spring:message
code=
"filter.download-dwca"
/></span></button>
</form>
<security:authorize
access=
"isAuthenticated()"
>
<form
style=
"display: inline-block"
method=
"post"
action=
"
<c:url
value=
"/download/explore/download/mcpd"
/>
"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<input
type=
"hidden"
name=
"filter"
value=
"
<c:out
value=
"
${
jsonFilter
}
"
/>
"
/>
<button
class=
"btn btn-default"
type=
"submit"
><span
class=
"glyphicon glyphicon-download"
></span><span><spring:message
code=
"filter.download-mcpd"
/></span></button>
</form>
</security:authorize>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"glyphicon glyphicon-download"
></span><span><spring:message
code=
"download"
/></span>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
<security:authorize
access=
"isAuthenticated()"
>
<li>
<form
style=
"display: inline-block"
method=
"post"
action=
"
<c:url
value=
"/download/explore/download/mcpd"
/>
"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<input
type=
"hidden"
name=
"filter"
value=
"
<c:out
value=
"
${
jsonFilter
}
"
/>
"
/>
<button
class=
"btn btn-inline"
type=
"submit"
><span><spring:message
code=
"filter.download-mcpd"
/></span></button>
</form>
</li>
</security:authorize>
<li>
<form
style=
"display: inline-block"
method=
"post"
action=
"
<c:url
value=
"/download/explore/dwca"
/>
"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<input
type=
"hidden"
name=
"filter"
value=
"
<c:out
value=
"
${
jsonFilter
}
"
/>
"
/>
<button
class=
"btn btn-inline"
type=
"submit"
><span><spring:message
code=
"filter.download-dwca"
/></span></button>
</form>
</li>
</ul>
</div>
</c:if>
<a
class=
"btn btn-default"
href=
"
<c:url
value=
"/explore/overview"
><c:param
name=
"filter"
>
${jsonFilter}
</c:param></c:url>
"
><span
class=
"glyphicon glyphicon-eye-open"
></span><span><spring:message
code=
"data-overview.short"
/></span></a>
<a
class=
"btn btn-default"
href=
"
<c:url
value=
"/explore/map"
><c:param
name=
"filter"
>
${jsonFilter}
</c:param></c:url>
"
><span
class=
"glyphicon glyphicon-globe"
></span><span><spring:message
code=
"maps.view-map"
/></span></a>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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