[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface coursecatalog.pm lonaboutme.pm lonannounce.pm loncoursegroups.pm lonindexer.pm lonmsgdisplay.pm lonnavdisplay.pm lonpreferences.pm lonquickgrades.pm lonremote.pm lonrss.pm lonsearchcat.pm portfolio.pm
schafran
schafran@source.lon-capa.org
Thu, 26 Feb 2009 16:17:33 -0000
This is a MIME encoded message
--schafran1235665053
Content-Type: text/plain
schafran Thu Feb 26 16:17:33 2009 EDT
Modified files:
/loncom/interface lonannounce.pm lonmsgdisplay.pm
loncoursegroups.pm lonrss.pm portfolio.pm
lonpreferences.pm lonaboutme.pm lonremote.pm
lonsearchcat.pm lonquickgrades.pm
lonnavdisplay.pm coursecatalog.pm lonindexer.pm
/loncom/auth lonroles.pm
Log:
Box title is now the main title of the next page and the link text or the former page title will be set to the subtitle in the near future.
Group: consistent wording
--schafran1235665053
Content-Type: text/plain
Content-Disposition: attachment; filename="schafran-20090226161733.txt"
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.76 loncom/interface/lonannounce.pm:1.77
--- loncom/interface/lonannounce.pm:1.76 Mon Dec 15 16:37:44 2008
+++ loncom/interface/lonannounce.pm Thu Feb 26 16:17:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.76 2008/12/15 16:37:44 raeburn Exp $
+# $Id: lonannounce.pm,v 1.77 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -539,7 +539,7 @@
'<font size="1">');
} else {
my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
- $r->print(&Apache::loncommon::start_page("Announcements and Calendar",$js,{'bread_crumbs' => $brcrum}));
+ $r->print(&Apache::loncommon::start_page("Communication",$js,{'bread_crumbs' => $brcrum}));
}
# does this user have privileges to post, etc?
my $allowed=0;
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.115 loncom/interface/lonmsgdisplay.pm:1.116
--- loncom/interface/lonmsgdisplay.pm:1.115 Wed Feb 25 16:39:54 2009
+++ loncom/interface/lonmsgdisplay.pm Thu Feb 26 16:17:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.115 2009/02/25 16:39:54 hauer Exp $
+# $Id: lonmsgdisplay.pm,v 1.116 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2802,15 +2802,14 @@
sub header {
my ($r,$title,$baseurl)=@_;
-
my $extra = &Apache::loncommon::studentbrowser_javascript();
if ($baseurl) {
$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
}
- $r->print(&Apache::loncommon::start_page('Communication and Messages',
+ $r->print(&Apache::loncommon::start_page('Communication',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
- (($title?$title:'Communication and Messages')));
+ (($title?$title:'Send and Receive Messages')));
}
# ---------------------------------------------------------------- Print header
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.94 loncom/interface/loncoursegroups.pm:1.95
--- loncom/interface/loncoursegroups.pm:1.94 Wed Feb 25 16:39:54 2009
+++ loncom/interface/loncoursegroups.pm Thu Feb 26 16:17:29 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.94 2009/02/25 16:39:54 hauer Exp $
+# $Id: loncoursegroups.pm,v 1.95 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -141,7 +141,7 @@
rosterbrowser = open(url,title,options,'1');
rosterbrowser.focus();
}\n|;
- $r->print(&header('Groups',$jscript,$action,$state));
+ $r->print(&header('My Space',$jscript,$action,$state));
if ($env{'form.refpage'} eq 'cusr') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",
Index: loncom/interface/lonrss.pm
diff -u loncom/interface/lonrss.pm:1.45 loncom/interface/lonrss.pm:1.46
--- loncom/interface/lonrss.pm:1.45 Tue Feb 10 09:30:16 2009
+++ loncom/interface/lonrss.pm Thu Feb 26 16:17:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.45 2009/02/10 09:30:16 schafran Exp $
+# $Id: lonrss.pm,v 1.46 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -322,8 +322,8 @@
}
}
if ($html) {
- my $title = $displayfeedname?$displayfeedname
- :"Available RSS Feeds and Blogs";
+# my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
+ my $title = "My Space";
my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
$r->print(&Apache::loncommon::start_page($title,$rss_link,
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.210 loncom/interface/portfolio.pm:1.211
--- loncom/interface/portfolio.pm:1.210 Thu Feb 19 11:03:42 2009
+++ loncom/interface/portfolio.pm Thu Feb 26 16:17:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.210 2009/02/19 11:03:42 weissno Exp $
+# $Id: portfolio.pm,v 1.211 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2273,7 +2273,7 @@
} else {
($uname,$udom) = &get_name_dom();
$portfolio_root = &get_portfolio_root();
- $title = &mt('Portfolio Manager');
+ $title = &mt('My Space');
$can_modify = 1;
$can_delete = 1;
$can_upload = 1;
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.146 loncom/interface/lonpreferences.pm:1.147
--- loncom/interface/lonpreferences.pm:1.146 Tue Feb 24 16:16:35 2009
+++ loncom/interface/lonpreferences.pm Thu Feb 26 16:17:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.146 2009/02/24 16:16:35 hauer Exp $
+# $Id: lonpreferences.pm,v 1.147 2009/02/26 16:17:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -101,7 +101,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changewysiwyg',
text => 'Change WYSIWYG Preferences'});
- $r->print(Apache::loncommon::start_page('Change WYSIWYG Preferences'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change WYSIWYG Preferences'));
my %userenv = &Apache::lonnet::get
@@ -149,7 +149,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changelanguages',
text => 'Change Language'});
- $r->print(Apache::loncommon::start_page('Change Language'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -208,7 +208,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changetexenginepref',
text => 'Change How Math Equations Are Displayed'});
- $r->print(Apache::loncommon::start_page('Change How Math Equations Are Displayed'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -332,7 +332,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changerolespref',
text => 'Change '.$role.' Page Pref'});
- $r->print(Apache::loncommon::start_page('Change '.$role.' Page Pref'));
+ $r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));
my $hotlist_flag=$userenv{'recentroles'};
my $hotlist_n=$userenv{'recentrolesn'};
@@ -519,7 +519,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changescreenname',
text => 'Change Screen Name'});
- $r->print(Apache::loncommon::start_page('Change Screen Name'));
+ $r->print(Apache::loncommon::start_page('Personal Data'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Screen Name'));
$r->print('<p>'
.&mt('Change the name that is displayed in your posts.')
@@ -587,7 +587,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changeicons',
text => 'Change Main Menu'});
- $r->print(Apache::loncommon::start_page('Change Main Menu'));
+ $r->print(Apache::loncommon::start_page('Page Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
my $user = $env{'user.name'};
@@ -641,7 +641,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changeclicker',
text => 'Register Clicker'});
- $r->print(Apache::loncommon::start_page('Register Clicker'));
+ $r->print(Apache::loncommon::start_page('Other'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Register Clicker'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -789,7 +789,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',
text => 'Change Message Forwarding/Notification'});
- $r->print(Apache::loncommon::start_page('Change Message Forwarding/Notification'));
+ $r->print(Apache::loncommon::start_page('Message Management'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
@@ -1089,7 +1089,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changecolors',
text => 'Change Colors'});
- $r->print(Apache::loncommon::start_page('Change Colors'));
+ $r->print(Apache::loncommon::start_page('Page Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Colors'));
# figure out colors
my $function=&Apache::loncommon::get_users_function();
@@ -1216,7 +1216,7 @@
{ href => '/adm/preferences?action=changepass',
text => 'Change Password'});
unless ($caller eq 'reset_by_email') {
- $r->print(Apache::loncommon::start_page('Change Password'));
+ $r->print(Apache::loncommon::start_page('Personal Data'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
}
if ((!defined($caller)) || ($caller eq 'preferences')) {
@@ -1582,7 +1582,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changediscussions',
text => 'Change Discussion Preferences'});
- $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
+ $r->print(Apache::loncommon::start_page('Message Management'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -1984,7 +1984,7 @@
});
}
- $r->print(&Apache::loncommon::start_page('Change Preferences'));
+ $r->print(&Apache::loncommon::start_page('My Space'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));
$r->print($message);
$r->print(Apache::lonhtmlcommon::generate_menu(@menu));
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.105 loncom/interface/lonaboutme.pm:1.106
--- loncom/interface/lonaboutme.pm:1.105 Wed Feb 25 13:25:52 2009
+++ loncom/interface/lonaboutme.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.105 2009/02/25 13:25:52 neumanie Exp $
+# $Id: lonaboutme.pm,v 1.106 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -216,7 +216,7 @@
}
$args->{'bread_crumbs'} = [{href=>"/adm/fhwfdev/$cnum/aboutme",text=>"Personal Information Page"}];
my $start_page =
- &Apache::loncommon::start_page("Personal Information Page",$rss_link,$args);
+ &Apache::loncommon::start_page("Personal Data",$rss_link,$args);
$r->print($start_page);
}
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.26 loncom/interface/lonremote.pm:1.27
--- loncom/interface/lonremote.pm:1.26 Mon Dec 15 16:37:44 2008
+++ loncom/interface/lonremote.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonremote.pm,v 1.26 2008/12/15 16:37:44 raeburn Exp $
+# $Id: lonremote.pm,v 1.27 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,7 +43,7 @@
# -------------------------------------------------------- Menu script and info
my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
- my $start_page = &Apache::loncommon::start_page('Remote Control',
+ my $start_page = &Apache::loncommon::start_page('Page Display Settings',
$startupremote);
my $end_page = &Apache::loncommon::end_page();
my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.304 loncom/interface/lonsearchcat.pm:1.305
--- loncom/interface/lonsearchcat.pm:1.304 Tue Feb 10 09:30:16 2009
+++ loncom/interface/lonsearchcat.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.304 2009/02/10 09:30:16 schafran Exp $
+# $Id: lonsearchcat.pm,v 1.305 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -690,7 +690,7 @@
my $bread_crumb =
&Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
$env{'form.catalogmode'} ne 'import');
- my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
+ my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
# Search form for resource space
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
$scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.46 loncom/interface/lonquickgrades.pm:1.47
--- loncom/interface/lonquickgrades.pm:1.46 Mon Dec 15 16:37:44 2008
+++ loncom/interface/lonquickgrades.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.46 2008/12/15 16:37:44 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.47 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -81,7 +81,7 @@
my $res = $navmap->firstResource(); # temp resource to access constants
# Header
- my $title = $showPoints ? "Points Display" : "Completed Problems Display";
+ my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
$r->print(&Apache::loncommon::start_page($title,undef,
{'bread_crumbs' => $brcrum})
Index: loncom/interface/lonnavdisplay.pm
diff -u loncom/interface/lonnavdisplay.pm:1.5 loncom/interface/lonnavdisplay.pm:1.6
--- loncom/interface/lonnavdisplay.pm:1.5 Mon Oct 20 03:25:49 2008
+++ loncom/interface/lonnavdisplay.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavdisplay.pm,v 1.5 2008/10/20 03:25:49 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.6 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -155,8 +155,8 @@
# Header
my $course_type = &Apache::loncommon::course_type();
- $r->print(&Apache::loncommon::start_page('Navigate '.$course_type.
- ' Contents',
+ $r->print(&Apache::loncommon::start_page(#'Navigate '.$course_type.
+ 'Course Contents',
$js,
{'only_body' => $body_only,
'force_register' =>
Index: loncom/interface/coursecatalog.pm
diff -u loncom/interface/coursecatalog.pm:1.48 loncom/interface/coursecatalog.pm:1.49
--- loncom/interface/coursecatalog.pm:1.48 Sat Feb 7 22:03:45 2009
+++ loncom/interface/coursecatalog.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.48 2009/02/07 22:03:45 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.49 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -376,7 +376,7 @@
sub cat_header {
my ($r,$codedom,$js,$add_entries,$catlinks,$numtitles) = @_;
my $start_page =
- &Apache::loncommon::start_page('Course Catalog',$js,
+ &Apache::loncommon::start_page('Other',$js,
{
'add_entries' => $add_entries,
'no_inline_link' => 1,});
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.188 loncom/interface/lonindexer.pm:1.189
--- loncom/interface/lonindexer.pm:1.188 Wed Feb 11 15:40:33 2009
+++ loncom/interface/lonindexer.pm Thu Feb 26 16:17:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.188 2009/02/11 15:40:33 jms Exp $
+# $Id: lonindexer.pm,v 1.189 2009/02/26 16:17:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -409,7 +409,7 @@
ENDHEADER
my ($headerdom)=($uri=~m{^/res/($match_domain)/});
- $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
+ $r->print(&Apache::loncommon::start_page('Content Library',$js,
{'domain' => $headerdom,}));
# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.216 loncom/auth/lonroles.pm:1.217
--- loncom/auth/lonroles.pm:1.216 Mon Feb 9 04:14:03 2009
+++ loncom/auth/lonroles.pm Thu Feb 26 16:17:33 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.216 2009/02/09 04:14:03 raeburn Exp $
+# $Id: lonroles.pm,v 1.217 2009/02/26 16:17:33 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -537,7 +537,7 @@
my $brcrum =[{href=>"/admm/roles",text=>"User Roles"}];
my $swinfo=&Apache::lonmenu::rawconfig();
- my $start_page=&Apache::loncommon::start_page('User Roles',undef,{bread_crumbs=>$brcrum});
+ my $start_page=&Apache::loncommon::start_page('My Roles',undef,{bread_crumbs=>$brcrum});
my $standby=&mt('Role selected. Please stand by.');
$standby=~s/\n/\\n/g;
my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
--schafran1235665053--