From 14d70d26d2380c81a05042b299a720cacd2ce8db Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 23 Sep 2008 02:27:57 +0000 Subject: [PATCH] MDL-10107 Some new text for Messaging interface and some tips for Luis to continue with --- lang/en_utf8/message.php | 28 ++++++++++++------------ lang/en_utf8/messageprocessor_email.php | 2 +- lang/en_utf8/messageprocessor_jabber.php | 2 +- lang/en_utf8/messageprocessor_popup.php | 2 +- message/edit.php | 27 ++++++++++++++++++----- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/lang/en_utf8/message.php b/lang/en_utf8/message.php index 985bad91ec..5f63f013ff 100644 --- a/lang/en_utf8/message.php +++ b/lang/en_utf8/message.php @@ -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'; ?> diff --git a/lang/en_utf8/messageprocessor_email.php b/lang/en_utf8/messageprocessor_email.php index 6fb3e1dc02..7c7faeb855 100644 --- a/lang/en_utf8/messageprocessor_email.php +++ b/lang/en_utf8/messageprocessor_email.php @@ -1,3 +1,3 @@ diff --git a/lang/en_utf8/messageprocessor_jabber.php b/lang/en_utf8/messageprocessor_jabber.php index 84eb75b6a3..22ebe0b324 100644 --- a/lang/en_utf8/messageprocessor_jabber.php +++ b/lang/en_utf8/messageprocessor_jabber.php @@ -1,3 +1,3 @@ diff --git a/lang/en_utf8/messageprocessor_popup.php b/lang/en_utf8/messageprocessor_popup.php index c2b27b7326..424d5de5d4 100644 --- a/lang/en_utf8/messageprocessor_popup.php +++ b/lang/en_utf8/messageprocessor_popup.php @@ -1,3 +1,3 @@ diff --git a/message/edit.php b/message/edit.php index 4d012bc727..fc6a8b160e 100644 --- a/message/edit.php +++ b/message/edit.php @@ -205,17 +205,21 @@ $currenttab = 'editmessage'; require('../user/tabs.php'); echo '
'; -echo ''; + +echo '
'; +echo '
'; echo ''; echo ''; echo ''; echo ''; echo ''; echo '

'.get_string('private_config', 'message').'

'.get_string('showmessagewindow', 'message').'showmessagewindow==1?" checked=\"checked\"":"").' />
'.get_string('blocknoncontacts', 'message').'blocknoncontacts==1?" checked=\"checked\"":"").' />
'.get_string('beepnewmessage', 'message').'beepnewmessage==1?" checked=\"checked\"":"").' />
'.get_string('noframesjs', 'message').'noframesjs==1?" checked=\"checked\"":"").' />
'; +echo ''; //output settings table -echo ''; -echo ''."\n"; +echo '
'; +echo '

Message Sources

'; +echo ''."\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 ''; } echo ''; + +/// 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 ''."\n"; @@ -245,12 +254,17 @@ foreach ( $providers as $providerid => $provider){ } echo '

'.get_string('providers_config', 'message').'

'.get_string($processor->name, 'messageprocessor_'.$processor->name).'
'.$providername.'
'; echo ''; +echo ''; -// -echo ''; +echo '
'; +echo '
'; echo ''."\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 '

'.get_string('processor_config', 'message').'

'; +echo ''; + echo '

'; echo '
'; @@ -274,4 +290,3 @@ echo "
"; print_footer($course); ?> - -- 2.39.5