diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7ef1c95fb3d..c5e40bcfd36 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -125,7 +125,7 @@ else { my $NUM_SCRIPT; while (! $found) { my $cpt=0; - printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET)); foreach my $target (@LISTETARGET) { $cpt++; printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); @@ -157,7 +157,7 @@ else { } else { foreach my $key (@LISTETARGET) { - if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } + $CHOOSEDTARGET{$key}=1; } } } @@ -615,8 +615,6 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$PROJECT.tmp"; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`; - print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; @@ -824,7 +822,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n"; + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -816,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -872,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -888,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -904,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -932,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1216,7 +1211,6 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } - .box { padding-right: 0px; padding-left: 0px; @@ -1233,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1273,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1284,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1296,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1391,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1414,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1512,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }