Browse Source
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
pull/2106/head
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
pull/2106/head
Michael Vogel
6 years ago
32 changed files with 205 additions and 87 deletions
-
10include/bb2diaspora.php
-
15include/forums.php
-
34include/group.php
-
8include/identity.php
-
2mod/contacts.php
-
1mod/dirfind.php
-
2mod/group.php
-
3mod/item.php
-
1mod/match.php
-
6mod/network.php
-
2mod/nogroup.php
-
3mod/parse_url.php
-
7mod/suggest.php
-
7mod/viewcontacts.php
-
68view/templates/group_side.tpl
-
3view/templates/profile_vcard.tpl
-
4view/templates/widget_forumlist.tpl
-
3view/theme/duepuntozero/style.css
-
3view/theme/duepuntozero/templates/profile_vcard.tpl
-
2view/theme/frost-mobile/style.css
-
3view/theme/frost/style.css
-
5view/theme/frost/templates/profile_vcard.tpl
-
2view/theme/quattro/dark/style.css
-
2view/theme/quattro/green/style.css
-
2view/theme/quattro/lilac/style.css
-
3view/theme/quattro/templates/profile_vcard.tpl
-
46view/theme/quattro/templates/widget_forumlist.tpl
-
6view/theme/smoothly/style.css
-
18view/theme/vier/style.css
-
3view/theme/vier/templates/profile_vcard.tpl
-
8view/theme/vier/templates/widget_forumlist_right.tpl
-
10view/theme/vier/theme.php
@ -1,38 +1,42 @@ |
|||
<div class="widget" id="group-sidebar"> |
|||
<h3>{{$title}}</h3> |
|||
<h3>{{$title}}</h3> |
|||
|
|||
<div id="sidebar-group-list"> |
|||
<ul role="menu" id="sidebar-group-ul"> |
|||
{{foreach $groups as $group}} |
|||
<li role="menuitem" class="sidebar-group-li group-{{$group.id}}"> |
|||
{{if $group.cid}} |
|||
<input type="checkbox" |
|||
class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" |
|||
onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" |
|||
{{if $group.ismember}}checked="checked"{{/if}} |
|||
/> |
|||
{{/if}} |
|||
{{if $group.edit}} |
|||
<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span></a> |
|||
{{/if}} |
|||
<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> |
|||
<span class="notify"></span> |
|||
</li> |
|||
{{/foreach}} |
|||
</ul> |
|||
<div id="sidebar-group-list"> |
|||
<ul role="menu" id="sidebar-group-ul"> |
|||
{{foreach $groups as $group}} |
|||
<li role="menuitem" class="sidebar-group-li group-{{$group.id}}"> |
|||
{{if ! $newgroup}}<span class="notify badge pull-right"></span>{{/if}} |
|||
{{if $group.cid}} |
|||
<input type="checkbox" |
|||
class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" |
|||
onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;" |
|||
{{if $group.ismember}}checked="checked"{{/if}} |
|||
/> |
|||
{{/if}} |
|||
{{if $group.edit}} |
|||
<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"> |
|||
<span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span> |
|||
</a> |
|||
{{/if}} |
|||
<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> |
|||
</li> |
|||
{{/foreach}} |
|||
</ul> |
|||
</div> |
|||
<div id="sidebar-new-group"> |
|||
<a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a> |
|||
<form id="group-new-form" action="group/new" method="post" style="display:none;"> |
|||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> |
|||
<input name="groupname" id="id_groupname" placeholder="{{$creategroup}}"> |
|||
</form> |
|||
</div> |
|||
{{if $ungrouped}} |
|||
<div id="sidebar-ungrouped"> |
|||
<a href="nogroup">{{$ungrouped}}</a> |
|||
</div> |
|||
{{/if}} |
|||
|
|||
{{if $newgroup}} |
|||
<div id="sidebar-new-group"> |
|||
<a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a> |
|||
<form id="group-new-form" action="group/new" method="post" style="display:none;"> |
|||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> |
|||
<input name="groupname" id="id_groupname" placeholder="{{$creategroup}}"> |
|||
</form> |
|||
</div> |
|||
{{else}} |
|||
<div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div> |
|||
{{/if}} |
|||
|
|||
{{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}} |
|||
</div> |
|||
|
|||
|
|||
@ -0,0 +1,46 @@ |
|||
<script> |
|||
|
|||
function showHideForumlist() { |
|||
if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) { |
|||
$("li[id^='forum-widget-entry-extended-']").hide(); |
|||
$("li#forum-widget-collapse").html(window.showMore); |
|||
|
|||
} |
|||
else { |
|||
$("li[id^='forum-widget-entry-extended-']").show(); |
|||
$("li#forum-widget-collapse").html(window.showFewer); |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<div id="forumlist-sidebar" class="widget"> |
|||
<h3 id="forumlist">{{$title}}</h3> |
|||
|
|||
<ul id="forumlist-sidbar-ul" role="menu"> |
|||
{{foreach $forums as $forum}} |
|||
{{if $forum.id <= $visible_forums}} |
|||
<li class="forum-widget-entry forum-{{$forum.cid}} tool {{if $forum.selected}}selected{{/if}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem"> |
|||
<span class="notify badge pull-right"></span> |
|||
<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank"> |
|||
<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" /> |
|||
</a> |
|||
<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a> |
|||
</li> |
|||
{{/if}} |
|||
|
|||
{{if $forum.id > $visible_forums}} |
|||
<li class="forum-widget-entry forum-{{$forum.cid}} tool {{if $forum.selected}}selected{{/if}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;"> |
|||
<span class="notify badge pull-right"></span> |
|||
<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank"> |
|||
<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" /> |
|||
</a> |
|||
<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a> |
|||
</li> |
|||
{{/if}} |
|||
{{/foreach}} |
|||
|
|||
{{if $total > $visible_forums }} |
|||
<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link fakelink tool">{{$showmore}}</li> |
|||
{{/if}} |
|||
</ul> |
|||
</div> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue