diff options
| author | friendica <info@friendica.com> | 2014-12-15 14:37:57 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-15 14:37:57 -0800 |
| commit | 2e990743e757bea6712a3f3e9639a43c89b52901 (patch) | |
| tree | cfc7da5c92a471de875bdd15dc491635fb987ee8 /view/tpl | |
| parent | f28103d595c0e02dfd30d44b3115915994e9ecc0 (diff) | |
| parent | 3b343f8f6c7936aba93ed4a0b09a19086f18ae0d (diff) | |
| download | volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.tar.gz volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.tar.bz2 volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/suggest_widget.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/uexport.tpl | 9 |
4 files changed, 13 insertions, 4 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index e87049f26..4241c0a92 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -165,7 +165,7 @@ <ul class="nav navbar-nav navbar-right"> <li class="hidden-xs"> <form method="get" action="search" role="search"> - <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> </form> </li> <li class="visible-xs"> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index ee797ea9d..73987f192 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,4 +1,4 @@ -<div class="widget"> +<div class="widget saved-search-widget"> <h3 id="search">{{$title}}</h3> {{$searchbox}} diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl index eba8b496e..7b9afa668 100644 --- a/view/tpl/suggest_widget.tpl +++ b/view/tpl/suggest_widget.tpl @@ -1,4 +1,4 @@ -<div class="widget"> +<div class="widget suggestions-widget"> <h3>{{$title}}</h3> {{if $entries}} {{foreach $entries as $child}} @@ -7,4 +7,4 @@ {{/if}} <div class="clear"></div> <div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div> -</div>
\ No newline at end of file +</div> diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl new file mode 100644 index 000000000..5de995ba0 --- /dev/null +++ b/view/tpl/uexport.tpl @@ -0,0 +1,9 @@ +<div class="generic-content-wrapper"> +<h1>{{$title}}</h1> +<b><a href="uexport/basic">{{$basictitle}}</a></b></p> +<p>{{$basic}}</p> + +<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p> +<p>{{$full}}</p> + +</div> |