--- loncom/interface/loncommon.pm 2008/12/14 00:33:35 1.715
+++ loncom/interface/loncommon.pm 2008/12/17 16:07:45 1.722
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.715 2008/12/14 00:33:35 raeburn Exp $
+# $Id: loncommon.pm,v 1.722 2008/12/17 16:07:45 harmsja Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4443,12 +4443,21 @@ table.thinborder tr td {
}
form, .inline { display: inline; }
-.center { text-align: center; }
-.left { text-align:left; }
-.right {text-align:right;}
-.middle {vertical-align:middle;}
-.top {vertical-align:top;}
-.bottom {vertical-align:bottom;}
+
+.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; }
+/* end */
+
.LC_filename {font-family: $mono; white-space:pre;}
.LC_error {
color: red;
@@ -4456,7 +4465,7 @@ form, .inline { display: inline; }
}
.LC_warning,
.LC_diff_removed {
- color: red;
+
}
.LC_info,
@@ -5448,6 +5457,10 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
font-weight: bold;
}
+div.LC_createcourse {
+ margin: 10px 10px 10px 10px;
+}
+
/* ---- Remove when done ----
# The following styles is part of the redesign of LON-CAPA and are
# subject to change during this project.
@@ -5456,41 +5469,46 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
# --------------------------*/
a:hover,
-ol.smallMenu a:hover,
-ol#MenuBreadcrumbs a:hover,
-ul#TabMainMenuContent a:hover,
-.FormSectionClearButton input:hover{
+ol.LC_smallMenu a:hover,
+ol#LC_MenuBreadcrumbs a:hover,
+ol#LC_PathBreadcrumbs a:hover,
+ul#LC_TabMainMenuContent a:hover,
+.LC_FormSectionClearButton input:hover
+ul.LC_TabContent li:hover a{
color:#BF2317;
text-decoration:none;
}
h1 {
- padding:5px 10px 5px 0px;
+ padding:5px 10px 5px 20px;
line-height:130%;
}
h2,h3,h4,h5,h6
{
-margin:5px 0px 5px 0px;
-line-height:130%;
+ margin:5px 0px 5px 0px;
+ padding:0px;
+ line-height:130%;
}
-.hcell{
+.LC_hcell{
padding:3px 15px 3px 15px;
margin:0px;
background-color:$tabbg;
border-bottom:solid 1px $lg_border_color;
}
-.noBorder {
+.LC_noBorder {
border:0px;
}
-/*
-.bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; }
-.bgLightGreyYellow {background-color:#EFECE0;}
-*/
+.LC_bgLightGrey{
+ background:URL(lonIcons/lightGreyBG.png) repeat-x left top;
+}
+.LC_bgLightGreyYellow {
+ background-color:#EFECE0;
+}
/* Main Header with discription of Person, Course, etc. */
-.HeadRight {
+.LC_HeadRight {
text-align: right;
float: right;
margin: 0px;
@@ -5500,12 +5518,12 @@ line-height:130%;
overflow:hidden;
}
-p {
+p, .LC_ContentBox {
padding: 10px;
}
-.FormSectionClearButton input {
- background-color:transparent;
+.LC_FormSectionClearButton input {
+
border:0px;
cursor:pointer;
text-decoration:underline;
@@ -5516,55 +5534,80 @@ dl,ul,div,fieldset {
margin: 10px 10px 10px 0px;
overflow:hidden;
}
-ol.smallMenu {
+ol.LC_smallMenu, ol#LC_PathBreadcrumbs {
margin: 0px;
}
-ol.smallMenu li {
+ol.LC_smallMenu li {
display: inline;
padding: 5px 5px 0px 10px;
vertical-align: top;
}
-ol.smallMenu li img {
+ol.LC_smallMenu li img {
vertical-align: bottom;
}
-ol.smallMenu a {
+ol.LC_smallMenu a {
font-size: 90%;
color: RGB(80, 80, 80);
text-decoration: none;
}
-ol#TabMainMenuContent {
-
+ol#LC_TabMainMenuContent {
+ display:block;
+ list-style:none;
margin: 0px 0px 10px 0px;
padding: 0px;
}
-ol#TabMainMenuContent li {
+ol#LC_TabMainMenuContent li {
display: inline;
vertical-align: bottom;
border-bottom: solid 1px RGB(175, 175, 175);
border-right: solid 1px RGB(175, 175, 175);
- padding: 5px 15px 5px 15px;
- margin-right:4px;
+ padding: 5px 10px 5px 10px;
+ margin-right:3px;
line-height: 140%;
font-weight: bold;
- overflow:hidden;
-/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/
+ white-space:nowrap;
+ background: url(lonIcons/lightGreyBG.png) repeat-x left top;
}
-ol#TabMainMenuContent li a{
+ol#LC_TabMainMenuContent li a{
color: RGB(47, 47, 47);
text-decoration: none;
}
-
-ol#TabMainMenuContent div.columnSection {
- margin-bottom: 0px;
+ul.LC_TabContent {
+ margin:0px;
+ padding:0px;
+ display:block;
+ list-style:none;
+ min-height:1.5em;
+}
+ul.LC_TabContent li{
+ display:inline;
+ vertical-align:top;
+ border-bottom:solid 1px $lg_border_color;
+ border-right:solid 1px $lg_border_color;
+ padding:5px 10px 5px 10px;
+ margin-right:2px;
+ background: url(lonIcons/lightGreyBG.png) repeat-x left top;
+}
+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;
+}
+.LC_hideThis
+{
+ display:none;
+ visibility:hidden;
}
-ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
+ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs {
border-top: solid 1px RGB(255, 255, 255);
height: 20px;
line-height: 20px;
@@ -5572,36 +5615,31 @@ ol#MenuBreadcrumbs, ol#PathBreadcrumbs {
margin: 0px 0px 30px 0px;
padding-left: 10px;
list-style-position: inside;
-/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
- top;*/
+ background: url(lonIcons/lightGreyBG.png) repeat-x left top;
}
-ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li {
-/* background: url(images/pfeil_white.png) no-repeat left center;*/
+ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li {
+ background: url(lonIcons/arrow_white.png) no-repeat left center;
display: inline;
padding: 0px 0px 0px 10px;
vertical-align: bottom;
overflow:hidden;
}
-ol#MenuBreadcrumbs li a {
+ol#LC_MenuBreadcrumbs li a {
text-decoration: none;
font-size:90%;
}
-ol#PathBreadcrumbs li a{
+ol#LC_PathBreadcrumbs li a{
text-decoration:none;
font-size:100%;
font-weight:bold;
}
-
-.ContentBoxSpecial
+.LC_ContentBoxSpecial
{
border: solid 1px $lg_border_color;
}
-.ContentBox {
- padding:10px;
-}
-.PopUp
+.LC_PopUp
{
padding:10px;
border-left:solid 1px $lg_border_color;
@@ -5615,20 +5653,20 @@ ol#PathBreadcrumbs li a{
z-index:5;
}
-dl.ListStyleClean dt {
+dl.LC_ListStyleClean dt {
padding-right: 5px;
display: table-header-group;
}
-dl.ListStyleClean dd {
+dl.LC_ListStyleClean dd {
display: table-row;
}
-.ListStyleClean,
-.ListStyleSimple,
-.ListStyleNormal,
-.ListStyleNormal_Border,
-.ListStyleSpecial
+.LC_ListStyleClean,
+.LC_ListStyleSimple,
+.LC_ListStyleNormal,
+.LC_ListStyleNormal_Border,
+.LC_ListStyleSpecial
{
/*display:block; */
list-style-position: inside;
@@ -5637,66 +5675,87 @@ dl.ListStyleClean dd {
padding: 0px;
}
-.ListStyleSimple li,
-.ListStyleSimple dd,
-.ListStyleNormal li,
-.ListStyleNormal dd,
-.ListStyleSpecial li,
-.ListStyleSpecial dd
+.LC_ListStyleSimple li,
+.LC_ListStyleSimple dd,
+.LC_ListStyleNormal li,
+.LC_ListStyleNormal dd,
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd
{
margin: 0px;
padding: 5px 5px 5px 10px;
clear: both;
}
-.ListStyleClean li,
-.ListStyleClean dd {
+.LC_ListStyleClean li,
+.LC_ListStyleClean dd {
padding-top: 0px;
padding-bottom: 0px;
}
-.ListStyleSimple dd,
-.ListStyleSimple li{
+.LC_ListStyleSimple dd,
+.LC_ListStyleSimple li{
border-bottom: solid 1px $lg_border_color;
}
-.ListStyleSpecial li,
-.ListStyleSpecial dd {
+.LC_ListStyleSpecial li,
+.LC_ListStyleSpecial dd {
list-style-type: none;
background-color: RGB(220, 220, 220);
margin-bottom: 4px;
}
-table.SimpleTable {
+table.LC_SimpleTable {
margin:5px;
border:solid 1px $lg_border_color;
}
-table.SimpleTable tr {
+table.LC_SimpleTable tr {
padding:0px;
border:solid 1px $lg_border_color;
}
-table.SimpleTable thead{
+table.LC_SimpleTable thead{
background:rgb(220,220,220);
}
-div.columnSection {
+div.LC_columnSection {
display: block;
clear: both;
overflow: hidden;
margin:0px;
}
-div.columnSection>* {
+div.LC_columnSection>* {
float: left;
margin: 10px 20px 10px 0px;
overflow:hidden;
}
-div.columnSection > .ContentBox,
-div.columnSection > .ContentBoxSpecial
+div.LC_columnSection > .LC_ContentBox,
+div.LC_columnSection > .LC_ContentBoxSpecial
{
- width: 400px;
-
+ width: 400px;
+}
+
+.ContentBoxSpecialTemplate
+{
+ border: solid 1px $lg_border_color;
+}
+.ContentBoxTemplate {
+ padding:10px;
+}
+
+div.LC_columnSection > .ContentBoxTemplate,
+div.LC_columnSection > .ContentBoxSpecialTemplate
+ {
+ width: 600px;
+
+}
+
+.clear{
+ clear: both;
+ line-height: 0px;
+ font-size: 0px;
+ height: 0px;
}
.LC_loginpage_container {
@@ -5717,7 +5776,7 @@ div.columnSection > .ContentBoxSpecial
background-color:$loginbg;
}
-.LC_loginpage_loginContainer h1{
+.LC_loginpage_loginContainer h2{
margin-top:0;
display:block;
background:$bgcol;
@@ -6027,13 +6086,14 @@ sub start_page {
$result = &html_encode($result);
}
- if (exists $args->{'bread_crumbs'}) {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- my $temp = $args->{'bread_crumbs'};
- foreach my $crumb (@$temp){
- &Apache::lonhtmlcommon::add_breadcrumb($crumb);
- }
- $result .= &Apache::lonhtmlcommon::breadcrumbs();
+ 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();
}
return $result;