Merge pull request #3567 from rjm6823/develop

Contacts page directory link
This commit is contained in:
Tobias Diekershoff 2017-07-08 08:36:54 +02:00 committed by GitHub
commit d88584af69
4 changed files with 17 additions and 5 deletions

3
.gitignore vendored
View file

@ -54,3 +54,6 @@ venv/
#ignore git projects in vendor
vendor/**/.git
#ignore config files from JetBrains
/.idea

View file

@ -1,6 +1,7 @@
<?php
use Friendica\App;
use Friendica\Core\Config;
function follow_widget($value = "") {
@ -18,6 +19,7 @@ function findpeople_widget() {
require_once 'include/Contact.php';
$a = get_app();
$global_dir = Config::get('system', 'directory');
if (get_config('system', 'invitation_only')) {
$x = get_pconfig(local_user(), 'system', 'invites_remaining');
@ -37,7 +39,9 @@ function findpeople_widget() {
'$suggest' => t('Friend Suggestions'),
'$similar' => t('Similar Interests'),
'$random' => t('Random Profile'),
'$inv' => t('Invite Friends')
'$inv' => t('Invite Friends'),
'$directory' => t('View Global Directory'),
'$global_dir' => $global_dir
));
}

View file

@ -7,6 +7,7 @@
</form>
<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>
<div class="side-link" id="side-directory-link"><a href="{{$global_dir}}" target="extlink" >{{$directory}}</a></div>
<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div>
{{if $inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>

View file

@ -3057,7 +3057,8 @@ margin-left: 0px;
#side-invite-link,
#side-random-profile-link,
#side-suggest-link,
#side-match-link {
#side-match-link,
#side-directory-link {
width: 80%;
padding: 10px;
margin: auto;
@ -3079,7 +3080,8 @@ margin-left: 0px;
#side-invite-link:hover,
#side-random-profile-link:hover,
#side-suggest-link:hover,
#side-match-link:hover {
#side-match-link:hover,
#side-directory-link:hover {
color: #efefef;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@ -3098,7 +3100,8 @@ margin-left: 0px;
#side-invite-link:active,
#side-random-profile-link:active,
#side-suggest-link:active,
#side-match-link:active {
#side-match-link:active,
#side-directory-link:active {
background-color: #1873a2;
position: relative;
top: 1px;
@ -3107,7 +3110,8 @@ margin-left: 0px;
#side-invite-link a,
#side-random-profile-link a,
#side-suggest-link a,
#side-match-link a {
#side-match-link a,
#side-directory-link a {
color: #efefef;
}