[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm lonconfigsettings.pm
foxr
foxr at source.lon-capa.org
Tue Oct 30 06:39:02 EDT 2012
foxr Tue Oct 30 10:39:02 2012 EDT
Modified files:
/loncom/interface domainprefs.pm lonconfigsettings.pm
Log:
Enable use of colorchooser jquery plugin for domain peferences color selection
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.173 loncom/interface/domainprefs.pm:1.174
--- loncom/interface/domainprefs.pm:1.173 Tue Oct 2 19:21:20 2012
+++ loncom/interface/domainprefs.pm Tue Oct 30 10:39:02 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.173 2012/10/02 19:21:20 raeburn Exp $
+# $Id: domainprefs.pm,v 1.174 2012/10/30 10:39:02 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -406,12 +406,16 @@
col2 => 'Value'}],
};
}
+
+
+
my @roles = ('student','coordinator','author','admin');
my @actions = &Apache::loncommon::get_env_multiple('form.actions');
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:changePage(document.$phase,'pickactions')",
text=>"Settings to display/modify"});
my $confname = $dom.'-domainconfig';
+
if ($phase eq 'process') {
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
} elsif ($phase eq 'display') {
@@ -460,6 +464,7 @@
}
}
}
+
&Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
}
return OK;
@@ -521,6 +526,7 @@
my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_;
my $rowtotal = 0;
my $output;
+
if ($action eq 'coursecategories') {
$output = &coursecategories_javascript($settings);
}
@@ -1184,20 +1190,22 @@
$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $datatable = '<tr'.$css_class.'>'.
+ my $js = "<script type='text/javascript'>\n";
+ $js .= &Apache::lonhtmlcommon::color_picker();
+ my $js = "\n</script>\n";
+ my $datatable = $js . '<tr'.$css_class.'>'.
'<td>'.$choices->{'font'}.'</td>';
if (!$is_custom->{'font'}) {
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
} else {
$datatable .= '<td> </td>';
}
- my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'});
+ my $current_color = $designs->{'font'} ? $designs->{'font'} : $defaults->{'font'};
+
$datatable .= '<td><span class="LC_nobreak">'.
- '<input type="text" size="10" name="'.$role.'_font"'.
- ' value="'.$designs->{'font'}.'" /> '.$fontlink.
- ' <span id="css_'.$role.'_font" style="background-color: '.
- $designs->{'font'}.';"> </span>'.
- '</span></td></tr>';
+ '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
+ ' value="'.$current_color.'" /> '.
+ ' </td></tr>';
unless ($role eq 'login') {
$datatable .= '<tr'.$css_class.'>'.
'<td>'.$choices->{'fontmenu'}.'</td>';
@@ -1206,13 +1214,13 @@
} else {
$datatable .= '<td> </td>';
}
- $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+ $current_color = $designs->{'fontmenu'} ?
+ $designs->{'fontmenu'} : $defaults->{'fontmenu'};
$datatable .= '<td><span class="LC_nobreak">'.
- '<input type="text" size="10" name="'.$role.'_fontmenu"'.
- ' value="'.$designs->{'fontmenu'}.'" /> '.$fontlink.
- ' <span id="css_'.$role.'_fontmenu" style="background-color: '.
- $designs->{'fontmenu'}.';"> </span>'.
- '</span></td></tr>';
+ '<input class="colorchooser" type="text" size="10" name="'
+ .$role.'_fontmenu"'.
+ ' value="'.$current_color.'" /> '.
+ ' </td></tr>';
}
my $switchserver = &check_switchserver($dom,$confname);
foreach my $img (@{$images}) {
@@ -1339,13 +1347,16 @@
}
$datatable .= '<td class="LC_right_item">'.
'<table border="0"><tr>';
+
+
foreach my $item (@{$bgs}) {
- my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item});
- $datatable .= '<td align="center">'.$link;
+# my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item});
+ $datatable .= '<td align="center">';
+ my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
if ($designs->{'bgs'}{$item}) {
- $datatable .= ' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';"> </span>';
+ $datatable .= ' ';
}
- $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}.
+ $datatable .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
}
$datatable .= '</tr></table></td></tr>';
@@ -1367,13 +1378,13 @@
$datatable .= '<td class="LC_right_item">'.
'<table border="0"><tr>';
foreach my $item (@{$links}) {
- $datatable .= '<td align="center">'."\n".
- &color_pick($phase,$role,$item,$choices->{$item},
- $designs->{'links'}{$item});
+ my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
+ $datatable .= '<td align="center">'."\n";
+
if ($designs->{'links'}{$item}) {
- $datatable.=' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'links'}{$item}.';"> </span>';
+ $datatable.=' ';
}
- $datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'links'}{$item}.
+ $datatable .= '<br /><input type="text" size="8" class="colorchooser" name="'.$role.'_'.$item.'" value="'.$color.
'" /></td>';
}
$$rowtotal += $itemcount;
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.21 loncom/interface/lonconfigsettings.pm:1.22
--- loncom/interface/lonconfigsettings.pm:1.21 Thu Dec 8 22:10:18 2011
+++ loncom/interface/lonconfigsettings.pm Tue Oct 30 10:39:02 2012
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.21 2011/12/08 22:10:18 www Exp $
+# $Id: lonconfigsettings.pm,v 1.22 2012/10/30 10:39:02 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -94,9 +94,11 @@
formname.submit();
}'."\n";
if ($phase eq 'pickactions') {
+ $js .= &Apache::lonhtmlcommon::color_picker();
$js .=
&Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n";
} elsif ($phase eq 'display') {
+ $js .= &Apache::lonhtmlcommon::color_picker();
$js .= &color_pick_js()."\n";
}
$js .= &Apache::loncommon::viewport_size_js().'
More information about the LON-CAPA-cvs
mailing list