diff options
| author | friendica <info@friendica.com> | 2014-10-13 15:28:40 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-13 15:28:40 -0700 |
| commit | 871049668999df0bfa54c93312c4e2ccb82c12d0 (patch) | |
| tree | 00395a705feb2f3b43095aabdd7335f2c7a2363d | |
| parent | 1b0390af0659e0c5534acbee97db1ef3c1e65288 (diff) | |
| parent | 1eefed0333cedaf262f0dc42c7f9d4d855dfc154 (diff) | |
| download | volse-hubzilla-871049668999df0bfa54c93312c4e2ccb82c12d0.tar.gz volse-hubzilla-871049668999df0bfa54c93312c4e2ccb82c12d0.tar.bz2 volse-hubzilla-871049668999df0bfa54c93312c4e2ccb82c12d0.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | doc/hidden_configs.bb | 3 | ||||
| -rw-r--r-- | view/css/widgets.css | 7 | ||||
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 10 |
4 files changed, 8 insertions, 13 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 4ad38a499..0fc04b766 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -98,3 +98,6 @@ This document assumes you're an administrator. Logfile to use for logging auth errors. Used to plug in to server side software such as fail2ban. Auth failures are still logged to the main logs as well. + [b]system > hide_in_statistics[/b] + Tell the red statistics servers to completely hide this hub in hub lists. +
\ No newline at end of file diff --git a/view/css/widgets.css b/view/css/widgets.css index 1992aa0fd..593e051da 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -81,13 +81,8 @@ /* group */ -input.group-edit-checkbox { - margin: unset; - height: 1em; - width: 1em; -} -a.group-edit-link { +a.group-edit-tool { z-index: 1; } diff --git a/view/js/main.js b/view/js/main.js index f58d3756b..32db7ccb7 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -986,6 +986,7 @@ function updateConvItems(mode,data) { $('body').css('cursor', 'wait'); $.get('contactgroup/' + gid + '/' + cid, function(data) { $('body').css('cursor', 'auto'); + $('#group-' + gid).toggleClass('icon-check icon-check-empty'); }); } diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 6c5edba27..4afe1286f 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -5,16 +5,12 @@ {{foreach $groups as $group}} <li> {{if $group.cid}} - <a class="pull-right group-edit-link"> - <input type="checkbox" - class="{{if $group.selected}}ticked{{else}}unticked {{/if}} group-edit-checkbox" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" - {{if $group.ismember}}checked="checked"{{/if}} - /> + <a class="pull-right group-edit-tool fakelink" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"/> + <i id="group-{{$group.id}}" class="{{if $group.ismember}}icon-check{{else}}icon-check-empty{{/if}}"></i> </a> {{/if}} {{if $group.edit}} - <a class="pull-right group-edit-link" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a> + <a class="pull-right group-edit-tool" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a> {{/if}} <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> </li> |