[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Annotation.tex /html/res/adm/pages menu.html /html/res/adm/pages/annotator admannotations.pm /html/res/adm/pages/bookmarkmenu bookmarklib.js /interface loncoursegroups.pm lonhelper.pm lonmenu.pm lonparmset.pm lonpreferences.pm
schafran
schafran@source.lon-capa.org
Fri, 13 Feb 2009 20:20:30 -0000
This is a MIME encoded message
--schafran1234556430
Content-Type: text/plain
schafran Fri Feb 13 20:20:30 2009 EDT
Modified files:
/loncom/html/adm/help/tex Annotation.tex
/loncom/html/res/adm/pages/annotator admannotations.pm
/loncom/html/res/adm/pages/bookmarkmenu bookmarklib.js
/loncom/html/res/adm/pages menu.html
/loncom/interface lonpreferences.pm loncoursegroups.pm lonhelper.pm
lonparmset.pm lonmenu.pm
Log:
consistent wording, short button names.
--schafran1234556430
Content-Type: text/plain
Content-Disposition: attachment; filename="schafran-20090213202030.txt"
Index: loncom/html/adm/help/tex/Annotation.tex
diff -u loncom/html/adm/help/tex/Annotation.tex:1.3 loncom/html/adm/help/tex/Annotation.tex:1.4
--- loncom/html/adm/help/tex/Annotation.tex:1.3 Tue Aug 8 17:47:26 2006
+++ loncom/html/adm/help/tex/Annotation.tex Fri Feb 13 20:20:17 2009
@@ -7,7 +7,7 @@
\item Select the resource.
\item Click \textbf{ANOT} on the remote control.
-\item Type your notes, and save them by clicking \textbf{Save and Update}
+\item Type your notes, and save them by clicking \textbf{Save}
\end{enumerate}
Index: loncom/html/res/adm/pages/annotator/admannotations.pm
diff -u loncom/html/res/adm/pages/annotator/admannotations.pm:1.32 loncom/html/res/adm/pages/annotator/admannotations.pm:1.33
--- loncom/html/res/adm/pages/annotator/admannotations.pm:1.32 Thu Jan 8 19:37:53 2009
+++ loncom/html/res/adm/pages/annotator/admannotations.pm Fri Feb 13 20:20:20 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# This will take annotations and then plug them into a page.
#
-# $Id: admannotations.pm,v 1.32 2009/01/08 19:37:53 raeburn Exp $
+# $Id: admannotations.pm,v 1.33 2009/02/13 20:20:20 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,8 +102,8 @@
my $end_page =
&Apache::loncommon::end_page();
- my %lt = ( 'close no save' => "Close (no save)",
- 'save' => "Save and Update",);
+ my %lt = ( 'close no save' => "Close",
+ 'save' => "Save",);
%lt = &Apache::lonlocal::texthash(%lt);
return(<<END_HTML)
Index: loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js
diff -u loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js:1.21 loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js:1.22
--- loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js:1.21 Thu Apr 20 04:08:04 2006
+++ loncom/html/res/adm/pages/bookmarkmenu/bookmarklib.js Fri Feb 13 20:20:23 2009
@@ -1,7 +1,7 @@
// The LearningOnline Network with CAPA
// bookmarklib.js
//
-// $Id: bookmarklib.js,v 1.21 2006/04/20 04:08:04 albertel Exp $
+// $Id: bookmarklib.js,v 1.22 2009/02/13 20:20:23 schafran Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -591,7 +591,7 @@
write("<input type='text' name='address' size='45' " );
write("value='"+clienthref+"'>");
write("<br><center><input type='submit' value='Save'> " );
- write("<input type='button' value='Close (no save)' " );
+ write("<input type='button' value='Close' title='Without save' " );
write("onclick='javascript:window.close();'></center></td>" );
write("</tr></table></form></center></body></html>" );
close();
Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.124 loncom/html/res/adm/pages/menu.html:1.125
--- loncom/html/res/adm/pages/menu.html:1.124 Tue Dec 2 00:22:44 2008
+++ loncom/html/res/adm/pages/menu.html Fri Feb 13 20:20:26 2009
@@ -4,7 +4,7 @@
Remote Control
//
-// $Id: menu.html,v 1.124 2008/12/02 00:22:44 raeburn Exp $
+// $Id: menu.html,v 1.125 2009/02/13 20:20:26 schafran Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -343,7 +343,7 @@
+"type='text' name='title' size=45 value='"+clienttitle+"'>"
+"<br />Address:<br /><input type='text' name='address' size='45' "
+"value='"+clienthref+"' /><br /><center><input type='submit' "
- +"value='Save' /> <input type='button' value='Close (no save)' "
+ +"value='Save' /> <input type='button' value='Close' "
+"onclick='javascript:window.close();' /><\/center><\/td>"
+"<\/tr><\/table><\/form><\/center><\/body><\/html>");
bmquery.document.close();
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.135 loncom/interface/lonpreferences.pm:1.136
--- loncom/interface/lonpreferences.pm:1.135 Tue Feb 10 09:30:16 2009
+++ loncom/interface/lonpreferences.pm Fri Feb 13 20:20:29 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.135 2009/02/10 09:30:16 schafran Exp $
+# $Id: lonpreferences.pm,v 1.136 2009/02/13 20:20:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -126,7 +126,7 @@
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
<label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -172,7 +172,7 @@
<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -227,7 +227,7 @@
my %lt=&Apache::lonlocal::texthash(
'headline' => 'Change Math Preferences',
'preftxt' => 'Preferred method to display Math',
- 'change' => 'Change',
+ 'change' => 'Save',
'exmpl' => 'Examples',
'jsmath' => 'jsMath:',
'tth' => 'tth (TeX to HTML):',
@@ -239,8 +239,9 @@
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_texengine" />
<p>
-$lt{'preftxt'}:<br />
-$selectionbox <input type="submit" value="$lt{'change'}" />
+$lt{'preftxt'}: $selectionbox
+<br />
+<input type="submit" value="$lt{'change'}" />
</p>
</form>
<br />
@@ -402,7 +403,7 @@
</p>
'.$roles_check_list.'
<br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
</form>');
}
@@ -607,7 +608,7 @@
my $useicons=&mt('Use icons and text');
my $usebuttons=&mt('Use buttons and text');
my $useicononly=&mt('Use icons only');
- my $change=&mt('Change');
+ my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_icons" />
@@ -700,7 +701,7 @@
}
my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
my $construction=&mt('Block access to construction space');
- my $change=&mt('Change');
+ my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_domcoord" />
@@ -779,11 +780,11 @@
mnot => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
# old: 'Message Notification Email Address(es)',
mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
- chg => 'Change',
+ chg => 'Save',
email => 'The e-mail address entered in row ',
notv => 'is not a valid e-mail address',
toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",
- prme => 'Back to preferences menu',
+ prme => 'Back',
);
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',
@@ -955,8 +956,8 @@
$r->print(qq|
<br /><hr />
<input type="hidden" name="numnotify" value="$num" />
-<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
</form>
|);
@@ -1153,8 +1154,8 @@
$chtable
$end_data_table
</table>
-<input type="submit" value="Change Custom Colors" />
-<input type="submit" name="resetall" value="Reset All Colors to Default" />
+<input type="submit" value="'.&mt('Save').'" />
+<input type="submit" name="resetall" value="'.&mt('Reset All').'" title="'.&mt('Reset All Colors to Default').'" />
</form>
ENDCOL
}
@@ -1338,7 +1339,7 @@
'currentpass' => 'Current Password',
'newpass' => 'New Password',
'confirmpass' => 'Confirm Password',
- 'changepass' => 'Change Password');
+ 'changepass' => 'Save');
my $output = qq|
<form name="client" >
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.92 loncom/interface/loncoursegroups.pm:1.93
--- loncom/interface/loncoursegroups.pm:1.92 Thu Feb 5 12:32:26 2009
+++ loncom/interface/loncoursegroups.pm Fri Feb 13 20:20:29 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.92 2009/02/05 12:32:26 schafran Exp $
+# $Id: loncoursegroups.pm,v 1.93 2009/02/13 20:20:29 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -916,10 +916,10 @@
);
my %navbuttons = &Apache::lonlocal::texthash(
gtns => 'Next',#'Go to next step',
- gtps => 'Previous',#'Go to previous step',
+ gtps => 'Back',#'Go to previous step',
crgr => 'Create '.$gpterm,
mose => 'Save',#'Modify settings',
- gtpp => 'Previous',#'Go to previous page',
+ gtpp => 'Back',#'Go to previous page',
adme => 'Add members',
);
if ((($action eq 'create') || ($action eq 'modify') || ($action eq 'delete') || ($action eq 'reenable')) &&
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.169 loncom/interface/lonhelper.pm:1.170
--- loncom/interface/lonhelper.pm:1.169 Fri Dec 19 20:51:35 2008
+++ loncom/interface/lonhelper.pm Fri Feb 13 20:20:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.169 2008/12/19 20:51:35 raeburn Exp $
+# $Id: lonhelper.pm,v 1.170 2009/02/13 20:20:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -529,7 +529,7 @@
# Phase 1: Post processing for state of previous screen (which is actually
# the "current state" in terms of the helper variables), if it wasn't the
# beginning state.
- if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next ->")) {
+ if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next")) {
my $prevState = $self->{STATES}{$self->{STATE}};
$prevState->postprocess();
}
@@ -590,8 +590,8 @@
$result .= &Apache::loncommon::start_page($self->{TITLE},
$browser_searcher_js);
- my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
- my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+ my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+ my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
# FIXME: This should be parameterized, not concatenated - Jeremy
@@ -3542,8 +3542,8 @@
}
my $finish=&mt('Finish Course Initialization');
}
- my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
- my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+ my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+ my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
my $target = " target='loncapaclient'";
if (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off')) { $target=''; }
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.429 loncom/interface/lonparmset.pm:1.430
--- loncom/interface/lonparmset.pm:1.429 Fri Feb 13 17:46:00 2009
+++ loncom/interface/lonparmset.pm Fri Feb 13 20:20:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.429 2009/02/13 17:46:00 raeburn Exp $
+# $Id: lonparmset.pm,v 1.430 2009/02/13 20:20:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3460,7 +3460,7 @@
my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
$r->print(&tableend().'<p>'.
- ($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form>'.
+ ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
&Apache::loncommon::end_page());
}
@@ -4334,7 +4334,7 @@
}
$r->print(&Apache::loncommon::end_data_table().
"\n".'<input type="submit" name="storerules" value="'.
- &mt('Save Rules').'" /></form>'."\n".
+ &mt('Save').'" /></form>'."\n".
&Apache::loncommon::end_page());
return;
}
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.251 loncom/interface/lonmenu.pm:1.252
--- loncom/interface/lonmenu.pm:1.251 Sun Feb 8 20:50:19 2009
+++ loncom/interface/lonmenu.pm Fri Feb 13 20:20:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.251 2009/02/08 20:50:19 raeburn Exp $
+# $Id: lonmenu.pm,v 1.252 2009/02/13 20:20:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1474,7 +1474,7 @@
+"type='text' name='title' size=45 value='"+clienttitle+"' />"
+"<br />Address:<br /><input type='text' name='address' size='45' "
+"value='"+clienthref+"' /><br /><center><input type='submit' "
- +"value='Save' /> <input type='button' value='Close (no save)' "
+ +"value='Save' /> <input type='button' value='Close' "
+"onclick='javascript:window.close();' /><\\/center><\\/td>"
+"<\\/tr><\\/table><\\/form><\\/center>"
+'$end_page_bookmark' );
--schafran1234556430--