Skip to content

Commit

Permalink
update jsp in orig
Browse files Browse the repository at this point in the history
  • Loading branch information
marevol committed May 22, 2016
1 parent ce79288 commit b7177ca
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/orig/view/error/header.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ ${fe:facetForm()}${fe:geoForm()}
styleClass="form-control" 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"><la:message
<i class="icon-search icon-white"></i><span class="hidden-xs"><la:message
key="labels.search" /></span>
</button>
<a href="#searchOptions" role="button" class="btn btn-secondary"
data-toggle="modal"><i class="icon-cog"></i><span
class="hidden-phone"><la:message
class="hidden-xs"><la:message
key="labels.header_form_option_btn" /></span></a>
</div>
</nav>
Expand Down
3 changes: 3 additions & 0 deletions src/main/webapp/WEB-INF/orig/view/header.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ ${fe:facetForm()}${fe:geoForm()}
<option value="">
<la:message key="labels.search_result_select_sort" />
</option>
<la:option value="score.desc">
<la:message key="labels.search_result_sort_score_desc" />
</la:option>
<la:option value="created.asc">
<la:message key="labels.search_result_sort_created_asc" />
</la:option>
Expand Down
3 changes: 3 additions & 0 deletions src/main/webapp/WEB-INF/orig/view/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
<option value="">
<la:message key="labels.search_result_select_sort" />
</option>
<la:option value="score.desc">
<la:message key="labels.search_result_sort_score_desc" />
</la:option>
<la:option value="created.asc">
<la:message key="labels.search_result_sort_created_asc" />
</la:option>
Expand Down
18 changes: 9 additions & 9 deletions src/main/webapp/WEB-INF/orig/view/searchResults.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
</c:if> <c:if
test="${doc.last_modified!=null && doc.last_modified!=''}">
<c:if test="${hasInfo}">
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
<span class="br-xs"></span>
<span class="hidden-xs">-</span>
</c:if>
<c:set var="hasInfo" value="true" />
<la:message key="labels.search_result_last_modified" />
Expand All @@ -68,24 +68,24 @@
</c:if> <c:if
test="${doc.content_length!=null && doc.content_length!=''}">
<c:if test="${hasInfo}">
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
<span class="br-xs"></span>
<span class="hidden-xs">-</span>
</c:if>
<c:set var="hasInfo" value="true" />
<la:message key="labels.search_result_size"
arg0="${fe:formatNumber(doc.content_length)}" />
</c:if> <c:if test="${searchLogSupport}">
<c:if test="${hasInfo}">
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
<span class="br-xs"></span>
<span class="hidden-xs">-</span>
</c:if>
<c:set var="hasInfo" value="true" />
<la:message key="labels.search_click_count"
arg0="${f:h(doc.click_count)}" />
</c:if> <c:if test="${favoriteSupport}">
<c:if test="${hasInfo}">
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
<span class="br-xs"></span>
<span class="hidden-xs">-</span>
</c:if>
<c:set var="hasInfo" value="true" />
<a href="#${doc.doc_id}" class="favorite"><la:message
Expand Down Expand Up @@ -171,7 +171,7 @@
</c:if>
<c:forEach var="pageNumber" varStatus="s" items="${pageNumberList}">
<li
<c:if test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="hidden-phone"</c:if>
<c:if test="${pageNumber < currentPageNumber - 2 || pageNumber > currentPageNumber + 2}">class="hidden-xs"</c:if>
<c:if test="${pageNumber == currentPageNumber && pageNumber >= currentPageNumber - 2 && pageNumber <= currentPageNumber + 2}">class="active"</c:if>>
<la:link
href="/search/move?q=${f:u(q)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(pageNumber)}</la:link>
Expand Down

0 comments on commit b7177ca

Please # to comment.