Commit 6fc1efeb authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1253: Migrate templates and main views

Task-Url: https://pm.winseda.de/issues/1253
parent e3ce813f
...@@ -13,76 +13,33 @@ ...@@ -13,76 +13,33 @@
<input type="hidden" id="custom-prefix" value="${customPrefix}" /> <input type="hidden" id="custom-prefix" value="${customPrefix}" />
<div class="container<c:if test="${fluidLayout==true}">-fluid</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="row">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>"> <!-- Notifications -->
<div class="row"> <div id="notifications-area" class="col-12 col-lg-10 offset-lg-1"></div>
<!-- Notifications --> <div class="jumbotron jumbotron-sm col-12">
<div id="notifications-area" class="col-sm-10 col-sm-offset-1"></div> <div class="row">
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<c:choose> <div class="col-12 col-md-10 offset-md-1 col-lg-8 offset-lg-2 col-xl-6 offset-xl-3">
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img src="${customSearch.searchImageSrc}">
</c:when> <p class=" mb-1">
<c:otherwise> <fmt:formatNumber type="number" value="${docCount}" var="fmtDocCount" />
<div class="pull-right dariah-flower-white-83"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.short" /></div> <s:message code="~eu.dariah.de.minfba.search.view.labels.collections_and_docs" arguments="${providerCount}, ${fmtDocCount}" />
</c:otherwise> </p>
</c:choose> <div class="input-group">
</div> <input type="text" autofocus="autofocus" id="expression" name="expression" class="form-control text-right" placeholder="${queryExpressionPlaceholder}" />
<div class="col-sm-6 col-sm-offset-1"> <div class="input-group-append">
<form id="search-form" method="POST" action="${query_url}" class="form-horizontal"> <button id="btn-doSearch" class="btn btn-primary" value="true" name="doQuery" type="submit"><i class="fas fa-search"></i></button>
<div class="form-group"> </div>
<c:choose> </div>
<c:when test="${customSearch!=null}"> <p class=" mt-1">
<h1 style="color: ${customSearch.contrastThemeColor};">${customSearch.name}</h1> <a href='<s:url value="/search/extended/"></s:url>' target="_self"><s:message code="~eu.dariah.de.minfba.search.view.titles.extended_search" /></a>
</c:when> </p>
<c:otherwise>
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" /></h1> </div>
</c:otherwise>
</c:choose>
<div>
<fmt:formatNumber type="number" value="${docCount}" var="fmtDocCount" />
<em><s:message code="~eu.dariah.de.minfba.search.view.labels.collections_and_docs" arguments="${providerCount}, ${fmtDocCount}" /></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: ${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>
</form>
</div> </div>
</div> </div>
<div class="wordcloud col-12<c:if test="${customSearch!=null}"> col-md-8 col-lg-6 col-lg-offset-3</c:if>"></div>
</div> </div>
</div> </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="${customSearch!=null}">
<c:if test="${customSearch.organizationImageIdSrcMap!=null}">
<c:forEach items="${customSearch.organizationImageIdSrcMap}" var="organizationImageEntry">
<div class="branded-side-logo">
<img src="${organizationImageEntry.value}">
</div>
</c:forEach>
</c:if>
<!-- <div class="branded-side-logo">
<h5 style="margin-bottom: -25px; color: #483E69;">powered by</h5>
<img width="180" height="57" alt="DARIAH-DE Digital Research Infrastructure for the Arts and Humanities" src="<s:url value="/resources/img/dariah.png" />">
</div> -->
</c:if>
</div>
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
aria-label="Toggle navigation"> aria-label="Toggle navigation">
<span class="ti-menu"></span> <span class="ti-menu"></span>
<s:message code="~eu.dariah.de.colreg.common.menu" /> <s:message code="~eu.dariah.de.minfba.common.labels.menu" />
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
...@@ -138,6 +138,31 @@ ...@@ -138,6 +138,31 @@
<svg class="logobar-logo logobar-spike" xmlns="http://www.w3.org/2000/svg" width="518.74" height="246.549" viewBox="0 -12 518.74 246.549"> <svg class="logobar-logo logobar-spike" xmlns="http://www.w3.org/2000/svg" width="518.74" height="246.549" viewBox="0 -12 518.74 246.549">
<path d="M52.865 25.768c0-10.093 12.995-16.333 21.549-21.516 6.721 4.093 22.397 11.499 22.4 22.119.004 11.79-4.904 31.006-8.806 31.09-4.246.093-10.111-24.356-13.232-24.292-3.12.066-8.929 24.391-12.845 24.385-4.25-.006-9.066-20.801-9.066-31.786"></path> <path d="M52.865 25.768c0-10.093 12.995-16.333 21.549-21.516 6.721 4.093 22.397 11.499 22.4 22.119.004 11.79-4.904 31.006-8.806 31.09-4.246.093-10.111-24.356-13.232-24.292-3.12.066-8.929 24.391-12.845 24.385-4.25-.006-9.066-20.801-9.066-31.786"></path>
</svg> </svg>
<span class="logobar-title">
<c:choose>
<c:when test="${smallLogo==true}">
<c:choose>
<c:when test="${customSearch!=null}">
<h1>${customSearch.name}</h1>
</c:when>
<c:otherwise>
<s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search" />
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${customSearch!=null}">
<h1>${customSearch.name}</h1>
</c:when>
<c:otherwise>
<s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" />
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</span>
</a> </a>
</h1> </h1>
</header> </header>
......
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