+//
+
+ENDJS
+ }
$endbodytag=
- "".
+ "$endbodyjs ".
&mt('Continue').' '.
$endbodytag;
}
}
+ if ((ref($args) eq 'HASH') && ($args->{'dashjs'})) {
+ $endbodytag = &Apache::lonhtmlcommon::dash_to_minus_js().$endbodytag;
+ }
return $endbodytag;
}
@@ -6517,7 +7278,6 @@ Inputs: (all optional)
sub standard_css {
my ($function,$domain,$bgcolor) = @_;
$function = &get_users_function() if (!$function);
- my $img = &designparm($function.'.img', $domain);
my $tabbg = &designparm($function.'.tabbg', $domain);
my $font = &designparm($function.'.font', $domain);
my $fontmenu = &designparm($function.'.fontmenu', $domain);
@@ -6570,6 +7330,7 @@ body {
line-height:130%;
font-size:0.83em;
color:$font;
+ background-color: $pgbg_or_bgcolor;
}
a:focus,
@@ -6581,10 +7342,55 @@ form, .inline {
display: inline;
}
+.LC_landmark {
+ margin: 0;
+ padding: 0;
+ border: none;
+}
+
+.LC_visually_hidden:not(:focus):not(:active) {
+ clip-path: inset(50%);
+ height: 1px;
+ overflow: hidden;
+ position: absolute;
+ white-space: nowrap;
+ width: 1px;
+ display: inline;
+}
+
+.LC_heading_2 {
+ font-size: 1.17em;
+}
+
+.LC_heading_3 {
+ font-size: 1.0em;
+}
+
+h1.LC_search_results {
+ font-size: 1.0em;
+ font-weight: normal;
+}
+
+.LC_menus_content.shown{
+ display: block;
+}
+
+.LC_menus_content.hidden {
+ display: none;
+}
+
.LC_right {
text-align:right;
}
+.LC_left {
+ text-align:left;
+}
+
+.LC_center {
+ text-align:center;
+}
+
.LC_middle {
vertical-align:middle;
}
@@ -6601,6 +7407,12 @@ form, .inline {
width:400px;
}
+#LC_collapsible_separator {
+ border: 1px solid black;
+ width: 99.9%;
+ height: 0px;
+}
+
.LC_iframecontainer {
width: 98%;
margin: 0;
@@ -6668,6 +7480,14 @@ div.LC_confirm_box .LC_success img {
height: auto;
}
+div.LC_minheight {
+ min-height: 24px;
+ border: 0;
+ margin: 4px 0 0 0;
+ padding: 0;
+ vertical-align: middle;
+}
+
.LC_textsize_mobile {
\@media only screen and (max-device-width: 480px) {
-webkit-text-size-adjust:100%; -moz-text-size-adjust:100%; -ms-text-size-adjust:100%;
@@ -6722,9 +7542,10 @@ div.LC_confirm_box .LC_success img {
padding: 4px;
}
-table.LC_pastsubmission {
+.LC_pastsubmission {
border: 1px solid black;
margin: 2px;
+ padding: 2px;
}
table#LC_menubuttons {
@@ -6959,11 +7780,13 @@ table.LC_data_table tr td.LC_leftcol_hea
}
table.LC_data_table tr.LC_empty_row td,
-table.LC_nested tr.LC_empty_row td {
+table.LC_nested tr.LC_empty_row td,
+table.LC_nested tr.LC_empty_row th {
font-weight: bold;
font-style: italic;
text-align: center;
padding: 8px;
+ border: 0;
}
table.LC_data_table tr.LC_empty_row td,
@@ -6971,15 +7794,19 @@ table.LC_data_table tr.LC_footer_row td
background-color: $sidebg;
}
+table.LC_nested tr.LC_empty_row th,
table.LC_nested tr.LC_empty_row td {
+ padding: 4ex;
background-color: #FFFFFF;
}
table.LC_caption {
}
-table.LC_nested tr.LC_empty_row td {
- padding: 4ex
+caption.LC_caption_prefs {
+ font-weight: normal;
+ text-align: left;
+ padding-bottom: 0.8em;
}
table.LC_nested_outer tr th {
@@ -6998,14 +7825,17 @@ table.LC_nested_outer tr td.LC_subheader
text-align: right;
}
-table.LC_nested tr.LC_info_row td {
+table.LC_nested tr.LC_info_row td,
+table.LC_nested tr.LC_info_row th {
background-color: #CCCCCC;
font-weight: bold;
font-size: small;
text-align: center;
+ border: 0;
}
table.LC_nested tr.LC_info_row td.LC_left_item,
+table.LC_nested tr.LC_info_row th.LC_left_item,
table.LC_nested_outer tr th.LC_left_item {
text-align: left;
}
@@ -7148,6 +7978,10 @@ table.LC_data_table tr > td.LC_roles_sel
border-right: 8px solid #11CC55;
}
+table.LC_data_table tr.LC_prefs_row {
+ line-height: 250%;
+}
+
span.LC_current_location {
font-size:larger;
background: $pgbg;
@@ -7221,39 +8055,68 @@ table.LC_parm_overview_restrictions th {
border-color: $pgbg;
}
-table#LC_helpmenu {
- border: none;
- height: 55px;
- border-spacing: 0;
+h1.LC_helpmenu {
+ display: inline;
+ font-size: 100%;
+ font-weight: normal;
+ line-height: 1em;
+ margin: 0;
+ padding: 0;
+ border: 0;
}
-table#LC_helpmenu fieldset legend {
- font-size: larger;
+.LC_helpdesk_headbox {
+ border: 2px groove threedface;
+ padding: 1em;
}
-table#LC_helpmenu_links {
- width: 100%;
- border: 1px solid black;
+h1.LC_helpdesk_legend {
+ float: left;
+ margin: -1.7em 0 0;
+ padding: 0 .5em;
background: $pgbg;
+ font-size: 1em;
+ font-weight: bold;
+}
+
+h1.LC_helpdesk_title {
+ display: inline;
+ font-size: 1em;
+ line-height: 2.5em;
+ margin: 0;
padding: 0;
- border-spacing: 1px;
+ vertical-align: bottom;
}
-table#LC_helpmenu_links tr td {
- padding: 1px;
+.LC_helpdesk_links {
+ border: 1px solid black;
+ padding: 3px;
background: $tabbg;
text-align: center;
font-weight: bold;
+ display: inline;
+ margin-right: -6px;
+}
+
+.LC_helpdesk_img,
+.LC_helpdesk_text {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ display: inline;
}
-table#LC_helpmenu_links a:link,
-table#LC_helpmenu_links a:visited,
-table#LC_helpmenu_links a:active {
+.LC_helpdesk_img a:link,
+.LC_helpdesk_img a:visited,
+.LC_helpdesk_img a:active,
+.LC_helpdesk_text a:link,
+.LC_helpdesk_text a:visited,
+.LC_helpdesk_text a:active {
text-decoration: none;
color: $font;
}
-table#LC_helpmenu_links a:hover {
+div.LC_helpdesk_text a:hover {
text-decoration: underline;
color: $vlink;
}
@@ -7280,7 +8143,7 @@ table.LC_pick_box {
border-spacing: 1px;
}
-table.LC_pick_box td.LC_pick_box_title {
+table.LC_pick_box th.LC_pick_box_title {
background: $sidebg;
font-weight: bold;
text-align: left;
@@ -7321,6 +8184,13 @@ table.LC_pick_box td.LC_oddrow_value {
background-color: $data_table_light;
}
+td.LC_log_filter,
+th.LC_log_filter {
+ vertical-align: top;
+ text-align: left;
+ padding: 0 4px;
+}
+
span.LC_helpform_receipt_cat {
font-weight: bold;
}
@@ -7483,6 +8353,44 @@ table.LC_prior_tries td {
padding: 6px;
}
+span.LC_prob_status {
+ margin: 5px 0 0 0;
+ padding: 0 5px 0 0;
+ vertical-align: middle;
+}
+
+div.LC_prob_status_outer {
+ display: inline-block;
+ margin: -5px 0 0 0;
+ padding: 0;
+}
+
+div.LC_prob_status_inner {
+ display: inline-block;
+ margin: 0 5px 0 0;
+ padding: 5px;
+}
+
+caption.LC_filesub_status {
+ text-align: left;
+ font-weight: bold;
+}
+
+.LC_mail_actions {
+ float: left;
+ padding: 0;
+ margin: 6px;
+}
+
+.LC_vertical_line {
+ width: 1px;
+ background-color: black;
+ height: 4em;
+ float: left;
+ margin: 0;
+ padding: 0;
+}
+
span.LC_prior_numerical,
span.LC_prior_string,
span.LC_prior_custom,
@@ -7636,6 +8544,10 @@ div.LC_grade_show_user div.LC_Box {
margin-right: 50px;
}
+div.LC_grade_show_user div.LC_Box table tr th {
+ font-weight: normal;
+}
+
div.LC_grade_submissions,
div.LC_grade_message_center,
div.LC_grade_info_links {
@@ -7666,6 +8578,12 @@ table.LC_scantron_action tr th {
font-style:normal;
}
+div.LC_edit_problem_daxe_header {
+ padding: 3px;
+ background: $tabbg;
+ z-index: 100;
+}
+
.LC_edit_problem_header,
div.LC_edit_problem_footer {
font-weight: normal;
@@ -7731,8 +8649,9 @@ img.stift {
vertical-align: middle;
}
-table td.LC_mainmenu_col_fieldset {
- vertical-align: top;
+div.LC_mainmenu {
+ margin: 3px 2px 2px 1px;
+ float: left;
}
div.LC_createcourse {
@@ -7813,6 +8732,26 @@ fieldset {
/* overflow: hidden; */
}
+fieldset#LC_selectuser {
+ margin: -1px 0 0 0;
+ padding: 0;
+ border: 0;
+}
+
+fieldset.LC_delete_slot {
+ display:inline;
+ margin: 0 4px 4px;
+ padding: 4px;
+}
+
+fieldset.LC_delete_slot > legend {
+ font-weight: normal;
+}
+
+p.LC_medium_line {
+ line-height: 0.85em;
+}
+
article.geogebraweb div {
margin: 0;
}
@@ -8356,6 +9295,10 @@ a#LC_content_toolbar_edittoplevel {
background-image:url(/res/adm/pages/edittoplevel.gif);
}
+a#LC_content_toolbar_printout {
+ background-image:url(/res/adm/pages/printout.gif);
+}
+
ul#LC_toolbar li a:hover {
background-position: bottom center;
}
@@ -8364,7 +9307,7 @@ ul#LC_toolbar {
padding: 0;
margin: 2px;
list-style:none;
- position:relative;
+ display:inline;
background-color:white;
overflow: auto;
}
@@ -8392,6 +9335,13 @@ a.LC_toolbarItem {
background-color:transparent;
}
+.LC_navtools {
+ display: inline-block;
+ padding: 0;
+ margin: 2px;
+ vertical-align: middle;
+}
+
ul.LC_funclist {
margin: 0;
padding: 0.5em 1em 0.5em 0;
@@ -8496,13 +9446,39 @@ pre.LC_wordwrap {
/*
styles used for response display
*/
-div.LC_radiofoil, div.LC_rankfoil {
+div.LC_radiofoil, div.LC_rankfoil, div.LC_optionfoil, div.LC_matchfoil, div.LC_login_links {
margin: .5em 0em .5em 0em;
}
table.LC_itemgroup {
margin-top: 1em;
}
+table.LC_itemgroup tr th {
+ font-weight: normal;
+}
+
+fieldset.LC_webbubbles {
+ margin: 2px 0 0 0;
+ padding: 0;
+ border: 0;
+}
+
+ul.LC_webbubbles {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ text-align: left;
+ float: left;
+}
+
+ul.LC_webbubbles li {
+ line-height: 1.8em;
+ border: 1px solid black;
+ padding: 0 2px 0 5px;
+ margin: 0 0 0 -1px;
+ float: left;
+}
+
/*
styles used by TTH when "Default set of options to pass to tth/m
when converting TeX" in course settings has been set
@@ -8658,7 +9634,13 @@ Inputs: $title - optional title for the
3- whether the side effect should occur
(side effect of setting
$env{'internal.head.redirect'} to the url
- redirected too)
+ redirected to)
+ 4- whether the redirect target should be
+ the opener of the current (pop-up)
+ window (side effect of setting
+ $env{'internal.head.to_opener'} to
+ 1, if true.
+ 5- whether encrypt check should be skipped
domain -> force to color decorate a page for a specific
domain
function -> force usage of a specific rolish color scheme
@@ -8692,7 +9674,7 @@ sub headtag {
$inhibitprint = &print_suppression();
}
- if (!$args->{'frameset'}) {
+ if (!$args->{'frameset'} && !$args->{'switchserver'}) {
$result .= &Apache::lonhtmlcommon::htmlareaheaders();
}
if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
@@ -8700,7 +9682,8 @@ sub headtag {
}
if (!$args->{'no_nav_bar'}
&& !$args->{'only_body'}
- && !$args->{'frameset'}) {
+ && !$args->{'frameset'}
+ && !$args->{'switchserver'}) {
$result .= &help_menu_js($httphost);
$result.=&modal_window();
$result.=&togglebox_script();
@@ -8721,15 +9704,45 @@ sub headtag {
}
}
if (ref($args->{'redirect'})) {
- my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
- $url = &Apache::lonenc::check_encrypt($url);
+ my ($time,$url,$inhibit_continue,$to_opener,$skip_enc_check) = @{$args->{'redirect'}};
+ if (!$skip_enc_check) {
+ $url = &Apache::lonenc::check_encrypt($url);
+ }
if (!$inhibit_continue) {
$env{'internal.head.redirect'} = $url;
}
- $result.=< LON-CAPA '.$title.' '
- .' LON-CAPA '.$title.' ';
+ }
+ $result .= "\n".',
+ and &standard_css() contains CSS for #LC_breadcrumbs, if you want
+ to override those values, or add to them, specify the value to
+ include in the style attribute to include in the div tag by using
+ bread_crumbs_style (e.g., overflow: visible)
bread_crumbs_nomenu -> if true will pass false as the value of $menulink
to lonhtmlcommon::breadcrumbs
group -> includes the current group, if page is for a
@@ -9077,6 +10103,7 @@ $args - additional optional args support
links_disabled -> Links in primary and secondary menus are disabled
(Can enable them once page has loaded - see lonroles.pm
for an example).
+ links_target -> Target for links, e.g., _parent (optional).
=back
@@ -9165,6 +10192,7 @@ sub start_page {
}
}
+ my $showncrumbs;
if (! exists($args->{'skip_phases'}{'body'}) ) {
if ($args->{'frameset'}) {
my $attr_string = &make_attr_string($args->{'force_register'},
@@ -9177,7 +10205,8 @@ sub start_page {
$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},
$args->{'bgcolor'}, $args,
- \@advtools,$ltiscope,$ltiuri,\%ltimenu,$menucoll,\%menu);
+ \@advtools,$ltiscope,$ltiuri,\%ltimenu,$menucoll,
+ \%menu,\$showncrumbs);
}
}
@@ -9199,6 +10228,7 @@ sub start_page {
#Breadcrumbs
if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
+ unless ($showncrumbs) {
&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') {
@@ -9221,12 +10251,23 @@ sub start_page {
} else {
undef($menulink);
}
+ my $linkprotout;
+ if ($env{'request.deeplink.login'}) {
+ my $linkprotout = &Apache::lonmenu::linkprot_exit();
+ if ($linkprotout) {
+ &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
+ }
+ }
#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'},'',$menulink);
+ $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'},
+ '',$menulink,'',
+ $args->{'bread_crumbs_style'});
} else {
- $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink);
+ $result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink,'',
+ $args->{'bread_crumbs_style'});
}
+ }
}
return $result;
}
@@ -9305,7 +10346,7 @@ sub menucoll_in_effect {
}
}
if ($deeplink ne '') {
- my ($state,$others,$listed,$scope,$protect,$display) = split(/,/,$deeplink);
+ my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink);
if ($display =~ /^\d+$/) {
$deeplinkmenu = 1;
$menucoll = $display;
@@ -9360,6 +10401,50 @@ sub symb_from_tinyurl {
}
}
+sub usable_exttools {
+ my %tooltypes;
+ if ($env{'request.course.id'}) {
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'}) {
+ if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'both') {
+ %tooltypes = (
+ crs => 1,
+ dom => 1,
+ );
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'crs') {
+ $tooltypes{'crs'} = 1;
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'dom') {
+ $tooltypes{'dom'} = 1;
+ }
+ } else {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $crstype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
+ if ($crstype eq '') {
+ $crstype = 'course';
+ }
+ if ($crstype eq 'course') {
+ if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'}) {
+ $crstype = 'official';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
+ $crstype = 'textbook';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.lti'}) {
+ $crstype = 'lti';
+ } else {
+ $crstype = 'unofficial';
+ }
+ }
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ if ($domdefaults{$crstype.'domexttool'}) {
+ $tooltypes{'dom'} = 1;
+ }
+ if ($domdefaults{$crstype.'exttool'}) {
+ $tooltypes{'crs'} = 1;
+ }
+ }
+ }
+ return %tooltypes;
+}
+
sub wishlist_window {
return(<<'ENDWISHLIST');