0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #80

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-01-24 15:47:42 +09:00
parent 3d4900de09
commit 43b9336066
7 changed files with 59 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/webapp/WEB-INF/view/header.jsp
View file

@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
alt="<bean:message key="labels.header_brand_name" />" />
</s:link>
<div class="navbar-form pull-right">
<html:text property="query" maxlength="1000" styleId="query" />
<html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
<button class="btn medium btn-primary" type="submit" name="search"
id="searchButton">
<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message

34
src/main/webapp/WEB-INF/view/index.jsp
View file

@ -52,7 +52,7 @@
<div class="clearfix">
<div class="input">
<html:text styleClass="query" property="query" size="50"
maxlength="1000" styleId="contentQuery" />
maxlength="1000" styleId="contentQuery" autocomplete="off" />
</div>
</div>
<c:if test="${fe:hswsize(null) != 0}">
@ -174,37 +174,11 @@
</div>
<jsp:include page="footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="js/suggestor.js"></script>
<script>
$(function(){
$("#contentQuery").suggestor( {
ajaxinfo: {
url: "/fess/json",
fn: "content",
num: 10
},
boxCssInfo: {
border: "1px solid rgba(82, 168, 236, 0.5)",
"-webkit-box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
"-moz-box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
"box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
"background-color": "#fff"
},
listSelectedCssInfo: {
"background-color": "rgba(82, 168, 236, 0.1)"
},
listDeselectedCssInfo: {
"background-color": "#ffffff"
},
minturm: 1,
adjustWidthVal: 11,
searchForm: $('#searchForm')
});
});
</script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
</body>
</html>

4
src/main/webapp/WEB-INF/view/search.jsp
View file

@ -45,9 +45,11 @@
</c:choose>
<jsp:include page="footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
</body>
</html>

1
src/main/webapp/WEB-INF/view/searchResults.jsp
View file

@ -23,7 +23,6 @@
</c:if>
<div id="result" class="row content">
<input type="hidden" id="queryId" value="${f:u(queryId)}" />
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<input type="hidden" id="rt" value="${f:u(rt)}" />
<div class="span8">
<ol>

25
src/main/webapp/js/index.js
View file

@ -1,5 +1,6 @@
$(function(){
var $searchButton = $('#searchButton');
var contextPath = $('#contextPath').val();
$('#searchForm').on('submit', function(e) {
$searchButton.attr('disabled', true);
@ -16,4 +17,28 @@ $(function(){
return false;
});
$('#contentQuery').suggestor( {
ajaxinfo: {
url: contextPath + '/json',
fn: 'content',
num: 10
},
boxCssInfo: {
border: '1px solid rgba(82, 168, 236, 0.5)',
'-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'background-color': '#fff'
},
listSelectedCssInfo: {
'background-color': 'rgba(82, 168, 236, 0.1)'
},
listDeselectedCssInfo: {
'background-color': '#ffffff'
},
minturm: 1,
adjustWidthVal: 11,
searchForm: $('#searchForm')
});
});

28
src/main/webapp/js/search.js
View file

@ -4,6 +4,7 @@ $(function(){
var $favorites = $('.favorite', $result);
var $screenshot = $('#screenshot', $result);
var $searchButton = $('#searchButton');
var contextPath = $('#contextPath').val();
$('#searchForm').on('submit', function(e) {
$searchButton.attr('disabled', true);
@ -57,7 +58,6 @@ $(function(){
var $favorite = $(this);
var values = $favorite.attr('href').split('#');
if(values.length === 2 && $queryId.size() > 0){
var contextPath = $('#contextPath').val();
var actionUrl = contextPath + '/json';
var docId = values[1];
$.ajax({
@ -88,7 +88,6 @@ $(function(){
});
if($favorites.size() > 0) {
var contextPath = $('#contextPath').val();
$.ajax({
dataType: 'json',
cache: false,
@ -141,4 +140,29 @@ $(function(){
}
return false;
});
$('#query').suggestor( {
ajaxinfo: {
url: contextPath + '/json',
fn: 'content',
num: 10
},
boxCssInfo: {
border: '1px solid rgba(82, 168, 236, 0.5)',
'-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
'background-color': '#fff'
},
listSelectedCssInfo: {
'background-color': 'rgba(82, 168, 236, 0.1)'
},
listDeselectedCssInfo: {
'background-color': '#ffffff'
},
minturm: 1,
adjustWidthVal: 11,
searchForm: $('#searchForm')
});
});

1
src/main/webapp/js/suggestor.js
View file

@ -167,7 +167,6 @@ $.fn.suggestor = function(setting) {
var str = $(this).html();
suggestor.fixList();
$textArea.val(str);
//BEGIN: N2 SEARCH 検索開始
if(typeof $settingSearchForm !== "undefined") {
$settingSearchForm.submit();
//$settingSearchForm.trigger("submit");