diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 22:33:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 22:33:13 -0700 |
| commit | 63f2e9b41259975f1af6415cda01dc0f81b1af30 (patch) | |
| tree | 01518a9183b0daf02350da8f8e7d853f1a039ffc /view/tpl | |
| parent | 8d84472b4cb85b50c314491e0706d80eb5b7de6d (diff) | |
| parent | 090dae46e500634cec8f3718fbb83d5dbb8f9690 (diff) | |
| download | volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.tar.gz volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.tar.bz2 volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index fb02ff8ed..10692856e 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -50,6 +50,9 @@ {{/if}} + {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} + {{if $rating}} <h3>{{$lbl_rating}}</h3> @@ -58,6 +61,8 @@ {{/if}} + + {{/if}} @@ -75,8 +80,7 @@ {{if $rating}} {{if $notself}} -<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3> -<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea> + {{include file="field_textarea.tpl" field=$rating_text}} {{/if}} {{/if}} diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 3450ad36d..98ec25e23 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -8,7 +8,9 @@ {{if $entry.ignlink}} <a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a> {{/if}} + {{if $entry.connect}} <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a> + {{/if}} </div> <h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i> {{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3> </div> |