Commit 7843e113 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

985: Complete branding of custom searches

Task-Url: https://pm.winseda.de/issues/985
parent 04c7ad56
......@@ -13,15 +13,15 @@
<input type="hidden" id="custom-prefix" value="${customPrefix}" />
<div class="jumbotron" <c:if test="${branding!=null}">style="background-image: linear-gradient(180deg, ${branding.lightThemeColor} 0%, ${branding.darkThemeColor} 100%); color: ${branding.contrastThemeColor};"</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 -->
<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="${branding!=null && branding.searchImage!=null && fn:length(branding.searchImage) > 0}">
<img alt="DARIAH-DE Digital Research Infrastructure for the Arts and Humanities" height="230" src="<s:url value="/images/${branding.searchImage}" />">
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img alt="${customSearch.name}" 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>
......@@ -32,8 +32,8 @@
<form id="search-form" method="POST" action="${query_url}" class="form-horizontal">
<div class="form-group">
<c:choose>
<c:when test="${branding!=null}">
<h1 style="color: ${branding.contrastThemeColor};">${branding.searchTitle}</h1>
<c:when test="${customSearch!=null}">
<h1 style="color: ${customSearch.contrastThemeColor};">${customSearch.name}</h1>
</c:when>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1>
......@@ -52,7 +52,7 @@
</div>
</div>
<div class="form-group" style="text-align: right;">
<a style="color: ${branding.contrastThemeColor};" href='<s:url value="/search/extended/"></s:url>' target="_self"><s:message code="~eu.dariah.de.minfba.search.view.titles.extended_search" /></a>
<a style="color: ${customSearch.contrastThemeColor};" href='<s:url value="/search/extended/"></s:url>' target="_self"><s:message code="~eu.dariah.de.minfba.search.view.titles.extended_search" /></a>
</div>
......@@ -64,14 +64,14 @@
</div>
<div class="wordcloud col-xs-12<c:if test="${branding!=null}"> col-md-8 col-lg-6 col-lg-offset-3</c:if>"></div>
<div class="wordcloud col-xs-12<c:if test="${customSearch!=null}"> col-md-8 col-lg-6 col-lg-offset-3</c:if>"></div>
<div id="branded-side-logos" class="xs-hidden sm-hidden md-visible col-md-4 col-lg-3">
<c:if test="${branding!=null}">
<c:if test="${branding.organizationImages!=null && fn:length(branding.organizationImages) > 0}">
<c:forEach items="${branding.organizationImages}" var="orgaImage">
<c:if test="${customSearch!=null}">
<c:if test="${customSearch.organizationImageIdSrcMap!=null}">
<c:forEach items="${customSearch.organizationImageIdSrcMap}" var="organizationImageEntry">
<div class="branded-side-logo">
<img src="<s:url value="/images/${orgaImage}" />" width="250">
<img src="${organizationImageEntry.value}">
</div>
</c:forEach>
</c:if>
......
a {
color: ${customSearch.darkThemeColor};
}
.btn-primary {
background-image: none;
}
.btn-primary {
background-color: ${customSearch.darkThemeColor};
background-image: -webkit-linear-gradient(top, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
background-image: -o-linear-gradient(top, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(${customSearch.lightThemeColor}), to(${customSearch.darkThemeColor}));
background-image: linear-gradient(to bottom, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='${customSearch.lightThemeColor}', endColorstr='${customSearch.darkThemeColor}', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: ${customSearch.lightThemeColor};
}
.btn-primary:focus, .btn-primary.focus, .btn-primary:hover {
background-color: ${customSearch.darkThemeColor};
background-image: none;
}
div.panel.panel-search-result {
border-color: ${customSearch.darkThemeColor};
}
div.panel.panel-search-result > .panel-heading,
.list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus {
background-color: ${customSearch.darkThemeColor};
background-image: -webkit-linear-gradient(top, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
background-image: -o-linear-gradient(top, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(${customSearch.lightThemeColor}), to(${customSearch.darkThemeColor}));
background-image: linear-gradient(to bottom, ${customSearch.lightThemeColor} 0%, ${customSearch.darkThemeColor} 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='${customSearch.lightThemeColor}', endColorstr='${customSearch.darkThemeColor}', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
color: ${customSearch.contrastThemeColor};
}
.sidebar a.list-group-item.active:hover, .sidebar a.list-group-item.active:focus {
background-color: ${customSearch.darkThemeColor};
}
.sidebar a.list-group-item.childActive, .sidebar a.list-group-item.childActive:hover, .sidebar a.list-group-item.childActive:focus, .sidebar a.list-group-item.active, .sidebar a.list-group-item.active:hover, .sidebar a.list-group-item.active:focus, .sidebar div.childActive a.list-group-item, .sidebar div.childActive a.list-group-item:hover, .sidebar div.childActive a.list-group-item:focus {
border-color: ${customSearch.darkThemeColor};
}
.sidebar a.list-group-item {
color: ${customSearch.darkThemeColor};
}
.list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus {
background-color: ${customSearch.darkThemeColor};
}
\ No newline at end of file
......@@ -15,10 +15,18 @@
<tiles:importAttribute name="styles" />
<c:forEach items="${styles}" var="css">
<link rel="stylesheet" href="<s:url value="/resources/css/${css}" />" type="text/css" media="screen, projection" />
</c:forEach>
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
</c:forEach>
<c:if test="${customSearch!=null}">
<style>
<%@ include file="customSearch.css" %>
</style>
</c:if>
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link rel="shortcut icon" type="image/png" href="<s:url value="/resources/img/page_icon.png" />" />
<link rel="shortcut icon" type="image/png" href="<s:url value="/resources/img/page_icon.png" />" />
</head>
\ No newline at end of file
......@@ -27,13 +27,21 @@
<div id="sb-site">
<div class="jumbotron jumbotron-small">
<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">
<div class="pull-right dariah-flower-white-45"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" /></div>
<c:choose>
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img class="pull-right" style="margin-top: -15px;" alt="${customSearch.name}" src="${customSearch.searchImageSrc}/THUMBNAIL">
</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>
......
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