Commit fc8036da authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1720269: old_raw patches for bugs: (elasticsearch)

Bug 1714100
Bug 1694171

behatnotneeded

Change-Id: I21062124b6e1c260f1b17691d22da7af00c74716
parent 6e94aeed
......@@ -56,7 +56,11 @@
</div>
{/if}
<div class="detail">
{$record->description|str_shorten_html:100:true|safe}
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</div>
<!-- TAGS -->
{if $record->tags|count gt 0}
......
......@@ -20,7 +20,13 @@
{if $record->createdbyname}
<div class="createdby">{str tag=createdby section=search.elasticsearch arg1='<a href="`$record->createdby|profile_url`">`$record->createdbyname|safe`</a>'}</div>
{/if}
<div class="content-text">{$record->description|str_shorten_html:100:true|safe}</div>
<div class="content-text">
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</div>
<!-- TAGS -->
{if $record->tags|count gt 0}
<div class="tags"><strong>{str tag=tags section=search.elasticsearch}:</strong>
......
......@@ -19,8 +19,16 @@
{if $record->createdbyname}
<div class="createdby">{str tag=createdby section=search.elasticsearch arg1='<a href="`$record->createdby|profile_url`">`$record->createdbyname|safe`</a>'}</div>
{/if}
<div class="detail">{$record->description|str_shorten_html:140:true|safe}</div>
<div class="tags"><strong>{str tag=pages section=search.elasticsearch}:</strong>
<div class="detail">
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</div>
<!-- PAGES -->
<div class="tags">
<strong>{str tag=pages section=search.elasticsearch}:</strong>
{if $record->views}
{foreach from=$record->views key=id item=view name=foo}
<a href="{$WWWROOT}view/view.php?id={$id}">{$view}</a>{if !$.foreach.foo.last}, {/if}
......@@ -29,4 +37,14 @@
{str tag=none section=search.elasticsearch}
{/if}
</div>
<!-- TAGS -->
{if $record->tags|count gt 0}
<div class="tags">
<strong>{str tag=tags section=search.elasticsearch}:</strong>
{foreach from=$record->tags item=tag name=tags}
<a href="{$WWWROOT}search/elasticsearch/index.php?query={$tag}&tagsonly=true">{$tag}</a>{if !$.foreach.tags.last}, {/if}
{/foreach}
</div>
{/if}
<!-- end TAGS -->
{/if}
<div class="admin-warning alert alert-success">
{if $header}<h3>{$header}</h3>{/if}
<p>{$notice|safe}</p>
</div>
......@@ -7,8 +7,11 @@
- tagsonly
*}
<div id="totalresultsdisplay" class="totalresults view-description lead">
{str tag=xsearchresultsfory section=search.elasticsearch arg1=$totalresults arg2='
<a href="`$WWWROOT`search/elasticsearch/index.php?query=`$query`">`$query`</a>'}
{if $query|strlen > 0}
{str tag=xsearchresultsfory section=search.elasticsearch arg1=$totalresults arg2='<a href="`$WWWROOT`search/elasticsearch/index.php?query=`$query`">`$query`</a>'}
{else}
{str tag=xsearchresults section=search.elasticsearch arg1=$totalresults}
{/if}
</div>
<div class="elasticsearch-tabswrap">
<ul class="in-page-tabs searchtab nav nav-tabs">
......
......@@ -11,7 +11,13 @@
{$record->name}
</a>
</h3>
<p class="groupdesc">{$record->description|str_shorten_html:140:true|safe}</p>
<p class="groupdesc">
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</p>
{if $record->groupadmins}
<div class="groupadmin text-small">
<strong>{str tag=groupadmins section=group}:</strong>
......
......@@ -10,5 +10,11 @@
</a>
</h3>
<span class="artefacttype text-midtone">({str tag=forum section=search.elasticsearch})</span>
<div class="detail">{$record->description|str_shorten_html:140:true|safe}</div>
<div class="detail">
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</div>
{/if}
......@@ -50,8 +50,8 @@
</div>
{/foreach}
</div>
{elseif $query}
{else}
<p class="no-results">{str tag=nosearchresultsfound section=group}</p>
{/if}
</div>
</div>
\ No newline at end of file
</div>
......@@ -19,7 +19,13 @@
{/if}
</div>
{/if}
<div class="detail">{$record->description|str_shorten_html:140:true|safe}</div>
<div class="detail">
{if $record->highlight}
{$record->highlight|safe}
{else}
{$record->description|str_shorten_html:140:true|safe}
{/if}
</div>
<!-- TAGS -->
{if $record->tags|count gt 0}
<div class="tags"><strong>{str tag=tags section=search.elasticsearch}:</strong>
......
......@@ -59,4 +59,12 @@
.list-group-item ul:not(.list-group) {
padding-left: 25px;
}
.search-highlight {
font-weight: bold;
}
}
.elasticsearch-status {
color: darken($link-color, 10%);
font-weight: bold;
}
Markdown is supported
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