diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/connections.tpl | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/connections.tpl')
-rwxr-xr-x | view/tpl/connections.tpl | 59 |
1 files changed, 35 insertions, 24 deletions
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 8e5266978..fdd269602 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,27 +1,38 @@ -<div class="generic-content-wrapper-styled"> - -<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> - -{{if $finding}}<h4>{{$finding}}</h4>{{/if}} - -<div id="contacts-search-wrapper"> -<form id="contacts-search-form" action="{{$cmd}}" method="get" > -<span class="contacts-search-desc">{{$desc}}</span> -<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" /> -<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" /> -</form> -</div> -<div id="contacts-search-end"></div> - -{{$tabs}} - -<div id="connections-wrapper"> -{{foreach $contacts as $contact}} - {{include file="connection_template.tpl"}} -{{/foreach}} -<div id="page-end"></div> -</div> -<div id="contact-edit-end"></div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="dropdown pull-right"> + <button type="button" class="btn btn-primary btn-xs" onclick="openClose('contacts-search-form');"> + <i class="icon-search"></i> {{$label}} + </button> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <i class="icon-sort"></i> + </button> + <ul class="dropdown-menu"> + {{foreach $tabs as $menu}} + <li><a href="{{$menu.url}}">{{$menu.label}}</a></li> + {{/foreach}} + </ul> + </div> + {{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}} + </div> + <div id="contacts-search-form" class="section-content-tools-wrapper"> + <form action="{{$cmd}}" method="get" > + <div class="form-group"> + <div class="input-group"> + <input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> + <div class="input-group-btn"> + <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="icon-search"></i></button> + </div> + </div> + </div> + </form> + </div> + <div id="connections-wrapper"> + {{foreach $contacts as $contact}} + {{include file="connection_template.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> |