--- loncom/interface/loncommon.pm 2009/01/28 13:49:50 1.736
+++ loncom/interface/loncommon.pm 2009/03/18 17:58:10 1.773
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.736 2009/01/28 13:49:50 muellerd Exp $
+# $Id: loncommon.pm,v 1.773 2009/03/18 17:58:10 ehlerst Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -923,19 +923,23 @@ sub help_open_topic {
}
# Add the text
- if ($text ne "") {
- $template .=
- "
".
- "$text";
+ if ($text ne "") {
+ $template.=''
+ .''
+ .$text.'';
}
- # Add the graphic
+ # (Always) Add the graphic
my $title = &mt('Online Help');
my $helpicon=&lonhttpdurl("/adm/help/help.png");
- $template .= <<"ENDTEMPLATE";
-
-ENDTEMPLATE
- if ($text ne '') { $template.=' |
' };
+ $template.=' '
+ .'';
+ if ($text ne "") {
+ $template.='';
+ }
return $template;
}
@@ -947,25 +951,26 @@ sub helpLatexCheatsheet {
my $out;
my $addOther = '';
if ($topic) {
- $addOther = &Apache::loncommon::help_open_topic($topic,$text,
- undef, undef, 600).
- '';
- }
- $out = ''.
- $addOther .
- &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
- undef,undef,600).
- ' | '.
- &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
- undef,undef,600).
- ' | ';
+ $addOther = ''.&Apache::loncommon::help_open_topic($topic,&mt($text),
+ undef, undef, 600).
+ ' ';
+ }
+ $out = '' # Start cheatsheet
+ .$addOther
+ .''
+ .&Apache::loncommon::help_open_topic('Greek_Symbols',&mt('Greek Symbols'),
+ undef,undef,600)
+ .' '
+ .&Apache::loncommon::help_open_topic('Other_Symbols',&mt('Other Symbols'),
+ undef,undef,600)
+ .'';
unless ($not_author) {
- $out .= ''.
- &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
- undef,undef,600).
- ' | ';
+ $out .= ' '
+ .&Apache::loncommon::help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),
+ undef,undef,600)
+ .'';
}
- $out .= ' ';
+ $out .= ''; # End cheatsheet
return $out;
}
@@ -1746,7 +1751,7 @@ sub select_level_form {
=pod
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
Returns a string containing a |
ENDROLE
- my $titleinfo = ''.$title.'';
+ my $titleinfo = ''.$title.'
';
if ($customtitle) {
$titleinfo = $customtitle;
}
@@ -4487,18 +4521,11 @@ table.thinborder tr td {
form, .inline { display: inline; }
-.LC_center { text-align: center; }
-.LC_left { text-align:left; }
.LC_right {text-align:right;}
.LC_middle {vertical-align:middle;}
-.LC_top {vertical-align:top;}
-.LC_bottom {vertical-align:bottom;}
/* just for tests */
-.LC_300Box { width:300px; }
-.LC_200Box {width:200px; }
-.LC_500Box {width:500px; }
-.LC_600Box {width:600px; }
+.LC_400Box {width:400px; }
/* end */
.LC_filename {font-family: $mono; white-space:pre;}
@@ -4521,8 +4548,9 @@ form, .inline { display: inline; }
}
.LC_icon {
- border: 0px;
+ border: none;
}
+
.LC_indexer_icon {
border: 0px;
height: 22px;
@@ -4530,7 +4558,7 @@ form, .inline { display: inline; }
.LC_docs_spacer {
width: 25px;
height: 1px;
- border: 0px;
+ border: none;
}
.LC_internal_info {
@@ -4574,18 +4602,25 @@ table.LC_docs_path {
table#LC_title_bar td {
background: $tabbg;
}
-table#LC_title_bar td.LC_title_bar_who {
+table#LC_title_bar .LC_title_bar_who {
background: $tabbg;
color: $font;
font: small $sans;
text-align: right;
+ margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_name {
+ margin: 0px;
+}
+table#LC_title_bar .LC_title_bar_role {
+ margin: 0px;
+}
+table#LC_title_bar .LC_tite_bar_realm {
+ margin: 0px;
}
span.LC_metadata {
font-family: $sans;
}
-span.LC_title_bar_title {
- font: bold x-large $sans;
-}
table#LC_title_bar td.LC_title_bar_domain_logo {
background: $sidebg;
text-align: right;
@@ -4620,10 +4655,6 @@ table#LC_top_nav td.LC_top_nav_logo img
border: 0px;
vertical-align: bottom;
}
-table#LC_top_nav td.LC_top_nav_exit,
-table#LC_top_nav td.LC_top_nav_help {
- width: 2.0em;
-}
table#LC_top_nav td.LC_top_nav_login {
width: 4.0em;
text-align: center;
@@ -4634,20 +4665,9 @@ table.LC_breadcrumbs td, table.LC_docs_p
font-family: $sans;
font-size: smaller;
}
-table.LC_breadcrumbs td.LC_breadcrumbs_component,
-table.LC_docs_path td.LC_docs_path_component {
- background: $tabbg;
- color: $font;
- font-family: $sans;
- font-size: larger;
- text-align: right;
-}
td.LC_table_cell_checkbox {
text-align: center;
}
-table#LC_mainmenu td.LC_mainmenu_column {
- vertical-align: top;
-}
.LC_fontsize_small
{
@@ -4664,11 +4684,6 @@ table#LC_mainmenu td.LC_mainmenu_column
font-size: 120%;
}
-.LC_fontcolor_red
-{
- color: #FF0000;
-}
-
.LC_menubuttons_inline_text {
color: $font;
font-family: $sans;
@@ -4855,9 +4870,6 @@ table.LC_calendar tr td {
table.LC_calendar tr td.LC_calendar_day_empty {
background-color: $data_table_dark;
}
-table.LC_calendar tr td.LC_calendar_day_current {
- background-color: $data_table_highlight;
-}
table.LC_mail_list tr.LC_mail_new {
background-color: $mail_new;
@@ -4883,26 +4895,13 @@ table.LC_mail_list tr.LC_mail_other {
table.LC_mail_list tr.LC_mail_other:hover {
background-color: $mail_other_hover;
}
-table.LC_mail_list tr.LC_mail_even {
-}
-table.LC_mail_list tr.LC_mail_odd {
-}
-table.LC_data_table tr > td.LC_browser_file,
-table.LC_data_table tr > td.LC_browser_file_published {
+table.LC_data_table tr > td.LC_browser_file {
background: #CCFF88;
}
-table.LC_data_table tr > td.LC_browser_file_locked,
-table.LC_data_table tr > td.LC_browser_file_unpublished {
+table.LC_data_table tr > td.LC_browser_file_locked {
background: #FFAA99;
}
-table.LC_data_table tr > td.LC_browser_file_obsolete {
- background: #AAAAAA;
-}
-table.LC_data_table tr > td.LC_browser_file_modified,
-table.LC_data_table tr > td.LC_browser_file_metamodified {
- background: #FFFF77;
-}
table.LC_data_table tr.LC_browser_folder > td {
background: #CCCCFF;
}
@@ -4954,7 +4953,7 @@ span.LC_parm_folder, span.LC_parm_symb {
}
td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu,
-td.LC_parm_overview_parm_selectors, td.LC_parm_overview_parm_restrictions {
+td.LC_parm_overview_parm_selectors {
border: 1px solid black;
border-collapse: collapse;
}
@@ -5026,6 +5025,7 @@ table.LC_pick_box td.LC_pick_box_title {
background: $tabbg;
font-weight: bold;
text-align: right;
+ vertical-align: top;
width: 184px;
padding: 8px;
}
@@ -5206,14 +5206,6 @@ table.LC_prior_tries td {
background: #AAAAFF;
color: black;
}
-.LC_answer_no_message {
- background: #FFFFFF;
- color: black;
-}
-.LC_answer_unknown {
- background: orange;
- color: black;
-}
span.LC_prior_numerical,
@@ -5243,6 +5235,7 @@ table.LC_prior_match tr td {
border: 1px solid #000000;
}
+td.LC_nobreak,
span.LC_nobreak {
white-space: nowrap;
}
@@ -5262,11 +5255,6 @@ table.LC_docs_documents {
border-collapse: collapse;
}
-table.LC_docs_documents td.LC_docs_document {
- border: 2px solid black;
- padding: 4px;
-}
-
.LC_docs_entry_move {
border: 0px;
border-collapse: collapse;
@@ -5485,13 +5473,6 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
vertical-align: top;
width: 45%;
}
-.LC_mainmenu_fieldset_category {
- color: $font;
- background: $pgbg;
- font-family: $sans;
- font-size: small;
- font-weight: bold;
-}
div.LC_createcourse {
margin: 10px 10px 10px 10px;
@@ -5536,22 +5517,13 @@ h2,h3,h4,h5,h6
border:0px;
}
-.LC_bgLightGrey{
- background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
-}
-.LC_bgLightGreyYellow {
- background-color:#EFECE0;
-}
/* Main Header with discription of Person, Course, etc. */
-.LC_HeadRight {
- text-align: right;
- float: right;
- margin: 0px;
- padding: 0px;
- right:0;
- position:absolute;
- overflow:hidden;
+
+.LC_Right {
+ float: right;
+ margin: 0px;
+ padding: 0px;
}
p, .LC_ContentBox {
@@ -5559,12 +5531,20 @@ p, .LC_ContentBox {
}
.LC_FormSectionClearButton input {
-
+ background-color:transparent;
border:0px;
cursor:pointer;
text-decoration:underline;
}
+.LC_help_open_topic {
+ color: #FFFFFF;
+ background-color: #EEEEFF;
+ margin: 1px;
+ padding: 4px;
+ border: 1px solid #000033;
+ white-space: nowrap;
+}
dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;
@@ -5589,24 +5569,29 @@ ol.LC_smallMenu a {
color: RGB(80, 80, 80);
text-decoration: none;
}
-
-ol#LC_TabMainMenuContent {
+ol#LC_TabMainMenuContent, ul.LC_TabContent ,
+ul.LC_TabContentBigger {
display:block;
list-style:none;
- margin: 0px 0px 10px 0px;
+ margin: 0px;
padding: 0px;
}
-ol#LC_TabMainMenuContent li {
+ol#LC_TabMainMenuContent li, ul.LC_TabContent li,
+ul.LC_TabContentBigger li{
display: inline;
+ border-right: solid 1px $lg_border_color;
+ float:left;
+ line-height:140%;
+ white-space:nowrap;
+}
+ol#LC_TabMainMenuContent li{
vertical-align: bottom;
border-bottom: solid 1px RGB(175, 175, 175);
- border-right: solid 1px RGB(175, 175, 175);
padding: 5px 10px 5px 10px;
- margin-right:3px;
- line-height: 140%;
+ margin-right:5px;
+ margin-bottom:3px;
font-weight: bold;
- white-space:nowrap;
background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
}
@@ -5615,32 +5600,40 @@ ol#LC_TabMainMenuContent li a{
text-decoration: none;
}
ul.LC_TabContent {
- margin:0px;
- padding:0px;
- display:block;
- list-style:none;
- min-height:1.5em;
+ min-height:1.6em;
}
ul.LC_TabContent li{
- display:inline;
- vertical-align:top;
+ vertical-align:middle;
+ padding:0px 10px 0px 10px;
+ background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;
- border-right:solid 1px $lg_border_color;
- padding:5px 10px 5px 10px;
- margin-right:2px;
- background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
}
-ul.LC_TabContent li a, ul.LC_TabContent li{
+ul.LC_TabContent li a, ul.LC_TabContent li{
color:rgb(47,47,47);
text-decoration:none;
font-size:95%;
font-weight:bold;
- white-space:nowrap;
+ padding-right: 16px;
}
-.LC_hideThis
-{
- display:none;
- visibility:hidden;
+ul.LC_TabContent li:hover, ul.LC_TabContent li.active{
+ background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
+ border-bottom:solid 1px #FFFFFF;
+ padding-right: 16px;
+}
+ul.LC_TabContentBigger li{
+ vertical-align:bottom;
+ border-top:solid 1px $lg_border_color;
+ border-left:solid 1px $lg_border_color;
+ padding:5px 10px 5px 10px;
+ margin-left:2px;
+ background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
+}
+ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active{
+ background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom;
+}
+ul.LC_TabContentBigger li, ul.LC_TabContentBigger li a{
+ font-size:110%;
+ font-weight:bold;
}
ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
@@ -5655,7 +5648,9 @@ ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcr
}
ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
+/*
background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
+*/
display: inline;
padding: 0px 0px 0px 10px;
vertical-align: bottom;
@@ -5675,20 +5670,21 @@ ol#LC_PathBreadcrumbs li a{
{
border: solid 1px $lg_border_color;
}
-.LC_PopUp
+.LC_ContentBoxSpecialContactInfo
{
- padding:10px;
- border-left:solid 1px $lg_border_color;
- border-top:solid 1px $lg_border_color;
- border-bottom:outset 1px $lg_border_color;
- border-right:outset 1px $lg_border_color;
- display:none;
- position:absolute;
- right:0;
- background-color:white;
- z-index:5;
+ border: solid 1px $lg_border_color;
+ max-width:25%;
+ min-width:25%;
+}
+.LC_AboutMe_Image
+{
+ float:left;
+ margin-right:10px;
+}
+.LC_Clear_AboutMe_Image
+{
+ clear:left;
}
-
dl.LC_ListStyleClean dt {
padding-right: 5px;
display: table-header-group;
@@ -5701,7 +5697,6 @@ dl.LC_ListStyleClean dd {
.LC_ListStyleClean,
.LC_ListStyleSimple,
.LC_ListStyleNormal,
-.LC_ListStyleNormal_Border,
.LC_ListStyleSpecial
{
/*display:block; */
@@ -5764,12 +5759,7 @@ div.LC_columnSection {
div.LC_columnSection>* {
float: left;
margin: 10px 20px 10px 0px;
- overflow:hidden;
-}
-div.LC_columnSection > .LC_ContentBox,
-div.LC_columnSection > .LC_ContentBoxSpecial
- {
- width: 400px;
+ overflow:hidden;
}
.ContentBoxSpecialTemplate
@@ -5784,7 +5774,6 @@ div.LC_columnSection > .ContentBoxTempla
div.LC_columnSection > .ContentBoxSpecialTemplate
{
width: 600px;
-
}
.clear{
@@ -5835,21 +5824,80 @@ div.LC_columnSection > .ContentBoxSpecia
}
.LC_loginpage_space {
- clear:both;
- margin-bottom:20px;
+ clear: both;
+ margin-bottom: 20px;
border-bottom: 1px solid #CCCCCC;
}
-.LC_loginpage_fieldset{
- border: 1px solid #CCCCCC;
- margin: 0 auto;
+table em{
+ font-weight: bold;
+ font-style: normal;
+}
+table.LC_tableBrowseRes,
+table.LC_tableOfContent{
+ border:none;
+ border-spacing: 1;
+ padding: 3px;
+ background-color: #FFFFFF;
+ font-size: 90%;
+}
+table.LC_tableBrowseRes a,
+table.LC_tableOfContent a {
+ background-color: transparent;
+ text-decoration: none;
}
-.LC_loginpage_legend{
- padding: 2px;
- margin: 0px;
- font-size:14px;
- font-weight:bold;
+table.LC_tableBrowseRes tr.LC_trOdd,
+table.LC_tableOfContent tr.LC_trOdd{
+ background-color: #EEEEEE;
+}
+
+table.LC_tableOfContent img{
+ border: none;
+ height: 1.3em;
+ vertical-align: text-bottom;
+ margin-right: 0.3em;
+}
+
+a#LC_content_toolbar_changefolder{
+ background : url(/res/adm/pages/close-all-folders.gif) top center ;
+}
+
+a#LC_content_toolbar_changefolder_toggled{
+ background-image:url(/res/adm/pages/open-all-folders.gif);
+}
+
+ul#LC_toolbar li a:hover{
+ background-position: bottom center;
+}
+
+ul#LC_toolbar{
+ padding:0;
+ margin: 2px;
+ list-style:none;
+ position:relative;
+ background-color:white;
+}
+
+ul#LC_toolbar li{
+ border:1px solid white;
+ padding:0;
+ margin: 0;
+ float: left;
+ display:inline;
+ vertical-align:middle;
+}
+
+a.LC_toolbarItem{
+ display:block;
+ padding:0;
+ margin:0;
+ height: 32px;
+ width: 32px;
+ color:white;
+ border:0 none;
+ background-repeat:no-repeat;
+ background-color:transparent;
}
@@ -6122,16 +6170,23 @@ sub start_page {
$result = &html_encode($result);
}
- if (exists($args->{'bread_crumbs'})) {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- if (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
- foreach my $crumb (@{$args->{'bread_crumbs'}}){
- &Apache::lonhtmlcommon::add_breadcrumb($crumb);
- }
- }
- $result .= &Apache::lonhtmlcommon::breadcrumbs();
- }
+ #Breadcrumbs
+ if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ #if any br links exists, add them to the breadcrumbs
+ if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
+ foreach my $crumb (@{$args->{'bread_crumbs'}}){
+ &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+ }
+ }
+ #if bread_crumbs_component exists show it as headline else show only the breadcrumbs
+ if(exists($args->{'bread_crumbs_component'})){
+ $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
+ }else{
+ $result .= &Apache::lonhtmlcommon::breadcrumbs();
+ }
+ }
return $result;
}
@@ -6892,7 +6947,7 @@ sub default_quota {
['quotas'],$udom);
if (ref($quotahash{'quotas'}) eq 'HASH') {
if ($inststatus ne '') {
- my @statuses = split(/:/,$inststatus);
+ my @statuses = map { &unescape($_); } split(/:/,$inststatus);
foreach my $item (@statuses) {
if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
@@ -7358,6 +7413,7 @@ sub personal_data_fieldtitles {
middlename => 'Middle Name',
generation => 'Generation',
gen => 'Generation',
+ inststatus => 'Affiliation',
);
return %fieldtitles;
}
@@ -8723,9 +8779,10 @@ sub restore_settings {
=item * &build_recipient_list()
-Build recipient lists for three types of e-mail:
-(a) Error Reports, (b) Package Updates, (c) Help requests, generated by
-lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+Build recipient lists for four types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
+(d) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
Inputs:
defmail (scalar - email address of default recipient),
@@ -8749,17 +8806,21 @@ sub build_recipient_list {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
if (ref($domconfig{'contacts'}) eq 'HASH') {
- if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
- my @contacts = ('adminemail','supportemail');
- foreach my $item (@contacts) {
- if ($domconfig{'contacts'}{$mailing}{$item}) {
- my $addr = $domconfig{'contacts'}{$item};
- if (!grep(/^\Q$addr\E$/,@recipients)) {
- push(@recipients,$addr);
+ if (exists($domconfig{'contacts'}{$mailing})) {
+ if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+ my @contacts = ('adminemail','supportemail');
+ foreach my $item (@contacts) {
+ if ($domconfig{'contacts'}{$mailing}{$item}) {
+ my $addr = $domconfig{'contacts'}{$item};
+ if (!grep(/^\Q$addr\E$/,@recipients)) {
+ push(@recipients,$addr);
+ }
}
+ $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
}
- $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
}
+ } elsif ($origmail ne '') {
+ push(@recipients,$origmail);
}
} elsif ($origmail ne '') {
push(@recipients,$origmail);
@@ -9030,7 +9091,7 @@ sub assign_categories_table {
my $checked = '';
if (@currcategories > 0) {
if (grep(/^\Q$item\E$/,@currcategories)) {
- $checked = ' checked="checked" ';
+ $checked = ' checked="checked"';
}
}
$output .= ''.
@@ -9096,7 +9157,7 @@ sub assign_category_rows {
if (ref($currcategories) eq 'ARRAY') {
if (@{$currcategories} > 0) {
if (grep(/^\Q$item\E$/,@{$currcategories})) {
- $checked = ' checked="checked" ';
+ $checked = ' checked="checked"';
}
}
}
@@ -9868,6 +9929,12 @@ sub init_user_environment {
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
}
+ foreach my $crstype ('official','unofficial') {
+ $userenv{'canrequest.'.$crstype} =
+ &Apache::lonnet::usertools_access($username,$domain,$crstype,
+ 'reload','requestcourses');
+ }
+
$env{'user.environment'} = "$lonids/$cookie.id";
if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
|