From a2bdec6afefb8e037f66aa0b023d78bcc1654a6b Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 29 Mar 2014 11:04:14 +0000 Subject: [PATCH] set logo via CSS --- lam/graphics/logo24.png | Bin 0 -> 1244 bytes lam/lib/selfService.inc | 2 +- lam/style/500_layout.css | 12 +++++++++++- lam/templates/config/conflogin.php | 2 +- lam/templates/config/confmain.php | 2 +- lam/templates/config/confmodules.php | 2 +- lam/templates/config/conftypes.php | 2 +- lam/templates/config/index.php | 2 +- lam/templates/config/mainlogin.php | 2 +- lam/templates/config/mainmanage.php | 2 +- lam/templates/config/moduleSettings.php | 2 +- lam/templates/config/profmanage.php | 2 +- lam/templates/login.php | 2 +- lam/templates/main_header.php | 12 +++++++----- 14 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 lam/graphics/logo24.png diff --git a/lam/graphics/logo24.png b/lam/graphics/logo24.png new file mode 100644 index 0000000000000000000000000000000000000000..616437ba0be3eac266fdc51203f55dcfae8ab7b9 GIT binary patch literal 1244 zcmV<21S9*2P)w41Zhb` zK~zY`os@e_(^nM7zqh}ZQfWa73@KDW9#INH!eHnsAPz|uHCu?ymSuA>bTGGN!>zg{ zdypkg4JK-qOpRvC<`xz=KvbqYiWJJDMTEAradi6j;-(b( z;ft}DUsxuS%Ord!$2poN+qi<~cqU)@i-`qhTQ1$uRg*o_J$> zeDtp1$QZjP-m4L*uIte50J$5qHk*^YCFzshJ7Dw)%5W2g{M=^1{}#xr&^~aH%_(f2 zn6phRE-P=nzSa1K)X!hQ!2Zk7v~A7}ApjKD-}G)It!66#KwhdzJW#Etsv2EB0PMTk z_L#{m)$Bi1+fI)+b|iRJytdN>0H`-w?iBvfMo%?$W&nVyMh^hE`A{4H-oDbB@%}X( z{aoE40)VP63wvR;wgp#p?bveobl|0S<4jI@3#~I+Rcw4+Q!@bIqsoROiV7_)H}uRr z)kT$R&6yKAOTqjG8D85c0guu)?lRd?m>6U8XyKarGv8>s3IwUCRIwq9xR$BG?!s2q zC2Ni50-e!9c?%Bk38e!LS9;^ryqJyGnR^P%y}fjC@^3QZq_o%OOzN0)h`DSDK_b6d zIzH@gRX5P1L*s}G2}E3gfOV{~5n;1r^16S&rh$GpG)iQWP;3wjJ=^qj>F@Y7e{Vo$ zd`yFDZk9w&50gE?+_n!ArBj~x->%g{x#!h@{M;wv4aR=v` zJFzo7Q21@%JzJcBgPI9DUXhAbiqyp8PjX#fU!SPSXcj*g;P2d(vwd_0aPXo1zE*b# zOEeu+QPF$|0N$(8iHff4=)qcj1^~Qyx%HW?zM=zFwJw3rFecN?g0eDCe*WL*J`7{( z{?GZ-;_(g?m$Xn`(Ft7?CMR`gR_4jiKf0-^T91<47rOa`h~&Y7bB{XHnyk+z@WYK3 z5f+?*3vk=g#j8}ua?%7Rm zDC_KPa`^J5!opX>$6t_V=;;@Eg5SwZrIok3k6DI>Q983k@$EQ@6qC_elB zUz+aTB=~aZj@3SN(B)1qb+}m{)K9gVcUuQXs4R$2WWF3o+|+o@*ehY literal 0 HcmV?d00001 diff --git a/lam/lib/selfService.inc b/lam/lib/selfService.inc index b6b96c0b..37b90283 100644 --- a/lam/lib/selfService.inc +++ b/lam/lib/selfService.inc @@ -379,7 +379,7 @@ class selfServiceProfile { $this->searchAttribute = "uid"; $this->additionalLDAPFilter = ''; $this->httpAuthentication = false; - $this->pageHeader = '
 LDAP Account Manager  LDAP Account Manager

'; + $this->pageHeader = '

'; $this->additionalCSS = ''; $this->loginCaption = '' . _("Welcome to LAM self service. Please enter your user name and password.") . ''; $this->loginAttributeText = _('User name'); diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index 4c31b661..0d938b69 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -276,7 +276,17 @@ td.loginLogo { width: 65px; } - +a.lamLogo { + background-image: url(../graphics/logo24.png); + background-repeat: no-repeat; + background-position: left; + line-height: 24px; + display: block; + text-indent:32px; + vertical-align: middle; + white-space: nowrap; + margin-left: 5px; +} .sortableList { list-style-type: none; margin: 0; padding: 0; } .sortableList li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; } diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index 37ecd48f..ba468ce6 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -111,7 +111,7 @@ echo $_SESSION['header'];
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index b7cf3ee3..64c34bcb 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -161,7 +161,7 @@ foreach ($jsFiles as $jsEntry) {
-  LDAP Account Manager  LDAP Account Manager + getName(); ?> diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index 9182abcc..7ae5e9ff 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -131,7 +131,7 @@ foreach ($jsFiles as $jsEntry) {
-  LDAP Account Manager  LDAP Account Manager + getName(); ?> diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index ea10b7b9..163e2849 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -149,7 +149,7 @@ foreach ($jsFiles as $jsEntry) {
-  LDAP Account Manager  LDAP Account Manager + getName(); ?> diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php index 9a793305..7d142555 100644 --- a/lam/templates/config/index.php +++ b/lam/templates/config/index.php @@ -73,7 +73,7 @@ echo $_SESSION['header'];
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index c503eca6..1f94d362 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -118,7 +118,7 @@ echo $_SESSION['header'];
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index a3f5078f..a88dff6a 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -248,7 +248,7 @@ echo $_SESSION['header'];
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index 7432fcb6..3a38eae0 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -130,7 +130,7 @@ foreach ($jsFiles as $jsEntry) {
-  LDAP Account Manager  LDAP Account Manager + getName(); ?> diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index 2f680086..ab2bd2d7 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -182,7 +182,7 @@ echo $_SESSION['header'];
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/login.php b/lam/templates/login.php index f7342b89..36d3b697 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -259,7 +259,7 @@ function display_LoginPage($config_object, $cfgMain) {
-  LDAP Account Manager  LDAP Account Manager + configuration  diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php index 55ba8d79..c8a66a0e 100644 --- a/lam/templates/main_header.php +++ b/lam/templates/main_header.php @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2012 Roland Gruber + Copyright (C) 2003 - 2014 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -113,13 +113,15 @@ foreach ($toSort as $key => $value) { - + -
- -  LDAP Account Manager  LDAP Account Manager + + + '; $userData = $_SESSION['ldap']->decrypt_login(); @@ -128,7 +130,7 @@ foreach ($toSort as $key => $value) { echo ''; ?> +