mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
MDL-10107 Some new text for Messaging interface and some tips for Luis to continue with
This commit is contained in:
parent
b3a764134f
commit
14d70d26d2
@ -23,26 +23,26 @@ $string['emailtagline'] = 'This email is a copy of a message sent to you at \"$a
|
||||
$string['emptysearchstring'] = 'You must search for something';
|
||||
$string['formorethan'] = 'For more than';
|
||||
$string['includeblockedusers'] = 'Include blocked users';
|
||||
$string['incomingcontacts'] = 'Incoming Contacts ($a)';
|
||||
$string['incomingcontacts'] = 'Incoming contacts ($a)';
|
||||
$string['keywords'] = 'Keywords';
|
||||
$string['keywordssearchresults'] = 'Search results: $a messages found';
|
||||
$string['maxmessages'] = 'Maximum number of messages to show in the discussion history';
|
||||
$string['mailsent'] = 'Your message was sent via email.';
|
||||
$string['message'] = 'Message';
|
||||
$string['messagehistory'] = 'Message History';
|
||||
$string['messagehistory'] = 'Message history';
|
||||
$string['messages'] = 'Messages';
|
||||
$string['messaging'] = 'Messaging';
|
||||
$string['messagingdisabled'] = 'Messaging is disabled on this site, emails will be sent instead';
|
||||
$string['mycontacts'] = 'My Contacts';
|
||||
$string['mycontacts'] = 'My contacts';
|
||||
$string['newsearch'] = 'New search';
|
||||
$string['newonlymsg'] = 'Show only new';
|
||||
$string['nomessages'] = 'No messages waiting';
|
||||
$string['nomessagesfound'] = 'No messages were found';
|
||||
$string['nosearchresults'] = 'There were no results from your search';
|
||||
$string['offline'] = 'Offline';
|
||||
$string['offlinecontacts'] = 'Offline Contacts ($a)';
|
||||
$string['offlinecontacts'] = 'Offline contacts ($a)';
|
||||
$string['online'] = 'Online';
|
||||
$string['onlinecontacts'] = 'Online Contacts ($a)';
|
||||
$string['onlinecontacts'] = 'Online contacts ($a)';
|
||||
$string['onlyfromme'] = 'Only messages from me';
|
||||
$string['onlymycourses'] = 'Only in my courses';
|
||||
$string['onlytome'] = 'Only messages to me';
|
||||
@ -71,18 +71,18 @@ $string['userssearchresults'] = 'Search results: $a users found';
|
||||
$string['editmymessage'] = 'Messaging';
|
||||
$string['guestnoeditmessage'] = 'Guest user can not edit messaging options';
|
||||
$string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options';
|
||||
$string['loggedin'] = 'Logged In: ';
|
||||
$string['loggedoff'] = 'Logged Off: ';
|
||||
$string['private_config'] = 'Private Messaging Options';
|
||||
$string['providers_config'] = 'Message Sources';
|
||||
$string['processor_config'] = 'Destinations Configuration';
|
||||
$string['loggedin'] = 'Online';
|
||||
$string['loggedoff'] = 'Not online';
|
||||
$string['private_config'] = 'Popup message window';
|
||||
$string['providers_config'] = 'Message routing';
|
||||
$string['processor_config'] = 'Configure destinations';
|
||||
$string['showmessagewindow'] = 'Popup window on new message';
|
||||
$string['blocknoncontacts'] = 'Block unknown users';
|
||||
$string['beepnewmessage'] = 'Beep on new message';
|
||||
$string['noframesjs'] = 'No frames and JavaScript';
|
||||
$string['providerstag'] = 'Source: ';
|
||||
$string['processortag'] = 'Destination: ';
|
||||
$string['noframesjs'] = 'Use more accessible interface';
|
||||
$string['providerstag'] = 'Source';
|
||||
$string['processortag'] = 'Destination';
|
||||
$string['cannotsavemessageprefs'] = 'Could not save user messaging preferences';
|
||||
$string['messageprovider:instantmessage'] = 'User to User Instant Message';
|
||||
$string['messageprovider:instantmessage'] = 'Personal messages between users';
|
||||
|
||||
?>
|
||||
|
@ -1,3 +1,3 @@
|
||||
<?PHP // $Id$
|
||||
$string['email'] = 'e-mail';
|
||||
$string['email'] = 'Email';
|
||||
?>
|
||||
|
@ -1,3 +1,3 @@
|
||||
<?PHP // $Id$
|
||||
$string['jabber'] = 'Jabber Im';
|
||||
$string['jabber'] = 'Jabber message';
|
||||
?>
|
||||
|
@ -1,3 +1,3 @@
|
||||
<?PHP // $Id$
|
||||
$string['popup'] = 'Html Im Window';
|
||||
$string['popup'] = 'Popup window';
|
||||
?>
|
||||
|
@ -205,17 +205,21 @@ $currenttab = 'editmessage';
|
||||
require('../user/tabs.php');
|
||||
|
||||
echo '<form method="post" action="'.$CFG->wwwroot.'/message/edit.php">';
|
||||
echo '<table width="80%" class="userinfobox">';
|
||||
|
||||
echo '<div class="generalbox">';
|
||||
echo '<table>';
|
||||
echo '<tr><td colspan="2"><h3>'.get_string('private_config', 'message').'</h3></td></tr>';
|
||||
echo '<tr><td>'.get_string('showmessagewindow', 'message').'</td><td><input type="checkbox" name="showmessagewindow" '.($preferences->showmessagewindow==1?" checked=\"checked\"":"").' /></td></tr>';
|
||||
echo '<tr><td>'.get_string('blocknoncontacts', 'message').'</td><td><input type="checkbox" name="blocknoncontacts" '.($preferences->blocknoncontacts==1?" checked=\"checked\"":"").' /></td></tr>';
|
||||
echo '<tr><td>'.get_string('beepnewmessage', 'message').'</td><td><input type="checkbox" name="beepnewmessage" '.($preferences->beepnewmessage==1?" checked=\"checked\"":"").' /></td></tr>';
|
||||
echo '<tr><td>'.get_string('noframesjs', 'message').'</td><td><input type="checkbox" name="noframesjs" '.($preferences->noframesjs==1?" checked=\"checked\"":"").' /></td></tr>';
|
||||
echo '</table>';
|
||||
echo '</div>';
|
||||
|
||||
//output settings table
|
||||
echo '<table width="80%" class="userinfobox">';
|
||||
echo '<tr><td><h3>Message Sources</h3></td></tr>'."\n";
|
||||
echo '<div class="generalbox">';
|
||||
echo '<table>';
|
||||
echo '<tr><td><h3>'.get_string('providers_config', 'message').'</h3></td></tr>'."\n";
|
||||
$providers = message_get_my_providers();
|
||||
$processors = $DB->get_records('message_processors');
|
||||
$number_procs = count($processors);
|
||||
@ -224,6 +228,11 @@ foreach ( $processors as $processorid => $processor){
|
||||
echo '<td align="center" style="width:120px">'.get_string($processor->name, 'messageprocessor_'.$processor->name).'</td>';
|
||||
}
|
||||
echo '</tr>';
|
||||
|
||||
/// TODO: (from martin)
|
||||
/// 1) Can we show the popuyp first (it's the default and always there)
|
||||
/// 2) Can we NOT show plugins here unless they have been configured in the section below
|
||||
|
||||
foreach ( $providers as $providerid => $provider){
|
||||
$providername = get_string('messageprovider:'.$provider->name, $provider->component);
|
||||
echo '<tr><td align="right">'.$providername.'</td><td colspan="'.$number_procs.'"></td></tr>'."\n";
|
||||
@ -245,12 +254,17 @@ foreach ( $providers as $providerid => $provider){
|
||||
}
|
||||
echo '</table>';
|
||||
echo '</td></tr></table>';
|
||||
echo '</div>';
|
||||
|
||||
//
|
||||
echo '<table width="80%" class="userinfobox">';
|
||||
echo '<div class="generalbox">';
|
||||
echo '<table>';
|
||||
echo '<tr><td colspan="2"><h3>'.get_string('processor_config', 'message').'</h3></td></tr>'."\n";
|
||||
//get a listing of all the message processors
|
||||
$processors = $DB->get_records('message_processors');
|
||||
|
||||
/// TODO: (from martin)
|
||||
/// 1) For email plugin, if the email is blank can we make it default to profile email address? Show this to use by adding "Default: martin@moodle.com" after the actual field for setting a new one.
|
||||
|
||||
foreach ( $processors as $processorid => $processor){
|
||||
$processorfile = $CFG->dirroot. '/message/output/'.$processor->name.'/message_output_'.$processor->name.'.php';
|
||||
if ( is_readable($processorfile) ) {
|
||||
@ -265,6 +279,8 @@ foreach ( $processors as $processorid => $processor){
|
||||
}
|
||||
}
|
||||
echo '</table>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<p><input type="hidden" name="sesskey" value="'.sesskey().'" /> </p>';
|
||||
echo '<div style="text-align:center"><input name="submit" value="'. get_string('updatemyprofile') .'" type="submit" /></div>';
|
||||
|
||||
@ -274,4 +290,3 @@ echo "</form>";
|
||||
print_footer($course);
|
||||
|
||||
?>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user