template partial rendern

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 1785a198b3c72939b22cda683f5e0015ac5f0eed..cdc6491aa909572f6bb27c65683c05a056ed5f05 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -38,13 +38,12 @@ sub display {
   $callback               = URI->new($callback)->rel($callback) if $callback;
   $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 
   $callback               = URI->new($callback)->rel($callback) if $callback;
   $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 

-  $form->parse_html_template("menu/menunew", {
-#  $self->render("menu/menunew", { no_menu => 1, no_output => 1 }, # buggy, no idea why
+  $self->render("menu/menunew", { partial => 1, no_output => 1 },

     force_ul_width  => 1,
     date            => $self->clock_line,
     menu_items      => $self->acc_menu,
     callback        => $callback,
     force_ul_width  => 1,
     date            => $self->clock_line,
     menu_items      => $self->acc_menu,
     callback        => $callback,

-  });
+  );

 }
 
 sub clock_line {
 }
 
 sub clock_line {

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index 0a33c65b1a17f309c213c55c41782231fd6ee7c7..630667f0c209d2af4a9bc99a4f7247c72ae2bf40 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -24,7 +24,7 @@ $(clockon);
     [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" nowrap>
     [<a href="JavaScript:top.main_window.print()">[% 'print' | $T8 %]</a>]
    </td>
    <td align="right" nowrap>

-    [[% 'User' | $T8 %]: [% HTML.escape(login) %] -
+    [[% 'User' | $T8 %]: [% HTML.escape(MYCONFIG.login) %] -

     <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
     <a href="controller.pl?action=LoginScreen/logout" target="_top">[% 'logout' | $T8 %]</a>]
     [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>