From 255f38710cc524e887e64ca649de8ace9a10e9e6 Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 14:19:58 -0400 Subject: [PATCH 1/6] Added global directory link to the find people side panel --- .gitignore | 3 +++ include/contact_widgets.php | 3 ++- view/templates/peoplefind.tpl | 1 + view/theme/smoothly/style.css | 12 ++++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cd299f2d85..374fbc532c 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ venv/ #ignore git projects in vendor vendor/**/.git + +#ignore config files from JetBrains +/.idea \ No newline at end of file diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3cd18c7792..b40e5cc4ed 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -37,7 +37,8 @@ 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') )); } diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 45c4c0b622..0d1c6c79ba 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,6 +7,7 @@ + {{if $inv}} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ec52277bdd..07fc3ed895 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -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; } From b7b8c5477b496ff2787e7f30c9f1fd0d7b604425 Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 15:27:03 -0400 Subject: [PATCH 2/6] Converted from space to tab indentation --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index b40e5cc4ed..6a9f5ec1b7 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -38,7 +38,7 @@ function findpeople_widget() { '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - 'directory' => t('View Global Directory') + 'directory' => t('View Global Directory') )); } From 7593152bcb79cf8f8eefd23a0db59b08eb3324cf Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 16:37:55 -0400 Subject: [PATCH 3/6] re-named variable to match scheme --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 6a9f5ec1b7..fc1f7191ba 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -38,7 +38,7 @@ function findpeople_widget() { '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - 'directory' => t('View Global Directory') + '$directory' => t('View Global Directory') )); } From c4b40babb0ea22504fd3b5cbcdbb8efc02e9bce3 Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 17:31:36 -0400 Subject: [PATCH 4/6] Switched to proper global directory instead of local directory --- include/contact_widgets.php | 5 ++++- view/templates/peoplefind.tpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index fc1f7191ba..14cb13cdee 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,6 +1,7 @@ t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - '$directory' => t('View Global Directory') + '$directory' => t('View Global Directory'), + '$global_dir' => $global_dir )); } diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 0d1c6c79ba..6cbe42e737 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,7 +7,7 @@ - + {{if $inv}} From d7de2e0750ba890df2c3672d3e520e562e8eda9e Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 17:33:30 -0400 Subject: [PATCH 5/6] Fixed minor spaces to tabs conversion --- include/contact_widgets.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 14cb13cdee..0b82fcb8f3 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -19,7 +19,7 @@ function findpeople_widget() { require_once 'include/Contact.php'; $a = get_app(); - $global_dir = Config::get('system', 'directory'); + $global_dir = Config::get('system', 'directory'); if (get_config('system', 'invitation_only')) { $x = get_pconfig(local_user(), 'system', 'invites_remaining'); @@ -41,7 +41,7 @@ function findpeople_widget() { '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), '$directory' => t('View Global Directory'), - '$global_dir' => $global_dir + '$global_dir' => $global_dir )); } From fec2f8fd8259db66d5dcf700e8e855acad596d1b Mon Sep 17 00:00:00 2001 From: RJ Madsen Date: Thu, 6 Jul 2017 17:56:18 -0400 Subject: [PATCH 6/6] Replacing quotes around new directory link --- view/templates/peoplefind.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 6cbe42e737..481bdd71e0 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,7 +7,7 @@ - + {{if $inv}}