X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/075bd42af8885aee3c18fe055a2c82b8b43f4cea..6f266e929ff3eaefc84c34b46fa452c50eecbcf4:/SL/Layout/Base.pm

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 0c209e2af..cd5ace939 100644
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -101,10 +101,10 @@ sub get_stylesheet_for_user {
         -f "$css_path/$user_style/main.css") {
       $css_path = "$css_path/$user_style";
     } else {
-      $css_path = "$css_path/lx-office-erp";
+      $css_path = "$css_path/kivitendo";
     }
   } else {
-    $css_path = "$css_path/lx-office-erp";
+    $css_path = "$css_path/kivitendo";
   }
   $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here
 
@@ -125,7 +125,7 @@ sub javascripts {
   my ($self) = @_;
 
   return uniq map { $self->_find_javascript($_)  }
-    $self->use_javascript, map { $_->javascripts } $self->sub_layouts;
+    map({ $_->javascripts } $self->sub_layouts), $self->use_javascript;
 }
 
 sub _find_javascript {