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
dariah
search-commons-views
Commits
d57ba817
Commit
d57ba817
authored
Feb 22, 2018
by
Gradl, Tobias
Browse files
1010: Sidebar for collection selection and element collection management
Task-Url:
https://pm.winseda.de/issues/1010
parent
3b981a16
Changes
3
Hide whitespace changes
Inline
Side-by-side
resource
Collections/form/edit.jsp
→
element
Collections/form/edit.jsp
View file @
d57ba817
...
...
@@ -23,7 +23,7 @@
<div
class=
"form-group"
>
<label
class=
"control-label col-sm-3"
for=
"elementCollection_name"
><s:message
code=
"~eu.dariah.de.minfba.metamodel.common.name"
/>
:
</label>
<div
class=
"col-sm-9"
>
<sf:
textarea
path=
"name"
rows=
"4"
class=
"form-control"
id=
"elementCollection_name"
/>
<sf:
input
path=
"name"
class=
"form-control"
id=
"elementCollection_name"
/>
<sf:errors
path=
"name"
cssClass=
"error"
/>
</div>
</div>
...
...
templates/main.jsp
View file @
d57ba817
...
...
@@ -55,35 +55,7 @@
</div>
</div>
</div>
</div>
<!-- <div class="jumbotron jumbotron-small"
<c:if
test=
"
${
branding
!=
null
}
"
>
style="background-image: linear-gradient(180deg, ${branding.lightThemeColor} 0%, ${branding.darkThemeColor} 100%); color: ${branding.contrastThemeColor};"
</c:if>
>
<div class="container
<c:if
test=
"
${
fluidLayout
==
true
}
"
>
-fluid
</c:if>
">
<div class="row">
<!-- Notifications
<div id="notifications-area" class="col-sm-8 col-sm-offset-1"></div>
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<c:choose>
<c:when
test=
"
${
branding
!=
null
&&
branding
.
searchImage
!=
null
&&
fn:
length
(
branding
.
searchImage
)
>
0
}
"
>
<img alt="DARIAH-DE Digital Research Infrastructure for the Arts and Humanities" height="140" src="
<s:url
value=
"/images/${branding.searchImage}"
/>
">
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-45">${branding.acronym}</div>
</c:otherwise>
</c:choose>
</div>
<div class="col-sm-6 col-lg-7 col-sm-offset-1">
<h1 style="color: ${branding.contrastThemeColor};">${branding.searchTitle}
<c:if
test=
"
${
fn:
length
(
titleCode
)>
0
}
"
>
<small style="color: #D0B278;">
<s:message
code=
"
${
titleCode
}
"
/>
</small>
</c:if>
</h1>
</div>
</div>
</div>
</div> -->
</div>
<div
class=
"container
<c:if
test=
"
${
fluidLayout
==
true
}
"
>
-fluid
</c:if>
"
>
<div
id=
"primary-content-area"
class=
"row"
>
...
...
templates/main_jumbo_content.jsp
0 → 100644
View file @
d57ba817
<%@ page
language=
"java"
contentType=
"text/html; charset=UTF-8"
pageEncoding=
"UTF-8"
%>
<%@ page
trimDirectiveWhitespaces=
"true"
%>
<%@ taglib
prefix=
"tiles"
uri=
"http://tiles.apache.org/tags-tiles"
%>
<%@ taglib
prefix=
"c"
uri=
"http://java.sun.com/jsp/jstl/core"
%>
<%@ taglib
prefix=
"s"
uri=
"http://www.springframework.org/tags"
%>
<%@ taglib
prefix=
"fn"
uri=
"http://java.sun.com/jsp/jstl/functions"
%>
<!DOCTYPE html>
<html
lang=
"${pageContext.response.locale}"
>
<%@ include
file=
"incl/head.jsp"
%>
<body>
<tiles:importAttribute
name=
"sideNav"
/>
<tiles:importAttribute
name=
"collapsePanel"
ignore=
"true"
/>
<tiles:importAttribute
name=
"sideOpts"
ignore=
"true"
/>
<tiles:importAttribute
name=
"navbarInverse"
/>
<tiles:importAttribute
name=
"fluidLayout"
/>
<!-- Top Navigation -->
<%@ include
file=
"incl/topNav.jsp"
%>
<c:if
test=
"
${
collapsePanel
!=
null
}
"
>
<tiles:insertAttribute
name=
"collapsePanel"
/>
<div
class=
"sb-toggle-right"
id=
"collapse-panel-trigger"
><span
class=
"glyphicon glyphicon-menu-left"
aria-hidden=
"true"
></span></div>
</c:if>
<tiles:importAttribute
name=
"titleCode"
/>
<div
id=
"sb-site"
>
<div
class=
"jumbotron jumbotron-small"
<c:if
test=
"
${
customSearch
!=
null
}
"
>
style=
"background-image: linear-gradient(180deg, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%); color: ${customSearch.contrastThemeColor};"
</c:if>>
<div
class=
"container
<c:if
test=
"
${
fluidLayout
==
true
}
"
>
-fluid
</c:if>
"
>
<div
class=
"row"
>
<!-- Notifications -->
<div
id=
"notifications-area"
class=
"col-sm-8 col-sm-offset-1"
></div>
<tiles:insertAttribute
name=
"jumboContent"
/>
</div>
</div>
</div>
<div
class=
"container
<c:if
test=
"
${
fluidLayout
==
true
}
"
>
-fluid
</c:if>
"
>
<div
id=
"primary-content-area"
class=
"row"
>
<div
class=
"xs-hidden sm-hidden md-visible col-md-3"
>
<div
class=
"pull-right"
>
<div
class=
"sidebar"
>
<c:if
test=
"
${
sideOpts
!=
null
}
"
>
<tiles:insertAttribute
name=
"sideOpts"
/>
</c:if>
<c:if
test=
"
${
sideNav
==
true
}
"
>
<%@ include
file=
"incl/sideNav.jsp"
%>
</c:if>
</div>
</div>
</div>
<div
class=
"col-md-8"
>
<div
id=
"main-content-wrapper"
class=
"col-xs-12"
>
<tiles:insertAttribute
name=
"content"
/>
</div>
<!-- Footer -->
<div
class=
"col-xs-12"
>
<%@ include
file=
"incl/footer.jsp"
%>
</div>
</div>
</div>
</div>
<noscript>
<div><s:message
code=
"~eu.dariah.de.minfba.common.view.noscript"
/></div>
</noscript>
</div>
<!-- JavaScript files at the end for faster loading of documents -->
<tiles:importAttribute
name=
"scripts"
/>
<c:forEach
items=
"
${
scripts
}
"
var=
"s"
>
<script
type=
"text/javascript"
src=
"
<s:url
value=
"/resources/js/${s}"
/>
"
></script>
</c:forEach>
</body>
</html>
\ No newline at end of file
Write
Preview
Supports
Markdown
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