harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-10-13 15:28:40 -07:00
commit 8710496689
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/hidden_configs.bb
View File

@ -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.

7
view/css/widgets.css
View File

@ -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;
}

1
view/js/main.js
View File

@ -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');
});
}

10
view/tpl/group_side.tpl
View File

@ -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>