diff options
| author | Michael Meer <michael@meer.name> | 2014-01-29 14:07:25 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-29 14:07:25 +0100 |
| commit | ac8d481a3223335050a7f8dfe1c893a0b301ae7b (patch) | |
| tree | c5461820ba181db4258bcf524c42f3fac982e454 /view | |
| parent | aa285b83c1c8f674be8f200d4feae6299eafc436 (diff) | |
| parent | a1e7c65d51a6472cf7fe95686883f77953d7dfd7 (diff) | |
| download | volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.tar.gz volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.tar.bz2 volse-hubzilla-ac8d481a3223335050a7f8dfe1c893a0b301ae7b.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/icon_translate.js | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/tpl/chatroomlist.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/direntry_large.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 3 |
6 files changed, 21 insertions, 2 deletions
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js index 9e69e0b7d..838ff899f 100644 --- a/view/js/icon_translate.js +++ b/view/js/icon_translate.js @@ -50,4 +50,5 @@ $(document).ready(function() { $('.icon-check').addClass(''); $('.icon-globe').addClass(''); $('.icon-circle-blank').addClass(''); + $('.icon-circle').addClass(''); });
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2f90cbc1..02832b5f0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2445,4 +2445,8 @@ img.mail-list-sender-photo { .abook-self { background-color: #ffdddd; +} +.online-now { + color: red; + cursor: pointer; }
\ No newline at end of file diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl new file mode 100644 index 000000000..d2cf4d7b0 --- /dev/null +++ b/view/tpl/chatroomlist.tpl @@ -0,0 +1,11 @@ +<div class="widget"> +<h3>{{$header}}</h3> +{{if $items}} +<table> +{{foreach $items as $item}} +<tr><td>{{$item.cr_name}}</td><td>{{$item.cr_inroom}}</td></tr> +{{/foreach}} +</table> +{{/if}} +</div> + diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index a3fa7e4c3..f00448175 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -13,7 +13,7 @@ <div class="clear"></div> -<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}</div> +<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div> {{if $connect}} <div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div> {{/if}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index aaee02ab5..7a857fd67 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ </div> {{/if}} - <div class="fn label">{{$profile.name}}</div> + <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7b6add231..b1a4f956d 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -22,6 +22,9 @@ <h3 class="settings-heading">{{$h_prv}}</h3> +{{include file="field_checkbox.tpl" field=$hide_presence}} + + <div id="settings-privacy-macros">{{$lbl_pmacro}}</div> <ul> <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> |