Unterstützung für 'href'-Menüeinträge im JavaScript-Menü gefixt

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index a9a17481d73d909350f9bc7f1046eb4b8db5b7ec..8d616093b28407321b78737fe9bb0f929a12cec1 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -115,7 +115,7 @@ sub create_menu {
     my $item      = { 'title' => $::locale->text($name) };
     push @{ $all_items }, $item;
 
     my $item      = { 'title' => $::locale->text($name) };
     push @{ $all_items }, $item;
 

-    if ($menu_item->{submenu} || !defined($menu_item->{module})) {
+    if ($menu_item->{submenu} || (!defined($menu_item->{module}) && !defined($menu_item->{href}))) {

       $item->{subitems} = [];
       $item->{image} = _icon_path("$name.png");
       $self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);
       $item->{subitems} = [];
       $item->{image} = _icon_path("$name.png");
       $self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 4c51b6637a0af3f9149218683095bf5e3aaac95f..b54c9beb2942345a396c117397019cab2758f670 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -38,7 +38,7 @@ $(clockon);
  [%- FOREACH mainitem = menu_items %]
   [%- SET main_id = main_id + 1 %]
   <li id="[% main_id %]"[% IF mainitem.image %] itemIcon="[% mainitem.image %]"[% END %]>
  [%- FOREACH mainitem = menu_items %]
   [%- SET main_id = main_id + 1 %]
   <li id="[% main_id %]"[% IF mainitem.image %] itemIcon="[% mainitem.image %]"[% END %]>

-   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]">
+   <a href="[% IF mainitem.href %][% mainitem.href %][% ELSE %]#[% END %]"[% IF mainitem.target && (mainitem.target != 'main_window') %] target="[% HTML.escape(mainitem.target) %]"[% END %]>

     [%- HTML.escape(mainitem.title) %]
    </a>
    [%- IF mainitem.subitems %]
     [%- HTML.escape(mainitem.title) %]
    </a>
    [%- IF mainitem.subitems %]


@@ -47,7 +47,7 @@ $(clockon);
      [%- FOREACH sub1item = mainitem.subitems %]
       [%- SET sub1_id = sub1_id + 1 %]
       <li id="[% sub1_id %]"[% IF sub1item.image %] itemIcon="[% sub1item.image %]"[% END %]>
      [%- FOREACH sub1item = mainitem.subitems %]
       [%- SET sub1_id = sub1_id + 1 %]
       <li id="[% sub1_id %]"[% IF sub1item.image %] itemIcon="[% sub1item.image %]"[% END %]>

-       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]">
+       <a href="[% IF sub1item.href %][% sub1item.href %][% ELSE %]#[% END %]"[% IF sub1item.target && (sub1item.target != 'main_window') %] target="[% HTML.escape(sub1item.target) %]"[% END %]>

         [%- HTML.escape(sub1item.title) %]
        </a>
        [%- IF sub1item.subitems %]
         [%- HTML.escape(sub1item.title) %]
        </a>
        [%- IF sub1item.subitems %]


@@ -56,7 +56,7 @@ $(clockon);
          [%- FOREACH sub2item = sub1item.subitems %]
           [%- SET sub2_id = sub2_id + 1 %]
           <li id="[% sub2_id %]"[% IF sub2item.image %] itemIcon="[% sub2item.image %]"[% END %]>
          [%- FOREACH sub2item = sub1item.subitems %]
           [%- SET sub2_id = sub2_id + 1 %]
           <li id="[% sub2_id %]"[% IF sub2item.image %] itemIcon="[% sub2item.image %]"[% END %]>

-           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]">
+           <a href="[% IF sub2item.href %][% sub2item.href %][% ELSE %]#[% END %]"[% IF sub2item.target && (sub2item.target != 'main_window') %] target="[% HTML.escape(sub2item.target) %]"[% END %]>

             [%- HTML.escape(sub2item.title) %]
            </a>
           </li>
             [%- HTML.escape(sub2item.title) %]
            </a>
           </li>