From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 13 Jun 2013 15:12:10 +0000 (+0200)
Subject: Versionsbildschirm: Firmennamenanzeige gefixt; Mandantennamen anzeigen; Datenbank... 
X-Git-Tag: release-3.1.0beta1~331^2~11
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=44c56028e89de13928738f898c9d12d62be4e4ed;p=kivitendo-erp.git

Versionsbildschirm: Firmennamenanzeige gefixt; Mandantennamen anzeigen; Datenbank nicht anzeigen
---

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 7971c2da8..25379dd7a 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -27,9 +27,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #######################################################################
 
-use DBI;
-use SL::Auth;
-use SL::User;
+use SL::DB::Default;
 use SL::Form;
 use SL::Git;
 
@@ -51,6 +49,8 @@ sub company_logo {
   $form->{stylesheet} =  $myconfig{stylesheet};
   $form->{title}      =  $::locale->text('kivitendo');
   $form->{interface}  = $::dispatcher->interface_type;
+  $form->{client}     = $::auth->client;
+  $form->{defaults}   = SL::DB::Default->get;
 
   my $git             = SL::Git->new;
   ($form->{git_head}) = $git->get_log(since => 'HEAD~1', until => 'HEAD') if $git->is_git_installation;
diff --git a/locale/de/all b/locale/de/all
index f7481b348..296908933 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -607,7 +607,6 @@ $self->{texts} = {
   'Database template'           => 'Datenbankvorlage',
   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
   'Database user and password'  => 'Datebankbenutzer und -passwort',
-  'Dataset'                     => 'Datenbank',
   'Dataset missing!'            => 'Datenbank fehlt!',
   'Dataset name'                => 'Datenbankname',
   'Dataset upgrade'             => 'Datenbankaktualisierung',
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
index 1939fc3c8..00273aa96 100644
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -1,6 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE LxERP %]
- [%- DEFAULT myconfig_dbhost = 'localhost' %]
    <noscript>
    [% INCLUDE 'generic/information.html'
      title_information = LxERP.t8('Your browser does not currently support Javascript.'),
@@ -19,9 +18,9 @@
   <p>[% 'companylogo_subtitle' | $T8 %]</p>
   <p>
    <b>
-    [% HTML.escape(myconfig_company) %]
+    [% HTML.escape(defaults.company) %]
     <br>
-    [% HTML.escape(myconfig_address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
+    [% HTML.escape(defaults.address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
    </b>
 
    <br>
@@ -33,20 +32,12 @@
      <td>[% HTML.escape(myconfig_name) %]</td>
     </tr>
     <tr>
-     <th align="left"><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'Language' | $T8 %]</a></th>
-     <td>[% HTML.escape(myconfig_countrycode) %]</td>
-    </tr>
-    <tr>
-     <th align="left"><a href="admin.pl" title="[% 'Administration' | $T8 %]">[% 'Templates' | $T8 %]</a></th>
-     <td>[% HTML.escape(myconfig_templates) %]</td>
+     <th align="left">[% IF AUTH_RIGHTS_ADMIN %]<a href="controller.pl?action=ClientConfig/edit" title="[% 'Client Configuration' | $T8 %]">[% END %][% 'Client' | $T8 %][% IF AUTH_RIGHTS_ADMIN %]</a>[% END %]</th>
+     <td>[% HTML.escape(client.name) %]</td>
     </tr>
     <tr>
-     <th align="left"><a href="admin.pl" title="[% 'Administration' | $T8 %]">[% 'Dataset' | $T8 %]</a></th>
-     <td>[% HTML.escape(myconfig_dbname) %]</td>
-    </tr>
-    <tr>
-     <th align="left">[% 'Database Host' | $T8 %]</th>
-     <td>[% HTML.escape(myconfig_dbhost) %]</td>
+     <th align="left"><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'Language' | $T8 %]</a></th>
+     <td>[% HTML.escape(myconfig_countrycode) %]</td>
     </tr>
     <tr>
      <th align="left">[% 'Webserver interface' | $T8 %]</th>