--- loncom/interface/loncommon.pm 2009/05/04 19:35:31 1.801
+++ loncom/interface/loncommon.pm 2009/05/14 16:59:21 1.813
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.801 2009/05/04 19:35:31 tempelho Exp $
+# $Id: loncommon.pm,v 1.813 2009/05/14 16:59:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1855,7 +1855,7 @@ sub home_server_form_item {
if ($numlib > 1) {
$result .= ''."\n";
if ($default) {
- $result .= ''."\n";
}
foreach my $hostid (sort(keys(%servers))) {
@@ -2814,6 +2814,26 @@ sub screenname {
}
+# ------------------------------------------------------------- Confirm Wrapper
+=pod
+
+=item confirmwrapper
+
+Wrap messages about completion of operation in box
+
+=cut
+
+sub confirmwrapper {
+ my ($message)=@_;
+ if ($message) {
+ return "\n".'
'."\n"
+ .$message."\n"
+ .'
'."\n";
+ } else {
+ return $message;
+ }
+}
+
# ------------------------------------------------------------- Message Wrapper
sub messagewrapper {
@@ -2824,6 +2844,7 @@ sub messagewrapper {
'&subject='.&escape($subject).'&text='.&escape($text).'" '.
'title="'.&mt('Send message').'">'.$link.'';
}
+
# --------------------------------------------------------------- Notes Wrapper
sub noteswrapper {
@@ -2831,6 +2852,7 @@ sub noteswrapper {
return
"$link";
}
+
# ------------------------------------------------------------- Aboutme Wrapper
sub aboutmewrapper {
@@ -2844,12 +2866,13 @@ sub aboutmewrapper {
# ------------------------------------------------------------ Syllabus Wrapper
-
sub syllabuswrapper {
my ($linktext,$coursedir,$domain)=@_;
return qq{$linktext};
}
+# -----------------------------------------------------------------------------
+
sub track_student_link {
my ($linktext,$sname,$sdom,$target,$start) = @_;
my $link ="/adm/trackstudent?";
@@ -4228,7 +4251,7 @@ sub bodytag {
my $font = &designparm($function.'.font',$domain);
my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain);
- my %design = ( 'style' => 'margin-top: 0px',
+ my %design = ( 'style' => 'margin-top: 0',
'bgcolor' => $pgbg,
'text' => $font,
'alink' => &designparm($function.'.alink',$domain),
@@ -4347,6 +4370,8 @@ ENDROLE
if ($notopbar) {
$bodytag .= $titletable;
} else {
+ $bodytag .= qq|$name ($role)
+ $realm $dc_info
|;
if ($env{'request.state'} eq 'construct') {
$bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg,
$titletable);
@@ -4531,8 +4556,8 @@ sub standard_css {
my $lg_border_color = '#C8C8C8';
my $border = ($env{'browser.type'} eq 'explorer' ||
- $env{'browser.type'} eq 'safari' ) ? '0px 2px 0px 2px'
- : '0px 3px 0px 4px';
+ $env{'browser.type'} eq 'safari' ) ? '0 2px 0 2px'
+ : '0 3px 0 4px';
return < td
}
table.LC_data_table tr.LC_odd_row > td,
-table.LC_pick_box tr > td.LC_odd_row,
-table.LC_aboutme_port tr td {
+table.LC_pick_box tr > td.LC_odd_row {
background-color: $data_table_light;
padding: 2px;
}
table.LC_data_table tr.LC_even_row > td,
-table.LC_pick_box tr > td.LC_even_row,
-table.LC_aboutme_port tr.LC_even_row td {
+table.LC_pick_box tr > td.LC_even_row {
background-color: $data_table_dark;
padding: 2px;
}
@@ -5170,9 +5175,9 @@ table.LC_parm_overview_restrictions th {
}
table#LC_helpmenu {
- border: 0px;
+ border: none;
height: 55px;
- border-spacing: 0px;
+ border-spacing: 0;
}
table#LC_helpmenu fieldset legend {
@@ -5184,7 +5189,7 @@ table#LC_helpmenu_links {
width: 100%;
border: 1px solid black;
background: $pgbg;
- padding: 0px;
+ padding: 0;
border-spacing: 1px;
}
@@ -5257,7 +5262,7 @@ table.LC_pick_box td.LC_pick_box_select
}
table.LC_pick_box td.LC_pick_box_separator {
- padding: 0px;
+ padding: 0;
height: 1px;
background: black;
}
@@ -5307,7 +5312,7 @@ table.LC_helpform_receipt td.LC_oddrow_v
}
table.LC_helpform_receipt td.LC_pick_box_separator {
- padding: 0px;
+ padding: 0;
height: 1px;
background: black;
}
@@ -5347,7 +5352,7 @@ table.LC_group_priv_box td.LC_groups_fun
table.LC_group_priv td {
text-align: left;
- padding: 0px;
+ padding: 0;
}
table.LC_notify_front_page {
@@ -5371,6 +5376,7 @@ table.LC_notify_front_page td {
background: $tabbg;
vertical-align: middle;
margin: 2ex 0ex 2ex 0ex;
+ padding: 3px;
}
.LC_topic_bar span {
@@ -5391,12 +5397,6 @@ table.LC_status_selector td {
padding: 4px;
}
-table.LC_descriptive_input td.LC_description {
- vertical-align: top;
- text-align: right;
- font-weight: bold;
-}
-
div.LC_feedback_link {
clear: both;
background: white;
@@ -5515,7 +5515,7 @@ span.LC_cusr_subheading {
table.LC_docs_documents {
background: #BBBBBB;
- border-width: 0px;
+ border-width: 0;
border-collapse: collapse;
}
@@ -5525,7 +5525,7 @@ table.LC_docs_documents td.LC_docs_docum
}
.LC_docs_entry_move {
- border: 0px;
+ border: none;
border-collapse: collapse;
}
@@ -5587,7 +5587,7 @@ table.LC_sty_end {
}
table.LC_double_column {
- border-width: 0px;
+ border-width: 0;
border-collapse: collapse;
width: 100%;
padding: 2px;
@@ -5724,7 +5724,7 @@ table.LC_edit_problem_header_title {
border-width: $border;
background: $tabbg;
border-collapse: collapse;
- padding: 0px
+ padding: 0;
}
div.LC_edit_problem_discards {
@@ -5742,12 +5742,12 @@ hr.LC_edit_problem_divide {
color: $tabbg;
background-color: $tabbg;
height: 3px;
- border: 0px;
+ border: none;
}
img.stift{
- border-width:0;
- vertical-align:middle;
+ border-width: 0;
+ vertical-align: middle;
}
table#LC_mainmenu{
@@ -5791,26 +5791,26 @@ ul.LC_TabContent li:hover a {
}
h1 {
- padding:5px 10px 5px 20px;
+ padding: 0;
line-height:130%;
}
h2,h3,h4,h5,h6 {
- margin:5px 0px 5px 0px;
- padding:0px;
+ margin: 5px 0 5px 0;
+ padding: 0;
line-height:130%;
}
.LC_hcell {
padding:3px 15px 3px 15px;
- margin:0px;
+ margin: 0;
background-color:$tabbg;
color:$fontmenu;
border-bottom:solid 1px $lg_border_color;
}
.LC_noBorder {
- border:0px;
+ border: 0;
}
@@ -5818,13 +5818,13 @@ h2,h3,h4,h5,h6 {
.LC_Right {
float: right;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
.LC_FormSectionClearButton input {
background-color:transparent;
- border:0px;
+ border: none;
cursor:pointer;
text-decoration:underline;
}
@@ -5840,17 +5840,31 @@ h2,h3,h4,h5,h6 {
}
dl,ul,div,fieldset {
- margin: 10px 10px 10px 0px;
- overflow:hidden;
+ margin: 10px 10px 10px 0;
+/* overflow: hidden; */
+}
+
+#LC_nav_bar {
+ float: left;
+ margin: 0;
+}
+
+#LC_nav_bar em{
+ font-weight: bold;
+ font-style: normal;
+}
+
+ol.LC_smallMenu {
+ float: right;
}
ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
- margin: 0px;
+ margin: 0;
}
ol.LC_smallMenu li {
display: inline;
- padding: 5px 5px 0px 10px;
+ padding: 5px 5px 0 10px;
vertical-align: top;
}
@@ -5864,16 +5878,35 @@ ol.LC_smallMenu a {
text-decoration: none;
}
-ol#LC_TabMainMenuContent,
+ul#LC_TabMainMenuContent {
+ clear: both;
+ color: $fontmenu;
+ background: $tabbg;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ float:left;
+ width: 100%;
+}
+
+ul#LC_TabMainMenuContent li {
+ float: left;
+ font-weight: bold;
+ line-height: 1.8em;
+ padding: 0 0.8em;
+ border-right: 1px solid black;
+ display: inline;
+ vertical-align: middle;
+}
+
ul.LC_TabContent ,
ul.LC_TabContentBigger {
display:block;
list-style:none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
-ol#LC_TabMainMenuContent li,
ul.LC_TabContent li,
ul.LC_TabContentBigger li {
display: inline;
@@ -5883,18 +5916,8 @@ ul.LC_TabContentBigger li {
white-space:nowrap;
}
-ol#LC_TabMainMenuContent li {
- vertical-align: bottom;
- border-bottom: solid 1px RGB(175, 175, 175);
- padding: 5px 10px 5px 10px;
- margin-right:5px;
- margin-bottom:3px;
- font-weight: bold;
- background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
-}
-
-ol#LC_TabMainMenuContent li a {
- color: RGB(47, 47, 47);
+ul#LC_TabMainMenuContent li a {
+ color: $fontmenu;
text-decoration: none;
}
@@ -5904,7 +5927,7 @@ ul.LC_TabContent {
ul.LC_TabContent li {
vertical-align:middle;
- padding:0px 10px 0px 10px;
+ padding: 0 10px 0 10px;
background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;
}
@@ -5950,7 +5973,7 @@ ul.LC_CourseBreadcrumbs {
height: 20px;
line-height: 20px;
vertical-align: bottom;
- margin: 0px 0px 30px 0px;
+ margin: 0 0 30px 0;
padding-left: 10px;
list-style-position: inside;
background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top;
@@ -5963,7 +5986,7 @@ ul.LC_CourseBreadcrumbs li {
background: url(/adm/lonIcons/arrow_white.png) no-repeat left center;
*/
display: inline;
- padding: 0px 0px 0px 10px;
+ padding: 0 0 0 10px;
/* vertical-align: bottom; */
overflow:hidden;
}
@@ -6020,7 +6043,7 @@ dl.LC_ListStyleClean dd {
list-style-position: inside;
list-style-type: none;
overflow: hidden;
- padding: 0px;
+ padding: 0;
}
.LC_ListStyleSimple li,
@@ -6029,15 +6052,15 @@ dl.LC_ListStyleClean dd {
.LC_ListStyleNormal dd,
.LC_ListStyleSpecial li,
.LC_ListStyleSpecial dd {
- margin: 0px;
+ margin: 0;
padding: 5px 5px 5px 10px;
clear: both;
}
.LC_ListStyleClean li,
.LC_ListStyleClean dd {
- padding-top: 0px;
- padding-bottom: 0px;
+ padding-top: 0;
+ padding-bottom: 0;
}
.LC_ListStyleSimple dd,
@@ -6058,7 +6081,7 @@ table.LC_SimpleTable {
}
table.LC_SimpleTable tr {
- padding:0px;
+ padding: 0;
border:solid 1px $lg_border_color;
}
@@ -6070,12 +6093,12 @@ div.LC_columnSection {
display: block;
clear: both;
overflow: hidden;
- margin:0px;
+ margin: 0;
}
div.LC_columnSection>* {
float: left;
- margin: 10px 20px 10px 0px;
+ margin: 10px 20px 10px 0;
overflow:hidden;
}
@@ -6094,9 +6117,9 @@ div.LC_columnSection > .ContentBoxSpecia
.clear {
clear: both;
- line-height: 0px;
- font-size: 0px;
- height: 0px;
+ line-height: 0;
+ font-size: 0;
+ height: 0;
}
.LC_loginpage_container {
@@ -6119,7 +6142,7 @@ div.LC_columnSection > .ContentBoxSpecia
}
.LC_loginpage_loginContainer h2 {
- margin-top:0;
+ margin-top: 0;
display:block;
background:$bgcol;
color:$textcol;
@@ -6218,7 +6241,7 @@ ul#LC_toolbar li a:hover {
}
ul#LC_toolbar {
- padding:0;
+ padding: 0;
margin: 2px;
list-style:none;
position:relative;
@@ -6227,7 +6250,7 @@ ul#LC_toolbar {
ul#LC_toolbar li {
border:1px solid white;
- padding:0;
+ padding: 0;
margin: 0;
float: left;
display:inline;
@@ -6237,12 +6260,12 @@ ul#LC_toolbar li {
a.LC_toolbarItem {
display:block;
- padding:0;
- margin:0;
+ padding: 0;
+ margin: 0;
height: 32px;
width: 32px;
color:white;
- border:0 none;
+ border: none;
background-repeat:no-repeat;
background-color:transparent;
}
@@ -6251,7 +6274,7 @@ ul.LC_functionslist li {
float: left;
white-space: nowrap;
height: 35px; /* at least as high as heighest list item */
- margin: 0px 15px 15px 10px;
+ margin: 0 15px 15px 10px;
}
@@ -6524,7 +6547,15 @@ sub start_page {
$result = &html_encode($result);
}
- #Breadcrumbs
+ # Preparation for new and consistent functionlist at top of screen
+ # if ($args->{'functionlist'}) {
+ # $result .= &build_functionlist();
+ #}
+
+ # Don't add anything more if only_body wanted
+ return $result if $args->{'only_body'};
+
+ #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