Commit 6553ce7d authored by Gradl, Tobias's avatar Gradl, Tobias Committed by Gogs
Browse files

Merge branch 'mww' of tgradl/search-common-views into master

parents d0e8369f 7c0eb971
......@@ -11,10 +11,10 @@
<s:url value="/search/simple/" var="query_url" />
<s:url value="/search/extended/" var="extended_search_url" />
<div class="jumbotron">
<!-- <div class="jumbotron">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<!-- Notifications -->
<!-- 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">
<div class="pull-right dariah-flower-white-83"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" /></div>
......@@ -35,8 +35,52 @@
</div>
</div>
</div>
</div> -->
<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="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>
<c:otherwise>
<div class="pull-right dariah-flower-white-83"><s:message code="~de.dariah.genericsearch.view.title.short" /></div>
</c:otherwise>
</c:choose>
</div>
<div class="col-sm-6 col-lg-7 col-sm-offset-1">
<c:choose>
<c:when test="${branding!=null}">
<h1 style="color: ${branding.contrastThemeColor};">${branding.searchTitle}</h1>
</c:when>
<c:otherwise>
<h1><s:message code="~de.dariah.genericsearch.view.title" /></h1>
</c:otherwise>
</c:choose>
<div class="search-home-info">
<s:message code="~eu.dariah.de.minfba.search.view.labels.collections_and_docs" arguments="${providerCount}, ${docCount}" />
</div>
<form id="search-form" method="POST" action="${query_url}" class="form-horizontal" >
<div class="input-group">
<input type="text" autofocus="autofocus" id="expression" name="expression" class="form-control input-lg" placeholder="${queryExpressionPlaceholder}" />
<span class="input-group-btn">
<button id="btn-doSearch" class="btn btn-default btn-lg" value="true" name="doQuery" type="submit"><span class="glyphicon glyphicon-search"></span></button>
</span>
</div>
</form>
</div>
<div class="col-sm-6 col-lg-7 col-sm-offset-1"><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></div>
</div>
</div>
</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 id="branded-side-logos" class="xs-hidden sm-hidden md-visible col-md-4 col-lg-3">
......
......@@ -50,7 +50,7 @@
</div>
<div class="form-footer control-group">
<div class="controls">
<button class="btn btn-primary form-btn-submit"><span><s:message code="~de.dariah.genericsearch.view.source_selection.custom.select" /></span></button>
<button id="btn-apply-source-selection" class="btn btn-primary btn-sm"><span><s:message code="~de.dariah.genericsearch.view.source_selection.custom.select" /></span></button>
</div>
</div>
</form>
\ No newline at end of file
......@@ -27,10 +27,10 @@
<div id="sb-site">
<div class="jumbotron jumbotron-small">
<!-- <div class="jumbotron jumbotron-small">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<!-- Notifications -->
<!-- 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>
......@@ -47,9 +47,33 @@
</div>
</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>
......
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