diff options
| author | zotlabs <mike@macgirvin.com> | 2018-05-14 17:23:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-05-14 17:23:19 -0700 |
| commit | 229d82c4c7ca37c304d1291be7f71ba4b0632f03 (patch) | |
| tree | 9f0ce27c1e82380987dd9ea317d6bf8e516f7a6b /view/tpl | |
| parent | d9759ba63c8fd70c4da66669389bd19bae3333ff (diff) | |
| parent | 2d1dbc8f40d0b9fa89b99861fac30d579a400e34 (diff) | |
| download | volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.gz volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.tar.bz2 volse-hubzilla-229d82c4c7ca37c304d1291be7f71ba4b0632f03.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/connections.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 0bf88b818..021c33146 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> <div class="dropdown pull-right"> - <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()"> + <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();"> <i class="fa fa-search"></i> {{$label}} </button> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> @@ -16,11 +16,11 @@ {{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" > + <form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form"> <div class="input-group form-group"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> <div class="input-group-append"> - <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> + <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index c87b9ac79..1810e1ee1 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,12 @@ </td> {{if $notself}} <td class="abook-them"> - {{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}} + {{if $field.2 === 1}}<i class="fa fa-check-square-o"></i>{{/if}} + {{if $field.2 === 0}}<i class="fa fa-square-o"></i>{{/if}} </td> {{/if}} <td class="abook-me"> - {{if $self || !$field.5 || $twocol }} + {{if $self || !$field.5 }} <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> {{/if}} {{if $notself && $field.5}} |