From 7b5e86351ec443a5bdf514166272899e0a7c6b3b Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Tue, 6 May 2008 05:59:19 +0000 Subject: [PATCH] LEMONLDAP::NG : integration of new CSS --- build/lemonldap-ng/changelog | 7 +++++++ build/lemonldap-ng/debian/changelog | 4 ++-- .../debian/liblemonldap-ng-manager-perl.examples | 5 +---- .../debian/liblemonldap-ng-manager-perl.install | 1 + modules/lemonldap-ng-handler/Changes | 3 +++ modules/lemonldap-ng-handler/META.yml | 2 +- modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm | 2 +- .../lib/Lemonldap/NG/Handler/SharedConf.pm | 2 +- .../lib/Lemonldap/NG/Handler/Simple.pm | 2 +- modules/lemonldap-ng-manager/Changes | 3 +++ modules/lemonldap-ng-manager/MANIFEST | 3 +++ modules/lemonldap-ng-manager/META.yml | 2 +- modules/lemonldap-ng-manager/example/index.pl | 2 +- modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm | 2 +- .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm | 7 +++---- .../lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm | 2 +- 16 files changed, 31 insertions(+), 18 deletions(-) diff --git a/build/lemonldap-ng/changelog b/build/lemonldap-ng/changelog index 564f405a1..dbc06317e 100644 --- a/build/lemonldap-ng/changelog +++ b/build/lemonldap-ng/changelog @@ -1,3 +1,10 @@ +lemonldap-ng (0.9.2) unstable; urgency=low + + * New css in manager + * cleaning Handler code + + -- Xavier Guimard Tue, 06 May 2008 06:58:04 +0200 + lemonldap-ng (0.9.1) unstable; urgency=low * logout bug : logout_sso target was not running (Closes: #308856) diff --git a/build/lemonldap-ng/debian/changelog b/build/lemonldap-ng/debian/changelog index 90a4fc18c..4724da78f 100644 --- a/build/lemonldap-ng/debian/changelog +++ b/build/lemonldap-ng/debian/changelog @@ -1,5 +1,5 @@ -lemonldap-ng (0.9.1-0) unstable; urgency=low +lemonldap-ng (0.9.2-0) unstable; urgency=low * Local build - -- Xavier Guimard Mon, 07 Apr 2008 11:00:37 +0200 + -- Xavier Guimard Tue, 06 May 2008 06:58:44 +0200 diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples index e4ac9379e..e091516c1 100644 --- a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples +++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples @@ -1,4 +1 @@ -debian/tmp/var/lib/lemonldap-ng/manager/apply.conf -debian/tmp/var/lib/lemonldap-ng/manager/index.pl -debian/tmp/var/lib/lemonldap-ng/manager/lmConfig.mysql -debian/tmp/var/lib/lemonldap-ng/manager/soapserver.pl +debian/tmp/var/lib/lemonldap-ng/manager/ diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install index 36f57556a..7d29e2065 100644 --- a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install +++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install @@ -15,5 +15,6 @@ debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Restricted.3pm debian/tmp/var/lib/lemonldap-ng/manager/apply.conf /etc/lemonldap-ng debian/manager-apache*.conf /etc/lemonldap-ng debian/tmp/var/lib/lemonldap-ng/manager/imgs +debian/tmp/var/lib/lemonldap-ng/manager/theme debian/tmp/var/lib/lemonldap-ng/manager/lemonldap-ng-manager.js debian/tmp/var/lib/lemonldap-ng/manager/scripts/lmConfigEditor /usr/share/lemonldap-ng/bin diff --git a/modules/lemonldap-ng-handler/Changes b/modules/lemonldap-ng-handler/Changes index 4da718354..07b77273c 100644 --- a/modules/lemonldap-ng-handler/Changes +++ b/modules/lemonldap-ng-handler/Changes @@ -1,5 +1,8 @@ Revision history for Perl extension Lemonldap::NG::Handler. +0.87 Tue may 6 7:04:45 2008 + - Remove Apache2::compta dependency + 0.86 Mon apr 7 14:52:30 2008 - logout bug : logout_sso target was not running (Closes: #308856 / forge.objectweb.org) diff --git a/modules/lemonldap-ng-handler/META.yml b/modules/lemonldap-ng-handler/META.yml index 47f15d65d..c40e6fe3a 100644 --- a/modules/lemonldap-ng-handler/META.yml +++ b/modules/lemonldap-ng-handler/META.yml @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Lemonldap-NG-Handler -version: 0.86 +version: 0.87 version_from: lib/Lemonldap/NG/Handler.pm installdirs: site requires: diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm index f5566464f..8586ff585 100644 --- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm +++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler.pm @@ -2,7 +2,7 @@ package Lemonldap::NG::Handler; print STDERR "See Lemonldap::NG::Handler(3) to know which Lemonldap::NG::Handler::* module to use."; -our $VERSION = "0.86"; +our $VERSION = "0.87"; 1; diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm index b62298f2c..73e7337c3 100644 --- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm +++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm @@ -9,7 +9,7 @@ use Cache::Cache qw($EXPIRES_NEVER); our @ISA = qw(Lemonldap::NG::Handler::Vhost Lemonldap::NG::Handler::Simple); -our $VERSION = '0.61'; +our $VERSION = '0.62'; our $cfgNum = 0; our $lastReload = 0; our $reloadTime; diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm index 4dd5ac1ff..5c9156609 100644 --- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm +++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Simple.pm @@ -7,7 +7,7 @@ use Exporter 'import'; use Safe; require POSIX; -our $VERSION = '0.86'; +our $VERSION = '0.87'; our %EXPORT_TAGS; diff --git a/modules/lemonldap-ng-manager/Changes b/modules/lemonldap-ng-manager/Changes index 7445846b2..4b11853fc 100644 --- a/modules/lemonldap-ng-manager/Changes +++ b/modules/lemonldap-ng-manager/Changes @@ -1,5 +1,8 @@ Revision history for Perl extension Lemonldap::NG::Manager. +0.85 Tue may 6 7:02:34 2008 + - CSS update + 0.84 Mon apr 7 14:55:45 2008 - Javascript update (Closes: #308775 / forge.objectweb.org) diff --git a/modules/lemonldap-ng-manager/MANIFEST b/modules/lemonldap-ng-manager/MANIFEST index 9731949d1..979a30b57 100644 --- a/modules/lemonldap-ng-manager/MANIFEST +++ b/modules/lemonldap-ng-manager/MANIFEST @@ -50,6 +50,9 @@ example/lmConfig.mysql example/scripts/lmConfigEditor example/scripts/lmSessionDump example/soapserver.pl +example/theme/logo_lemonldap-ng.png +example/theme/default.css +example/theme/hatch.gif lib/Lemonldap/NG/Manager.pm lib/Lemonldap/NG/Manager/_HTML.pm lib/Lemonldap/NG/Manager/_i18n.pm diff --git a/modules/lemonldap-ng-manager/META.yml b/modules/lemonldap-ng-manager/META.yml index d7fe06c5b..952c4c0d6 100644 --- a/modules/lemonldap-ng-manager/META.yml +++ b/modules/lemonldap-ng-manager/META.yml @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Lemonldap-NG-Manager -version: 0.84 +version: 0.85 version_from: lib/Lemonldap/NG/Manager.pm installdirs: site requires: diff --git a/modules/lemonldap-ng-manager/example/index.pl b/modules/lemonldap-ng-manager/example/index.pl index e1c1b146d..02ee9eb50 100644 --- a/modules/lemonldap-ng-manager/example/index.pl +++ b/modules/lemonldap-ng-manager/example/index.pl @@ -10,7 +10,7 @@ my $h = new Lemonldap::NG::Manager( }, dhtmlXTreeImageLocation => "/imgs/", applyConfFile => '__DIR__/manager/apply.conf', - cssFile => 'theme/default.css', + cssFile => 'theme/default.css', # jsFile => /path/to/lemonldap-ng-manager.js, } diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm index b8a239bcd..d216a4657 100644 --- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm +++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm @@ -17,7 +17,7 @@ use MIME::Base64; our @ISA = qw(Lemonldap::NG::Manager::Base); -our $VERSION = '0.84'; +our $VERSION = '0.85'; sub new { my ( $class, $args ) = @_; diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm index 19acc503b..e55506196 100644 --- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm +++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm @@ -8,7 +8,7 @@ use AutoLoader qw(AUTOLOAD); require Lemonldap::NG::Manager::_i18n; use Lemonldap::NG::Manager::Conf::Constants; -our $VERSION = '0.29'; +our $VERSION = '0.30'; # TODO: Delete buttons in headers and rules if 'read-only' @@ -74,7 +74,7 @@ EOT sub javascript { my $self = shift; - Lemonldap::NG::Manager::_i18n::import( $ENV{HTTP_ACCEPT_LANGUAGE} ); + Lemonldap::NG::Manager::_i18n::import( $ENV{HTTP_ACCEPT_LANGUAGE} ) unless(__PACKAGE__->can('txt_newVirtualHost')); my %text; foreach(qw(newVirtualHost newMacro newGroup newVar newGSOpt saveConf deleteNode locationRules unableToSave confSaved saveFailure @@ -415,8 +415,7 @@ sub start_html { } sub main { - - Lemonldap::NG::Manager::_i18n::import( $ENV{HTTP_ACCEPT_LANGUAGE} ); + Lemonldap::NG::Manager::_i18n::import( $ENV{HTTP_ACCEPT_LANGUAGE} ) unless(__PACKAGE__->can('txt_field')); my %text; foreach(qw(field value)) { $text{$_} = &{"txt_$_"}; diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm index 9056a378a..1bb634cd5 100644 --- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm +++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm @@ -2,7 +2,7 @@ package Lemonldap::NG::Manager::_i18n; use AutoLoader qw(AUTOLOAD); use UNIVERSAL qw(can); -our $VERSION = '0.31'; +our $VERSION = '0.32'; sub import { my ($caller_package) = caller;