1
1
Fork 0

Merge remote-tracking branch 'upstream/develop' into 1606-database

This commit is contained in:
Michael Vogel 2016-06-07 06:12:28 +02:00
commit c7ab2d2482
6 changed files with 111 additions and 3 deletions

View file

@ -65,7 +65,7 @@ if(!$install) {
if ($processlist["amount"] > $max_processes) {
logger("Processcheck: Maximum number of processes for frontend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
return;
system_unavailable();
}
}

View file

@ -929,6 +929,28 @@ aside .vcard #wallmessage-link {
width: 100%;
}
aside #peoplefind-sidebar input,
aside #follow-sidebar input {
height: 30px;
background-position: 10px 5px;
}
aside #peoplefind-sidebar .form-group-search .form-button-search,
aside #follow-sidebar .form-group-search .form-button-search {
padding: 2px 8px;
}
aside #group-sidebar .group-edit-tool {
opacity: 0.1;
transition: all 0.25s ease-in-out;
}
aside #group-sidebar .sidebar-group-li:hover .group-edit-tool {
opacity: 0.8;
transition: all 0.25s ease-in-out;
}
aside #group-sidebar .sidebar-group-li .group-edit-tool:hover {
opacity: 1;
}
/* contact block widget */
#contact-block .contact-block-content {
clear: both;
@ -1627,7 +1649,7 @@ ul.dropdown-menu li:hover {
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
.events-content-wrapper, .message-content-wrapper, .apps-content-wrapper,
.notifications-content-wrapper, .admin-content-wrapper {
.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
min-height: calc(100vh - 150px);
padding: 15px;
padding-bottom: 20px;

View file

@ -86,7 +86,7 @@ $(document).ready(function(){
}
}
}, 500);
}).on("mouseleave", ".userinfo", function(e) { // action when mouse leaves the hover-card
}).on("mouseleave", ".userinfo, .wall-item-responses a, .wall-item-bottom .mention a", function(e) { // action when mouse leaves the hover-card
var timeNow = new Date().getTime();
// copy the original title to the title atribute
var title = $(this).attr("data-orig-title");

View file

@ -0,0 +1,14 @@
<div id="follow-sidebar" class="widget">
<h3>{{$connect}}</h3>
<div id="connect-desc">{{$desc}}</div> {{* The description *}}
<form action="follow" method="get" >
{{* The input field - For visual consistence we are using a search input field*}}
<div class="form-group form-group-search">
<input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value|escape:'html'}}" placeholder="{{$hint|escape:'html'}}" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
<button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$follow|escape:'html'}}">{{$follow}}</button>
</div>
</form>
</div>

View file

@ -0,0 +1,49 @@
<div class="widget" id="group-sidebar">
<h3>{{$title}}</h3>
<div id="sidebar-group-list">
{{* The list of available groups *}}
<ul role="menu" id="sidebar-group-ul">
{{foreach $groups as $group}}
<li role="menuitem" class="sidebar-group-li group-{{$group.id}} {{if $group.selected}}selected{{/if}}">
{{if ! $newgroup}}<span class="notify badge pull-right"></span>{{/if}}
{{if $group.cid}}
<div class="checkbox pull-right group-checkbox ">
<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}}
/>
<label for="group-{{$group.id}}"></label>
<div class="clearfix"></div>
</div>
{{/if}}
{{if $group.edit}}
{{* if the group is editable show a little pencil for editing *}}
<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right" href="{{$group.edit.href}}" title="{{$edittext}}">
<i class="faded-icon fa fa-pencil" aria-hidden="true"></i><span class="sr-only">{{$edittext}}</span>
</a>
{{/if}}
<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element" href="{{$group.href}}">{{$group.text}}</a>
</li>
{{/foreach}}
</ul>
</div>
{{if $newgroup}}
<div id="sidebar-new-group">
{{* show the input field by clicking "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;">
<div class="form-group">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
</div>
</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>

View file

@ -0,0 +1,23 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
<div id="peoplefind-desc">{{$desc}}</div> {{* The description *}}
<form action="dirfind" method="get" />
{{* The search field *}}
<div class="form-group form-group-search">
<input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
<button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$findthem|escape:'html'}}">{{$findthem}}</button>
</div>
</form>
{{* Additional links *}}
<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
{{if $inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
{{/if}}
</div>