Two fixes. First, an incorrect group ID in webdav_mover.pl has been

fixed. Second, I removed some unnecessary JavaScript from the side navigation bar, with thanks to Eldar Kononov.
bricoleurs · Apr 15, 2003 · 885217a · 885217a
1 parent 7798c2d
commit 885217a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/comp/widgets/help/patchers.html b/comp/widgets/help/patchers.html
@@ -12,4 +12,5 @@
   <li>Petar Bojkov</li>
   <li>Neil Conway</li>
   <li>Geoff Richards</li>
+  <li>Eldar Kononov</li>
 </ul>
diff --git a/comp/widgets/wrappers/sharky/sideNav.mc b/comp/widgets/wrappers/sharky/sideNav.mc
@@ -39,7 +39,7 @@ my $printLink = sub {
     if ($style =~ /Bold/ && !$isLink) {
        $out .= qq {<span class="$style">$caption</span><br />};
     } else {
-        $out .= qq {<a href="#" class="$style" onClick="return doLink('$href')">} . $lang->maketext($caption) .'</a><br />';
+        $out .= qq {<a href="$href" class="$style" target="_parent">} . $lang->maketext($caption) .'</a><br />';
     }
     return $out;
 };
@@ -112,11 +112,6 @@ unless ($workflows) {
         document.location.href = callback;
         return false;
     }
-
-    function doLink(link) {
-        parent.window.location.href = link;
-        return false;
-    }
     </script>
 % }
 <body marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bgcolor="#666633">
@@ -134,7 +129,7 @@ unless ($workflows) {
 
 <table border=0 cellpadding=0 cellspacing=0 bgcolor=white width=150>
 <tr>
-  <td class=sideNavActiveCell><a class=sideNavHeaderBold href="#" onClick="return doLink('/workflow/profile/workspace/')"><img src="<% $workspaceGraphic %>" width=150 height=20 border=0></a></td>
+  <td class="sideNavActiveCell"><a class="sideNavHeaderBold" href="/workflow/profile/workspace/" target="_parent"><img src="<% $workspaceGraphic %>" width=150 height=20 border=0></a></td>
 </tr>
 <tr>
   <td bgcolor="white"><img src="/media/images/spacer.gif" width=1 height=2></td>
@@ -448,10 +443,10 @@ appropriate side navigation bar.
 
 =head1 VERSION
 
-$Revision: 1.26.2.1 $
+$Revision: 1.26.2.2 $
 
 =head1 DATE
 
-$Date: 2003-03-27 23:48:02 $
+$Date: 2003-04-15 08:59:27 $
 
 </%doc>
diff --git a/data/burn/comp/oc_1/page.mc b/data/burn/comp/oc_1/page.mc
@@ -7,7 +7,7 @@ foreach my $e ($element->get_elements) {
     } elsif ($e->has_name('pull_quote')) {
         $burner->display_element($e);
 
-    } elsif ($e->has_name('inset')) {
+    } else {
         $burner->display_element($e);
 
     }

diff --git a/inst/upgrade/1.5.1/webdav_mover.pl b/inst/upgrade/1.5.1/webdav_mover.pl
@@ -14,6 +14,6 @@
 do_sql(qq{
     INSERT INTO class (id, key_name, pkg_name, disp_name, plural_name,
                        description, distributor)
-    VALUES (75, 'webdav', 'Bric::Util::Trans::WebDav', 'WebDAV', 'WebDav Transport',
+    VALUES (74, 'webdav', 'Bric::Util::Trans::WebDav', 'WebDAV', 'WebDav Transport',
             'Class with methods to move files via WebDav', 1)
 });
diff --git a/lib/Bric/Changes.pod b/lib/Bric/Changes.pod
@@ -38,6 +38,11 @@ F<contrib>. Thanks to Matt Vella for the contribution.
 New help pages for the event log and the workflow trail. Thanks to Geoff
 Richards for the contribution.
 
+=item *
+
+Some unnecessary JavaScript was removed from the side navigation layer. Thanks
+to Eldar Kononov for the suggestion. [David]
+
 =back
 
 =head2 Bug Fixes

diff --git a/lib/Bric/License.pod b/lib/Bric/License.pod
@@ -126,6 +126,8 @@ Folks who have submitted patches include:
 
 =item ClE<aacute>udio Valente
 
+=item Eldar Kononov
+
 =back
 
 Friends who have spotted bugs include: