--- loncom/publisher/lonrights.pm	2009/12/02 18:33:35	1.29
+++ loncom/publisher/lonrights.pm	2013/06/04 22:20:16	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to show and edit custom distribution rights
 #
-# $Id: lonrights.pm,v 1.29 2009/12/02 18:33:35 bisitz Exp $
+# $Id: lonrights.pm,v 1.35 2013/06/04 22:20:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,8 +58,8 @@ sub handler {
   # Breadcrumbs
   &Apache::lonhtmlcommon::clear_breadcrumbs();
   &Apache::lonhtmlcommon::add_breadcrumb({
-      'text'  => 'Construction Space',
-      'href'  => &Apache::loncommon::authorspace(),
+      'text'  => 'Authoring Space',
+      'href'  => &Apache::loncommon::authorspace($r->uri),
       });
   &Apache::lonhtmlcommon::add_breadcrumb({
       'text'  => 'Custom Rights Editor',
@@ -78,7 +78,7 @@ sub handler {
   my $uri=$r->uri;
   my $fn=&Apache::lonnet::filelocation('',$uri);
   my $contents='';
-  my $constructmode=($uri=~/^\/\~/);
+  my $constructmode=($uri=~ m{^/priv/});
 
 # ============================================================ Modify and store
   if ($constructmode && $env{'form.store'}) {
@@ -180,7 +180,7 @@ sub handler {
           $contents=join('',<$fh>);
           $fh->close();
       }
-      $r->print('<form name="rules" method="post">');
+      $r->print('<form name="rules" method="post" action="">');
   }
   unless ($contents=~/\<accessrule/s) {
       $contents='<accessrule effect="deny" />';
@@ -196,6 +196,10 @@ sub handler {
 				     'co' => 'Course / User',
 				     'se' => 'Section',
 				     'ro' => 'Role');
+  my %iconimg = ('allow' => '<img src="/adm/lonIcons/navmap.correct.gif"'
+                           .' alt="'.&mt('allow').'" title="'.&mt('allow').'" />',
+                 'deny' => '<img src="/adm/lonIcons/navmap.wrong.gif"'
+                           .' alt="'.&mt('deny').'" title="'.&mt('deny').'" />');
 # ---------------------------------------------------------- Start table output
   $r->print(&Apache::loncommon::start_data_table().
 	    &Apache::loncommon::start_data_table_header_row().
@@ -210,21 +214,20 @@ sub handler {
   $r->print(&Apache::loncommon::start_data_table_row().'<td align="right">');
   if ($constructmode) {
      $r->print(&Apache::loncommon::select_form('','action_0',
-                                  ('' => '',
-                                   'insertbelow' => &mt('Insert rule below'))));
+                                  {'' => '',
+                                   'insertbelow' => &mt('Insert rule below')}));
                                                 
   } else {
       $r->print('&nbsp;');
   }
   $r->print('</td><td>');
+  $r->print($iconimg{$token->[2]->{'effect'}});
   if ($constructmode) {
-      $r->print(&Apache::loncommon::select_form
-                                 ($token->[2]->{'effect'},'effect_0',
-                                  &Apache::lonlocal::texthash
+      my %lt = &Apache::lonlocal::texthash
                                    ('allow' => 'allow',
-                                    'deny'  => 'deny')));
-  } else {
-      $r->print($token->[2]->{'effect'});
+                                    'deny'  => 'deny');
+      $r->print(&Apache::loncommon::select_form
+                                 ($token->[2]->{'effect'},'effect_0',\%lt));
   }
   $r->print('</td><td colspan="5">'.&mt('Default'));
   if (($token->[2]->{'realm'}) || ($token->[2]->{'role'})) {
@@ -241,41 +244,42 @@ sub handler {
 # insert, delete, etc
 	  $r->print('<span class="LC_nobreak">'.$rulecounter.'. ');
           if ($constructmode) {
+             my %lt = &Apache::lonlocal::texthash
+                          (''            => '',
+                           'delete'      => 'Delete this rule',
+                           'insertabove' => 'Insert rule above',
+                           'insertbelow' => 'Insert rule below',
+                           'moveup'      => 'Move rule up',
+                           'movedown'    => 'Move rule down'
+                           );
+
              $r->print(&Apache::loncommon::select_form(
-                    '','action_'.$rulecounter,
-                    &Apache::lonlocal::texthash
-                    ('' => '', 
-                     'delete' => 'Delete this rule',
-                     'insertabove' => 'Insert rule above',
-                     'insertbelow' => 'Insert rule below',
-                     'moveup'      => 'Move rule up',
-                     'movedown'    => 'Move rule down')));
+                    '','action_'.$rulecounter,\%lt));
 	  }
           $r->print('</span></td>'.
 		    '<td rowspan="2">');
 # effect
+          $r->print($iconimg{$token->[2]->{'effect'}});
           if ($constructmode) {
+             my %lt = &Apache::lonlocal::texthash
+                             ('allow' => 'allow',
+                              'deny'  => 'deny');
              $r->print(&Apache::loncommon::select_form
                                  ($token->[2]->{'effect'},
-                                  'effect_'.$rulecounter,
-                                  &Apache::lonlocal::texthash
-                                   ('allow' => 'allow',
-                                    'deny'  => 'deny')));
-          } else {
-             $r->print($token->[2]->{'effect'});
+                                  'effect_'.$rulecounter,\%lt));
           }
 
 # type
 	  $r->print('</td><td rowspan="2">');
 	  my $type = ($token->[2]{'type'} || 'course');
           if ($constructmode) {
+              my %lt = &Apache::lonlocal::texthash
+                           ('course' => 'Course',
+                            'user'   => 'User');
               $r->print(&Apache::loncommon::select_form($type,
-							'type_'.$rulecounter,
-                            &Apache::lonlocal::texthash
-							('course' => 'Course',
-							 'user'   => 'User')));
+							'type_'.$rulecounter,\%lt));
           } else {
-              $r->print($type);
+              $r->print(&mt($type));
           }
 
 # ---- realm
@@ -328,7 +332,7 @@ sub handler {
 		  my $role=$token->[2]->{'role'};
 		  unless ($role) { $role=''; }
 		  $r->print(&Apache::loncommon::select_form(
-							    $role,'role_'.$rulecounter,%hash));
+							    $role,'role_'.$rulecounter,\%hash));
 	      } else {
 		  $r->print(&Apache::lonnet::plaintext($token->[2]->{'role'}));
 	      }