Commit 39ec37f5 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1104: Prepare MWW release

Task-Url: https://pm.winseda.de/issues/1104
parent f16d01e7
......@@ -13,10 +13,8 @@
<input type="hidden" id="custom-prefix" value="${customPrefix}" />
<c:set var="jumbotronHeight" value="${customSearch.jumbotronHeight==null ? 'auto' : customSearch.jumbotronHeight}" />
<div class="jumbotron" <c:if test="${customSearch!=null}">style="background-image: linear-gradient(180deg, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%); color: ${customSearch.contrastThemeColor}; height: ${jumbotronHeight}"</c:if>>
<div class="jumbotron" <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 -->
......@@ -24,7 +22,7 @@
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<c:choose>
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img src="${customSearch.searchImageSrc}" <c:if test="${customSearch.jumbotronHeight!=null}">style="position: absolute;"</c:if>>
<img src="${customSearch.searchImageSrc}">
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-83"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.short" /></div>
......
......@@ -4,21 +4,24 @@
<footer role="contentinfo" class="footer">
<span>&copy; <fmt:formatDate value="${date}" pattern="yyyy" />
<a href="http://de.dariah.eu">DARIAH-DE</a>
<c:if test="${customSearch!=null}">
<c:if test="${customSearch!=null && customSearch.staticCustomSearch==true}">
| <a href="${customSearch.mainUrl}">${customSearch.acronym}</a>
</c:if>
</span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum"><s:message code="~eu.dariah.de.minfba.common.link.legal_information" /></a></li>
<li><a href="https://de.dariah.eu/privacy-policy"><s:message code="~eu.dariah.de.minfba.common.link.privacy" /></a></li>
<li><a href="https://de.dariah.eu/kontakt"><s:message code="~eu.dariah.de.minfba.common.link.contact" /></a></li>
<li><a href="https://gitlab.rz.uni-bamberg.de/tgradl/search"><s:message code="~eu.dariah.de.minfba.common.link.contact" /></a></li>
<!-- <li><a target="_blank" href="http://github.com/tgradl/colreg/">
<img width="24" height="24" alt="ColReg GitHub Repository" src="<s:url value="/resources/img/github-mark.png" />">
</a></li> -->
<c:choose>
<c:when test="${customSearch!=null && customSearch.staticCustomSearch==true}">
<c:if test="${customSearch.legalInformationUrl!=null && customSearch.legalInformationUrl!=''}"><li><a href="${customSearch.legalInformationUrl}"><s:message code="~eu.dariah.de.minfba.common.link.legal_information" /></a></li></c:if>
<c:if test="${customSearch.privacyUrl!=null && customSearch.privacyUrl!=''}"><li><a href="${customSearch.privacyUrl}"><s:message code="~eu.dariah.de.minfba.common.link.privacy" /></a></li></c:if>
<c:if test="${customSearch.contactUrl!=null && customSearch.contactUrl!=''}"><li><a href="${customSearch.contactUrl}"><s:message code="~eu.dariah.de.minfba.common.link.contact" /></a></li></c:if>
</c:when>
<c:otherwise>
<li><a href="https://de.dariah.eu/impressum"><s:message code="~eu.dariah.de.minfba.common.link.legal_information" /></a></li>
<li><a href="https://de.dariah.eu/privacy-policy"><s:message code="~eu.dariah.de.minfba.common.link.privacy" /></a></li>
<li><a href="https://de.dariah.eu/kontakt"><s:message code="~eu.dariah.de.minfba.common.link.contact" /></a></li>
</c:otherwise>
</c:choose>
<li><a href="https://gitlab.rz.uni-bamberg.de/dariah/search"><i class="fa fa-gitlab fa-2x" aria-hidden="true"></i></a></li>
</ul>
</footer>
\ No newline at end of file
......@@ -14,43 +14,42 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- <c:choose>
<c:when test="${customSearch!=null}">
<a class="navbar-brand" href="${customSearch.homeLink}">${customSearch.acronym}</a>
</c:when>
<c:otherwise>
</c:otherwise>
</c:choose> -->
</div>
<nav role="navigation" class="collapse navbar-collapse bs-navbar-collapse">
<!-- Main top navigation built from configuration -->
<ul class="nav navbar-nav">
<li id="home_button" class="dropdown">
<a class="brand dropdown-toggle navbar-brand" data-toggle="dropdown" href="#">
<span class="caret"></span>
DARIAH-DE
</a>
<ul id="home_dropdown_menu" class="dropdown-menu">
<li class="dropdown-submenu">
<a tabindex="-1" href="#">DARIAH-DE</a>
<ul class="dropdown-menu">
<li><a href="http://de.dariah.eu">DARIAH-DE Home</a></li>
<li class="divider"></li>
<li><a href="http://textgrid.de/ ">TextGrid</a></li>
</ul>
</li>
<li class="divider"></li>
<li class="dropdown-submenu">
<a tabindex="-1" href="#">DARIAH-EU</a>
<ul class="dropdown-menu">
<li><a href="http://www.dariah.eu/">DARIAH-EU Home</a></li>
</ul>
</li>
</ul>
</li>
<c:choose>
<c:when test="${customSearch!=null && customSearch.staticCustomSearch==true}">
<a class="brand navbar-brand" href="${customSearch.mainUrl}">${customSearch.acronym}</a>
</c:when>
<c:otherwise>
<li id="home_button" class="dropdown">
<a class="brand dropdown-toggle navbar-brand" data-toggle="dropdown" href="#">
<span class="caret"></span>
DARIAH-DE
</a>
<ul id="home_dropdown_menu" class="dropdown-menu">
<li class="dropdown-submenu">
<a tabindex="-1" href="#">DARIAH-DE</a>
<ul class="dropdown-menu">
<li><a href="http://de.dariah.eu">DARIAH-DE Home</a></li>
<li class="divider"></li>
<li><a href="http://textgrid.de/ ">TextGrid</a></li>
</ul>
</li>
<li class="divider"></li>
<li class="dropdown-submenu">
<a tabindex="-1" href="#">DARIAH-EU</a>
<ul class="dropdown-menu">
<li><a href="http://www.dariah.eu/">DARIAH-EU Home</a></li>
</ul>
</li>
</ul>
</li>
</c:otherwise>
</c:choose>
<c:forEach items="${_nav.rootItems}" var="_navItem">
<c:set var="hide" value="false" />
<c:forEach items="${_navItem.attributes}" var="attr">
......
<%@ 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>
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<c:choose>
<c:when test="${customSearch!=null}">
<c:choose>
<c:when test="${customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img class="pull-right" style="margin-top: -15px;" alt="${customSearch.name}" src="${customSearch.searchImageSrc}/THUMBNAIL">${customSearch.acronym}
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-45">${customSearch.acronym}</div>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-45"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" /></div>
</c:otherwise>
</c:choose>
</div>
<div class="col-sm-6 col-lg-7 col-sm-offset-1">
<c:choose>
<c:when test="${fn:length(titleCode)>0}">
<h1><s:message code="${titleCode}" /></h1>
</c:when>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1>
</c:otherwise>
</c:choose>
</div>
</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>
<%@ 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-10 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="${customSearch!=null && customSearch.searchImageSrcSmall!=null && fn:length(customSearch.searchImageSrcSmall) > 0}">
<img src="${customSearch.searchImageSrcSmall}" />
</c:when>
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img src="${customSearch.searchImageSrc}" />
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-83"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.short" /></div>
</c:otherwise>
</c:choose>
</div>
<div class="col-sm-6 col-sm-offset-1">
<form id="search-form" method="POST" action="${query_url}" class="form-horizontal">
<div class="form-group">
<c:choose>
<c:when test="${customSearch!=null}">
<c:choose>
<c:when test="${fn:length(titleCode)>0}">
<h1 style="color: ${customSearch.contrastThemeColor};"><s:message code="${titleCode}" /></h1>
</c:when>
<c:otherwise>
<h1 style="color: ${customSearch.contrastThemeColor};">${customSearch.name}</h1>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${fn:length(titleCode)>0}">
<h1><s:message code="${titleCode}" /></h1>
</c:when>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1>
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</div>
</form>
</div>
</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
Supports Markdown
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