Commit 82d4a700 authored by Kristina Hoeppner's avatar Kristina Hoeppner

Bug 1667525: Rename "Find friends" to "Find people"

This makes it less ambigious who you are searching for.
With "Find friends" you can think that you can only
find existing friends. However, you can actually also
just use the search to find people without having to
add them as a friend, e.g. to find portfolios of them
more quickly.

Change-Id: I066569a2a37c0e7b4f15ad2ad56010bdf3ba2bc3
parent 89940fc7
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Find friends</h3>
<p>This page lets you search for users to add as friends. Depending on their friendship control settings, you may be automatically accepted as their friend or you may need to send a friendship request. Some users may not allow friendship requests at all.</p>
<p>When sending a friendship request, you can choose to include a short message introducing yourself. This is especially important if you have a display name set as others will not see your real name.</p>
<h3>Find people</h3>
<p>This page lets you search for users to add as friends or simply to find
their profile page. Depending on their friendship control settings, you may
be automatically accepted as their friend or you may need to send a
friendship request. Some users may not allow friendship requests at all.</p>
<p>When sending a friendship request, you can choose to include a short message
introducing yourself. This is especially important if you have a display name
set as others will not see your real name.</p>
......@@ -682,7 +682,7 @@ $string['Content'] = 'Content';
$string['myportfolio'] = 'Portfolio';
$string['settings'] = 'Settings';
$string['myfriends'] = 'My friends';
$string['findfriends'] = 'Find friends';
$string['findpeople'] = 'Find people';
$string['groups'] = 'Groups';
$string['mygroups'] = 'My groups';
$string['findgroups'] = 'Find groups';
......
......@@ -2933,7 +2933,7 @@ function mahara_standard_nav() {
'groups/findfriends' => array(
'path' => 'groups/findfriends',
'url' => 'user/find.php',
'title' => get_string('findfriends'),
'title' => get_string('findpeople'),
'weight' => 40,
),
'groups/institutionmembership' => array(
......
......@@ -12,4 +12,4 @@
defined('INTERNAL') || die();
$string['exactusersearch'] = 'Exact user searches';
$string['exactusersearchdescription2'] = 'Results from the "Search users" box and "Find friends" page are only returned for users whose profile fields match entire search terms.';
$string['exactusersearchdescription3'] = 'Results from the "Search users" box and "Find people" page are only returned for users whose profile fields match entire search terms.';
......@@ -42,7 +42,7 @@ class PluginSearchInternal extends PluginSearch {
'elements' => array(
'exactusersearch' => array(
'title' => get_string('exactusersearch', 'search.internal'),
'description' => get_string('exactusersearchdescription2', 'search.internal'),
'description' => get_string('exactusersearchdescription3', 'search.internal'),
'help' => true,
'type' => 'switchbox',
'defaultvalue' => get_config_plugin('search', 'internal', 'exactusersearch'),
......
......@@ -12,7 +12,7 @@
define('INTERNAL', 1);
define('MENUITEM', 'groups/findfriends');
require(dirname(dirname(__FILE__)) . '/init.php');
define('TITLE', get_string('findfriends'));
define('TITLE', get_string('findpeople'));
require_once('searchlib.php');
safe_require('search', 'internal');
define('SECTION_PLUGINTYPE', 'core');
......
......@@ -43,7 +43,7 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
# Checking Groups Menus and submenu
And I choose "Find groups" in "Groups" from main menu
And I choose "My friends" in "Groups" from main menu
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I choose "Institution membership" in "Groups" from main menu
And I choose "Topics" in "Groups" from main menu
# Checking messages
......@@ -112,4 +112,4 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
# The test should be completed once if Return to site works successfully
And I click on "Show Menu"
And I follow "Dashboard"
And I should see "Admin User"
\ No newline at end of file
And I should see "Admin User"
......@@ -12,7 +12,7 @@ Background:
Scenario: Wall post notifications
The wall post must generate a notification (Bug 547333)
Given I log in as "userB" with password "Kupuhipa1"
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Pete Mc"
And I scroll to the base of id "wall-wrap"
And I set the field "Post" to "Hello"
......
......@@ -10,7 +10,7 @@
| userA | Kupuhipa1 | test01@example.com | Pete | Mc | mahara | internal | member |
| userB | Kupuhipa1 | test02@example.com | Paul | Mc | mahara | internal | member |
Given I log in as "userB" with password "Kupuhipa1"
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Pete Mc (userA)"
And I follow "Request friendship"
And I fill in "Message" with "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent sed aliquet mauris. Nam et semper velit. Vestibulum porta dictum aliquet. Curabitur venenatis gravida nibh, ac consectetur risus pellentesque quis. Vivamus vitae erat sit amet augue interdum fermentum id ut arcu. Aliquam est lectus, iaculis a vulputate sed, tristique et nunc."
......
@javascript @core core_messages
Feature: Edit group membership
In order to edit group membership
As an admin I can edit membership via the 'Find friends' page
As an admin I can edit membership via the 'Find people' page
Background:
Given the following "users" exist:
......@@ -25,10 +25,10 @@ And the following "groups" exist:
| GroupB | admin | This is group B | standard | ON | ON | all | ON | ON | User3, User4 | |
Scenario: Check modal is working for the "Edit group memebership" on find friends page (Bug 1513265)
Scenario: Check modal is working for the "Edit group memebership" on find people page (Bug 1513265)
# Log in as "Admin" user
Given I log in as "admin" with password "Kupuhipa1"
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "2" in the "div#friendslist_pagination" "css_element"
And I follow "Edit group membership"
Then I should see "Apply changes"
......@@ -16,7 +16,7 @@ Scenario: Sending messages between user and admin (Bug 1426983)
# Verifying log in was successful
And I should see "Admin User"
# Sending message 1
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Bob"
And I follow "Send message"
And I fill in the following:
......@@ -24,7 +24,7 @@ Scenario: Sending messages between user and admin (Bug 1426983)
| Message | This is a test message |
And I press "Send message"
# Sending message 2
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Bob"
And I follow "Send message"
And I fill in the following:
......@@ -32,14 +32,14 @@ Scenario: Sending messages between user and admin (Bug 1426983)
| Message | This is a test message2 |
And I press "Send message"
# Sending message 3
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Bob"
And I follow "Send message"
And I fill in the following:
| Subject | Hi there3 |
| Message | This is a test message3 |
And I press "Send message"
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I follow "Bob"
And I follow "Request friendship"
And I fill in the following:
......
@javascript @core @core_user @core_portfolio @friends
Feature: Searching for users in the "Find friends" page
In order to search by name on the "Find friends" page
Feature: Searching for users in the "Find people" page
In order to search by name on the "Find people" page
So I can befriend them or send them messages
Background:
......@@ -17,7 +17,7 @@ Background:
Scenario: Find users in your institution and outside your institution
# Log in as a user
Given I log in as "bob" with password "mahara1"
And I choose "Find friends" in "Groups" from main menu
And I choose "Find people" in "Groups" from main menu
And I wait "1" seconds
# Searching within my own institution, I should only find users in my institution
......
......@@ -54,7 +54,7 @@ Scenario: Checking menu items are available as a student (Bug 1467368)
Then I should see "My groups" in the ".groups" "css_element"
And I should see "Find groups" in the ".groups" "css_element"
And I should see "My friends" in the ".groups" "css_element"
And I should see "Find friends" in the ".groups" "css_element"
And I should see "Find people" in the ".groups" "css_element"
And I should see "Institution membership" in the ".groups" "css_element"
And I should see "Topics" in the ".groups" "css_element"
......
......@@ -23,7 +23,7 @@
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Find friends</td>
<td>link=Find people</td>
<td></td>
</tr>
<tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment