[LON-CAPA-cvs] cvs: loncom /interface lonwishlist.pm
raeburn
raeburn at source.lon-capa.org
Wed Apr 10 18:12:43 EDT 2013
raeburn Wed Apr 10 22:12:43 2013 EDT
Modified files:
/loncom/interface lonwishlist.pm
Log:
- Use separate $indent_view, $indent_edit, $indent_move, and $indent_imp
to eliminate multiple declarations for $indent at same scope.
-------------- next part --------------
Index: loncom/interface/lonwishlist.pm
diff -u loncom/interface/lonwishlist.pm:1.16 loncom/interface/lonwishlist.pm:1.17
--- loncom/interface/lonwishlist.pm:1.16 Wed Aug 1 19:07:51 2012
+++ loncom/interface/lonwishlist.pm Wed Apr 10 22:12:43 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility-routines for wishlist
#
-# $Id: lonwishlist.pm,v 1.16 2012/08/01 19:07:51 raeburn Exp $
+# $Id: lonwishlist.pm,v 1.17 2013/04/10 22:12:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1098,7 +1098,7 @@
# HTML-Markup for table if in view-mode
my $wishlistHTMLview;
-my $indent = $indentConst;
+my $indent_view = $indentConst;
sub wishlistView {
my $nodes = shift;
@@ -1117,7 +1117,7 @@
# entry is a folder
if ($n->value()->path() eq '') {
- $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">'.
+ $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<0?0:($indent_view-$indentConst)).'px; min-width: 220px;">'.
'<a href="javascript:;" onclick="folderAction('."'row".$index."'".')" style="vertical-align:top">'.
'<img src="/adm/lonIcons/arrow.closed.gif" id="img'.$index.'" alt = "" class="LC_icon"/>'.
'<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/>'.
@@ -1125,7 +1125,7 @@
}
# entry is a link
else {
- $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">'.
+ $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<=0?$indentConst:$indent_view).'px; min-width: 220px;">'.
'<a href="javascript:preview('."'".$n->value()->path()."'".');">'.
'<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link" />'.
$n->value()->title().'</a></td>';
@@ -1155,9 +1155,9 @@
# if the entry is a folder, it could have other entries as content. if it has, call wishlistView for those entries
my @children = $n->children();
if ($#children >=0) {
- $indent += 20;
+ $indent_view += 20;
&wishlistView(\@children);
- $indent -= 20;
+ $indent_view -= 20;
}
}
}
@@ -1165,7 +1165,7 @@
# HTML-Markup for table if in edit-mode
my $wishlistHTMLedit;
-my $indent = $indentConst;
+my $indent_edit = $indentConst;
sub wishlistEdit {
my $nodes = shift;
my $curNode = 1;
@@ -1200,7 +1200,7 @@
if ($n->value()->path() eq '') {
$wishlistHTMLedit .= '<td><select class="LC_hidden" name="sel" id="sel'.$index.'" onchange="submitSelect();">'.
$options.'</select></td>'.
- '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px;">'.
+ '<td id="padd'.$index.'" style="padding-left:'.(($indent_edit-$indentConst)<0?0:($indent_edit-$indentConst)).'px;">'.
'<a href="javascript:;" onclick="folderAction('."'row".$index."'".')" style="vertical-align:top" >'.
'<img src="/adm/lonIcons/arrow.closed.gif" id="img'.$index.'" alt = "" class="LC_icon"/>'.
'<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/></a>'.
@@ -1212,7 +1212,7 @@
else {
$wishlistHTMLedit .= '<td><select class="LC_hidden" name="sel" id="sel'.$index.'" onchange="submitSelect();">'.
$options.'</select></td>'.
- '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px;">'.
+ '<td id="padd'.$index.'" style="padding-left:'.(($indent_edit-$indentConst)<=0?$indentConst:$indent_edit).'px;">'.
'<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
'<input type="text" name="newtitle" value="'.$n->value()->title().'" alt = "'.$n->value()->title().'" /></td>'.
'<td><input type="text" name="newpath" value="'.$n->value()->path().'" alt = "'.$n->value()->path().'" /></td>';
@@ -1242,9 +1242,9 @@
# if the entry is a folder, it could have other entries as content. if it has, call wishlistEdit for those entries
my @children = $n->children();
if ($#children >=0) {
- $indent += 20;
+ $indent_edit += 20;
&wishlistEdit(\@children);
- $indent -= 20;
+ $indent_edit -= 20;
}
}
}
@@ -1254,7 +1254,7 @@
# HTML-Markup for table if in move-mode
my $wishlistHTMLmove ='<tr id="root" class="LC_odd_row"><td><input type="radio" name="mark" id="radioRoot" value="root" /></td>'.
'<td>'.&mt('Top level').'</td><td></td></tr>';
-my $indent = $indentConst;
+my $indent_move = $indentConst;
sub wishlistMove {
my $nodes = shift;
my $marked = shift;
@@ -1278,12 +1278,12 @@
# display a radio-button, if the folder was not selected to be moved
if (!$isIn) {
$wishlistHTMLmove .= '<td><input type="radio" name="mark" id="radio'.$index.'" value="'.$index.'" /></td>'.
- '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">';
+ '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<0?0:($indent_move-$indentConst)).'px; min-width: 220px;">';
}
# highlight the title, if the folder was selected to be moved
else {
$wishlistHTMLmove .= '<td></td>'.
- '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;'.
+ '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<0?0:($indent_move-$indentConst)).'px; min-width: 220px;'.
'color:red;">';
}
#arrow- and folder-image, all folders are open, and title
@@ -1300,7 +1300,7 @@
}
# link-image and title
$wishlistHTMLmove .= '<td></td>'.
- '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">'.
+ '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<=0?$indentConst:$indent_move).'px; min-width: 220px;">'.
'<a href="javascript:preview('."'".$n->value()->path()."'".');" '.$highlight.'>'.
'<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
$n->value()->title().'</a></td>';
@@ -1330,9 +1330,9 @@
# if the entry is a folder, it could have other entries as content. if it has, call wishlistMove for those entries
my @children = $n->children();
if ($#children >=0) {
- $indent += 20;
+ $indent_move += 20;
&wishlistMove(\@children, $marked);
- $indent -= 20;
+ $indent_move -= 20;
}
}
}
@@ -1341,7 +1341,7 @@
# HTML-Markup for table if in import-mode
my $wishlistHTMLimport;
-my $indent = $indentConst;
+my $indent_imp = $indentConst;
my $form = 1;
sub wishlistImport {
my ($nodes,$numskipped) = @_;
@@ -1395,7 +1395,7 @@
# entry is a folder
if ($n->value()->path() eq '') {
- $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<0?0:($indent-$indentConst)).'px; min-width: 220px;">'.
+ $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<0?0:($indent_imp-$indentConst)).'px; min-width: 220px;">'.
'<a href="javascript:;" onclick="folderAction('."'row".$index."'".')" style="vertical-align:top">'.
'<img src="/adm/lonIcons/arrow.closed.gif" id="img'.$index.'" alt = "" class="LC_icon"/>'.
'<img src="/adm/lonIcons/navmap.folder.closed.gif" id="imgFolder'.$index.'" alt="folder"/>'.
@@ -1403,7 +1403,7 @@
}
# entry is a link
else {
- $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent-$indentConst)<=0?$indentConst:$indent).'px; min-width: 220px;">';
+ $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<=0?$indentConst:$indent_imp).'px; min-width: 220px;">';
unless ($nopick{$n->value()->path()}) {
$wishlistHTMLimport .= '<a href="javascript:preview('."'".$n->value()->path()."'".');">';
}
@@ -1436,9 +1436,9 @@
# if the entry is a folder, it could have other entries as content. if it has, call wishlistImport for those entries
my @children = $n->children();
if ($#children >=0) {
- $indent += 20;
+ $indent_imp += 20;
&wishlistImport(\@children,$numskipped);
- $indent -= 20;
+ $indent_imp -= 20;
}
}
return;
More information about the LON-CAPA-cvs
mailing list