Skip to content

GitLab

Commit 0d686550 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

598: Implement CustomSearch as successor of user collections 

Task-Url: https://pm.winseda.de/issues/598
parent f6f75e2f
Hide whitespace changes
Inline Side-by-side
customSearch/form/edit.jsp
View file @ 0d686550
......@@ -23,14 +23,14 @@
<div class="form-group">
<label class="control-label col-sm-2" for="group_name"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.name" />:</label>
<div class="col-sm-10">
<sf:input path="name" class="form-control" id="userCollectionPojo_name" />
<sf:input path="name" class="form-control" id="customSearch_name" />
<sf:errors path="name" cssClass="error" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="group_name"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.description" />:</label>
<div class="col-sm-10">
<sf:textarea path="description" rows="4" class="form-control" id="userCollectionPojo_description" />
<sf:textarea path="description" rows="4" class="form-control" id="customSearch_description" />
<sf:errors path="description" cssClass="error" />
</div>
</div>
......@@ -47,10 +47,10 @@
<div class="form-group">
<label class="control-label col-sm-2" for="group_name"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.prefix" />:</label>
<div class="col-sm-3">
<sf:input path="prefix" class="form-control" id="userCollectionPojo_prefix" />
<sf:input path="prefix" class="form-control" id="customSearch_prefix" />
</div>
<div class="col-sm-7">
<p class="form-control-static"><strong>.${pageContext.request.localName}</strong></p>
<p class="form-control-static"><strong>.${urlSuffix}</strong></p>
</div>
<div class="col-sm-10 col-sm-offset-2">
<sf:errors path="prefix" cssClass="error" />
......@@ -59,17 +59,17 @@
<div class="form-group">
<label class="control-label col-sm-2" for="userCollectionPojo_darkThemeColor"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_dark_color" />:</label>
<div class="col-sm-2">
<sf:input path="darkThemeColor" class="form-control color-picker" id="userCollectionPojo_darkThemeColor" />
<sf:input path="darkThemeColor" class="form-control color-picker" id="customSearch_darkThemeColor" />
<sf:errors path="darkThemeColor" cssClass="error" />
</div>
<label class="control-label col-sm-2" style="padding-left: 0; padding-right: 0;" for="userCollectionPojo_lightThemeColor"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_light_color" />:</label>
<div class="col-sm-2">
<sf:input path="lightThemeColor" class="form-control color-picker" id="userCollectionPojo_lightThemeColor" />
<sf:input path="lightThemeColor" class="form-control color-picker" id="customSearch_lightThemeColor" />
<sf:errors path="lightThemeColor" cssClass="error" />
</div>
<label class="control-label col-sm-2" style="padding-left: 0; padding-right: 0;" for="userCollectionPojo_contrastThemeColor"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_contrast_color" />:</label>
<div class="col-sm-2">
<sf:input path="contrastThemeColor" class="form-control color-picker" id="userCollectionPojo_contrastThemeColor" />
<sf:input path="contrastThemeColor" class="form-control color-picker" id="customSearch_contrastThemeColor" />
<sf:errors path="contrastThemeColor" cssClass="error" />
</div>
</div>
......
customSearch/home.jsp
View file @ 0d686550
......@@ -6,129 +6,128 @@
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<s:url value="/search" var="home_url" />
<div id="content" class="primary-area">
<ul class="breadcrumb">
<li><a href="${home_url}"><s:message code="~eu.dariah.de.minfba.common.titles.administration" /></a></li>
<li class="active"> <s:message code="~eu.dariah.de.minfba.common.titles.custom_search" /></li>
</ul>
<div id="main-content">
<h1><s:message code="~eu.dariah.de.minfba.common.titles.custom_search" />&nbsp;<small id="user-collection-subheader"></small></h1>
<div class="row">
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.administration" /></li>
<li class="active"><s:message code="~eu.dariah.de.minfba.search.view.titles.collection_management" /></li>
</ul>
<div id="main-content">
<div class="row">
<div class="col-lg-12">
<h2 class="pull-left"><s:message code="~eu.dariah.de.minfba.common.titles.custom_search" />&nbsp;<small id="user-collection-subheader"></small></h2>
</div>
<div class="col-lg-12">
<button id="btn-new-custom-search" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-plus"></span> <s:message code="~eu.dariah.de.minfba.search.view.custom_search.button.add_custom_search" />
</button>
<button id="btn-custom-search-edit" class="btn btn-default btn-sm">
<button id="btn-custom-search-edit" class="btn btn-default btn-sm" disabled="disabled">
<span class="glyphicon glyphicon-pencil"></span> <s:message code="~eu.dariah.de.minfba.search.view.custom_search.button.edit_custom_search" />
</button>
<button id="btn-custom-search-delete" class="btn btn-default btn-sm">
<button id="btn-custom-search-delete" class="btn btn-default btn-sm" disabled="disabled">
<span class="glyphicon glyphicon-trash"></span> <s:message code="~eu.dariah.de.minfba.search.view.custom_search.button.delete_custom_search" />
</button>
<input type="hidden" id="user-collection-selectedUcId" value="0">
<input type="hidden" id="user-collection-selectedUcId" value="">
</div>
<div class="row">
<div class="col-md-4 no-padding" >
<ul class="nav nav-pills nav-stacked nav-condensed" id="source-select-ucIds">
<li class="source-select-ucId" style="margin-bottom:15px;" id="source-select-ucId-0">
<a href="#" onclick="editor.setActiveUc(0); editor.refresh(); return false;"><span class="glyphicon glyphicon-chevron-right pull-right"></span><span class="source-select-ucId-title"><s:message code="~eu.dariah.de.minfba.search.options.actions.select_all_collections" /></span></a>
</li>
</ul>
</div>
<div class="col-md-8 model-details">
<ul id="user-collection-tab" class="nav nav-tabs">
<li id="user-collection-details-tab" class="active">
<a href="#user-collection-details" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.details" />&nbsp;</a>
</li>
<li id="user-collection-collections-tab">
<a href="#user-collection-collections" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.metamodel.collection" />&nbsp;
<button id="btn-add-collection" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</li>
<li id="user-collection-shares-tab" class="hide">
<a href="#user-collection-shares" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.users" />&nbsp;
<button id="btn-add-user" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</li>
</ul>
<!-- Tab panes -->
<div id="search-results" class="tab-content">
<div class="tab-pane active" id="user-collection-details">
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.name" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-name"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.description" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-description"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.is_branded" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-is_branded"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.prefix" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-uri_prefix"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_dark_color" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-dark_color"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_light_color" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-light_color"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_contrast_color" />:</label></div>
<div class="col-sm-9"><span id="user-collection-detail-contrast_color"></span></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.search_logo" />:</label></div>
<div class="col-sm-9"><img id="user-collection-detail-search_logo" /></div>
</div>
<div class="row">
<div class="col-sm-3"><label class="control-label"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.organization_logo" />:</label></div>
<div class="col-sm-9"><img id="user-collection-detail-organization_logo" /></div>
</div>
</div>
<div class="tab-pane" id="user-collection-collections">
<table id="user-collection-collections-table" class="table table-striped table-bordered table-condensed model-list">
<thead>
<tr>
<th></th>
<th><s:message code="~eu.dariah.de.minfba.metamodel.collection" /></th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2" align="center"><s:message code="~eu.dariah.de.minfba.common.data_tables.no_data_fetched_yet" /></td>
</tr>
</tbody>
</table>
</div>
<div class="tab-pane" id="user-collection-shares">
<table id="user-collection-shares-table" class="table table-striped table-bordered table-condensed model-list">
<thead>
<tr>
<th></th>
<th></th>
<th><s:message code="~eu.dariah.de.minfba.search.model.custom_search.users" /></th>
</tr>
</thead>
<tbody>
<div class="col-md-4" style="margin-top: 10px">
<ul class="nav nav-pills nav-stacked nav-condensed" id="source-select-ucIds">
<!-- <li class="source-select-ucId" style="margin-bottom:15px;" id="source-select-ucId-0">
<a href="#" onclick="editor.setActiveUc(0); editor.refresh(); return false;"><span class="glyphicon glyphicon-chevron-right pull-right"></span><span class="source-select-ucId-title"><s:message code="~eu.dariah.de.minfba.search.options.actions.select_all_collections" /></span></a>
</li> -->
</ul>
</div>
<div id="custom-search-details-container" class="col-md-8 model-details hide">
<ul id="user-collection-tab" class="nav nav-tabs">
<li id="user-collection-details-tab" class="active">
<a href="#user-collection-details" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.details" />&nbsp;</a>
</li>
<li id="user-collection-collections-tab">
<a href="#user-collection-collections" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.metamodel.collection" />&nbsp;
<button id="btn-add-collection" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</li>
<!-- <li id="user-collection-shares-tab" class="hide">
<a href="#user-collection-shares" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.users" />&nbsp;
<button id="btn-add-user" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</li> -->
</ul>
<!-- Tab panes -->
<div id="search-results" class="tab-content">
<div class="tab-pane active" id="user-collection-details">
<table class="table">
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.name" />:</th>
<td width="100%"><span id="user-collection-detail-name"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.description" />:</th>
<td><span id="user-collection-detail-description"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.is_branded" />:</th>
<td><span id="user-collection-detail-is_branded"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.prefix" />:</th>
<td><span id="user-collection-detail-uri_prefix"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_dark_color" />:</th>
<td><span id="user-collection-detail-dark_color"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_light_color" />:</th>
<td><span id="user-collection-detail-light_color"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.theme_contrast_color" />:</th>
<td><span id="user-collection-detail-contrast_color"></span></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.search_logo" />:</th>
<td><img id="user-collection-detail-search_logo" /></td>
</tr>
<tr>
<th style="white-space: nowrap;"><s:message code="~eu.dariah.de.minfba.search.model.custom_search.organization_logo" />:</th>
<td><img id="user-collection-detail-organization_logo" /></td>
</tr>
</table>
</div>
<div class="tab-pane" id="user-collection-collections">
<table class="table" id="user-collection-collections-table">
</table>
</div>
<!-- <div class="tab-pane" id="user-collection-shares">
<table id="user-collection-shares-table" class="table table-striped table-bordered table-condensed model-list">
<thead>
<tr>
<td colspan="3" align="center"><s:message code="~eu.dariah.de.minfba.common.data_tables.no_data_fetched_yet" /></td>
<th></th>
<th></th>
<th><s:message code="~eu.dariah.de.minfba.search.model.custom_search.users" /></th>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</thead>
<tbody>
<tr>
<td colspan="3" align="center"><s:message code="~eu.dariah.de.minfba.common.data_tables.no_data_fetched_yet" /></td>
</tr>
</tbody>
</table>
</div> -->
</div>
</div>
</div>
</div>
\ 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