--- loncom/interface/domainprefs.pm	2007/04/04 00:10:01	1.7
+++ loncom/interface/domainprefs.pm	2007/04/05 21:36:15	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.7 2007/04/04 00:10:01 albertel Exp $
+# $Id: domainprefs.pm,v 1.8 2007/04/05 21:36:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,10 +139,6 @@ sub handler {
                               $item,$domconfig{$item->{'action'}});
         }
         $r->print('
-           </table>
-          </td>
-         </tr>
-        </table>
       </td>
     </tr>
    </table>');
@@ -277,7 +273,7 @@ function changePage(formname,newphase) {
                                            $js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings'));
     $r->print('
-<form name="parmform">
+<form name="parmform" action="">
 <input type="hidden" name="pres_marker" />
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
@@ -360,23 +356,16 @@ sub print_login {
             }
         }
     } else {
-        $designs{'domlogo'} = '';
-        if (-e '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif') {
-            $designs{'domlogo'} = '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif';
-            $is_custom{'domlogo'} = 1;
-        }
-        if ($designhash{$dom.'.login.img'} ne '') {
-            $designs{'img'} = $designhash{$dom.'.login.img'};
-            $is_custom{'img'} = 1;
-        }
-        if ($designhash{$dom.'.login.logo'} ne '') {
-            $designs{'logo'} = $designhash{$dom.'.login.logo'};
-            $is_custom{'logo'} = 1;
-        }
         if ($designhash{$dom.'.login.font'} ne '') {
             $designs{'font'} = $designhash{$dom.'.login.font'};
             $is_custom{'font'} = 1;
         }
+        foreach my $item (@images) {
+            if ($designhash{$dom.'.login.'.$item} ne '') {
+                $designs{$item} = $designhash{$dom.'.login.'.$item};
+                $is_custom{$item} = 1;
+            }
+        }
         foreach my $item (@bgs) {
             if ($designhash{$dom.'.login.'.$item} ne '') {
                 $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item};
@@ -398,20 +387,20 @@ sub print_login {
     my $datatable = 
         '<tr'.$css_class.'><td colspan="2">'.$choices{'coursecatalog'}.
         '</td><td>'.
-        '<nobr><input type="radio" name="coursecatalog"'.
-        $catalogon.' value="1" />'.&mt('Yes').'&nbsp;'.
-        '<input type="radio" name="coursecatalog"'.
-        $catalogoff.'value="0" />'.&mt('No').'</nobr></td>'.
+        '<span class="LC_nobreak"><label><input type="radio" name="coursecatalog"'.
+        $catalogon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+        '<label><input type="radio" name="coursecatalog"'.
+        $catalogoff.'value="0" />'.&mt('No').'</label></span></td>'.
         '</tr>';
     $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
         '<td colspan="2">'.$choices{'adminmail'}.'</td>'.
-        '<td><nobr>'.
-        '<input type="radio" name="adminmail"'.
-        $adminmailon.' value="1" />'.&mt('Yes').'&nbsp;'.
-        '<input type="radio" name="adminmail"'.
-        $adminmailoff.'value="0" />'.&mt('No').'</nobr></td>';
+        '<td><span class="LC_nobreak">'.
+        '<label><input type="radio" name="adminmail"'.
+        $adminmailon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+        '<label><input type="radio" name="adminmail"'.
+        $adminmailoff.'value="0" />'.&mt('No').'</label></span></td></tr>';
     $itemcount ++;
     $datatable .= &display_color_options($dom,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
     $datatable .= '</tr></table></td></tr>';
@@ -506,7 +495,7 @@ sub print_rolecolors {
         }
     }
     my $itemcount = 1;
-    my $datatable = display_color_options($dom,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
+    my $datatable = &display_color_options($dom,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
     $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
@@ -524,14 +513,14 @@ sub display_color_options {
         $datatable .= '<td>&nbsp;</td>';
     }
     my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'});
-    $datatable .= '<td><nobr>'.
+    $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" size="10" name="'.$role.'_font"'.
-                  ' value="'.$designs->{'font'}.'" />&nbsp'.$fontlink.
-                  '</nobr></td></tr>';
+                  ' value="'.$designs->{'font'}.'" />&nbsp;'.$fontlink.
+                  '</span></td></tr>';
     foreach my $img (@{$images}) {
         $itemcount ++;
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '</tr><tr'.$css_class.'>'.
+        $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{$img}.'</td>';
         my $imgfile;
         if ($designs->{$img} ne '') {
@@ -578,8 +567,9 @@ sub display_color_options {
                 $datatable.= '<img src="'.$showfile.'" alt="'.
                              $alt_text->{$img}.'" /></td>';
                 if ($is_custom->{$img}) {
-                    $datatable.='<td><nobr><input type="checkbox" name="'.$role.'_del_'.$img.'" value="1">'.
-                                &mt('Delete?').'&nbsp;'.&mt('Replace:').'</nobr><br />';
+                    $datatable.='<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
+                                $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
+                                '</label>&nbsp;'.&mt('Replace:').'</span><br />';
                 } else {
                     $datatable.='<td valign="bottom">'.&mt('Upload:').'<br />';
                 }
@@ -591,7 +581,7 @@ sub display_color_options {
             $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
                           &mt('Upload:');
         }
-        $datatable .= '&nbsp;<input type="file" name="'.$role.'_'.$img.'" /></nobr></td></tr>';
+        $datatable .= '&nbsp;<input type="file" name="'.$role.'_'.$img.'" /></td></tr>';
     }
     $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
@@ -604,7 +594,7 @@ sub display_color_options {
         }
     }
     if ($bgs_def) {
-        $datatable .= '<td>'.&mt('Default(s) in use').'<br /><table border="0"><tr>'.$bgs_def.'</tr></table></td>';
+        $datatable .= '<td>'.&mt('Default(s) in use:').'<br /><table border="0"><tr>'.$bgs_def.'</tr></table></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -631,7 +621,7 @@ sub display_color_options {
         }
     }
     if ($links_def) {
-        $datatable .= '<td>'.&mt('Default(s) in use').'<br /><table border="0"><tr>'.$links_def.'</tr></table></td>';
+        $datatable .= '<td>'.&mt('Default(s) in use:').'<br /><table border="0"><tr>'.$links_def.'</tr></table></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -710,10 +700,10 @@ sub print_quotas {
                 $css_class = $typecount%2?' class="LC_odd_row"':'';
                 $datatable .= '<tr'.$css_class.'>'. 
                               '<td>'.$usertypes->{$type}.'</td>'.
-                              '<td class="LC_right_item"><nobr>'.
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
                               '" value="'.$settings->{$type}.
-                              '" size="5" /> Mb</nobr></td></tr>';
+                              '" size="5" /> Mb</span></td></tr>';
             }
         }
         $othertitle = "Other users";
@@ -728,9 +718,9 @@ sub print_quotas {
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.&mt($othertitle).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
                   '<input type="text" name="default" value="'.
-                  $defaultquota.'" size="5" /> Mb</nobr></td></tr>';
+                  $defaultquota.'" size="5" /> Mb</span></td></tr>';
     return $datatable;
 }
 
@@ -764,19 +754,19 @@ sub print_autoenroll {
     my $domform = &Apache::loncommon::select_dom_form($defdom,'sender_domain',1);
     my $datatable='<tr class="LC_odd_row">'.
                   '<td>'.&mt('Auto-enrollment active?').'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoenroll_run"'.
-                  $runon.' value="1" />'.&mt('Yes').'&nbsp;'.
-                  '<input type="radio" name="autoenroll_run"'.
-                  $runoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  $runon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autoenroll_run"'.
+                  $runoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt('Notification messages - sender').
-                  '</td><td class="LC_right_item"><nobr>'.
+                  '</td><td class="LC_right_item"><span class="LC_nobreak">'.
                   &mt('username').':&nbsp;'.
                   '<input type="text" name="sender_uname" value="'.
                   $settings->{'sender_uname'}.
                   '" size="10" />&nbsp;&nbsp;'.&mt('domain').
-                  ':&nbsp;'.$domform.'</nobr></td></tr>';
+                  ':&nbsp;'.$domform.'</span></td></tr>';
     return $datatable;
 }
 
@@ -804,18 +794,18 @@ sub print_autoupdate {
                     );
         $datatable = '<tr class="LC_odd_row">'. 
                   '<td>'.&mt($title{'run'}).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
-                  '<input type="radio" name="autoupdate_run"'.
-                  $updateon.' value="1" />'.&mt('Yes').'&nbsp;'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoupdate_run"'.
-                  $updateoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  $updateon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autoupdate_run"'.
+                  $updateoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt($title{'classlists'}).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
-                  '<input type="radio" name="classlists"'.
-                  $classlistson.' value="1" />'.&mt('Yes').'&nbsp;'.
-                  '<input type="radio" name="classlists"'.
-                  $classlistsoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
     } else {
         my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
@@ -892,10 +882,10 @@ sub usertype_update_row {
                 } else {
                     $datatable .= '<td>';
                 }
-                $datatable .= '<nobr><input type="checkbox" name="updateable_'.
-                              $type.'_'.$fields->[$i].'" '.
-                              '" value="1"'.$check.'/>'.
-                              $fieldtitles->{$fields->[$i]}.'</nobr></td>';
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="updateable_'.$type.
+                              '_'.$fields->[$i].'" value="1"'.$check.'/>'.
+                              $fieldtitles->{$fields->[$i]}.'</label></span></td>';
             }
             $datatable .= '</tr></table></td></tr>';
         }
@@ -1017,7 +1007,7 @@ sub modify_colors {
         foreach my $item (@bgs,@links) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
-        foreach my $img (@images) { 
+        foreach my $img (@images) {
             if ($env{'form.'.$role.'_'.$img.'.filename'} ne '') {
                 my $configuserok; 
                 if (&Apache::lonnet::homeserver($configuname,$dom) eq 'no_host') {
@@ -1043,8 +1033,12 @@ sub modify_colors {
                     }
                 } else {
                     my $error = &mt("Upload of image [_1] for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$img,$configuname,$dom,$configuserok);
-                   &Apache::lonnet::logthis($error);
-                   $errors .= '<li>'.$error.'</li>';
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li>'.$error.'</li>';
+                }
+            } elsif ($domconfig->{$role}{$img} ne '') {
+                if ($domconfig->{$role}{$img} !~ m|^/uploaded/\Q$dom\E/\Q$dom\E\-domainconfig/portfolio/\$img/.+|) {
+                    #FIXME copy file to target directory    
                 }
             }
         }