Commit f6f75e2f authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

972: Fix some minor UI glitches

Task-Url: https://pm.winseda.de/issues/972
parent a2cdb2c1
......@@ -11,31 +11,6 @@
<s:url value="/search/simple/" var="query_url" />
<s:url value="/search/extended/" var="extended_search_url" />
<!-- <div class="jumbotron">
<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">
<div class="pull-right dariah-flower-white-83"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" /></div>
</div>
<div class="col-sm-6 col-lg-7 col-sm-offset-1">
<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>
</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>">
......@@ -48,34 +23,41 @@
<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>
<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-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 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="${branding!=null}">
<h1 style="color: ${branding.contrastThemeColor};">${branding.searchTitle}</h1>
</c:when>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1>
</c:otherwise>
</c:choose>
<div>
<em><s:message code="~eu.dariah.de.minfba.search.view.labels.collections_and_docs" arguments="${providerCount}, ${docCount}" /></em>
</div>
</div>
<div class="form-group">
<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>
</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>
</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>
......
......@@ -28,13 +28,38 @@
<a class="navbar-brand" href="${branding.homeLink}">${branding.acronym}</a>
</c:when>
<c:otherwise>
<a class="navbar-brand" href="http://de.dariah.eu">DARIAH-DE</a>
</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:forEach items="${_nav.rootItems}" var="_navItem">
<c:if test="${_navItem.authRequired==false || ( (_navItem.authRequired==true && _auth!=null && _auth.auth==true) &&
( _navItem.authMinLevel==0 || (_navItem.authMinLevel<=_auth.level)) )}">
......
......@@ -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>
......@@ -41,18 +41,18 @@
<h1><s:message code="${titleCode}" /></h1>
</c:when>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.short" /></h1>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1>
</c:otherwise>
</c:choose>
</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="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 -->
<!-- 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>
......@@ -73,7 +73,7 @@
</div>
</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