From d05b2d8170c1b7021fe7d54daad76c7943f4a896 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH] Work on package --- build/makepack-dolibarr.pl | 12 ++++---- htdocs/theme/eldy/style.css.php | 51 ++------------------------------- 2 files changed, 10 insertions(+), 53 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c5e40bcfd36..7ef1c95fb3d 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.138 2011/08/07 18:01:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 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.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.139 $'; $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","Need ".join(",",values %REQUIREMENTTARGET)); + printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","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) { - $CHOOSEDTARGET{$key}=1; + if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; } } } } @@ -615,6 +615,8 @@ 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"; @@ -822,7 +824,7 @@ if ($nboftargetok) { $ret=`$cmd`; # Creation of source package - print "Go to directory $BUILDROOT\n"; + print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\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 57b816d40cc..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.92 2011/08/07 17:54:36 grandoc Exp $ + * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -270,32 +270,14 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { margin: 0px 1px 2px 1px; font-weight: normal; white-space: nowrap; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border-radius: 6px 6px 0px 0px; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; } a.tmenu:hover, a.tmenu:active { margin: 0px 0px 0px 0px; background: #dee7ec; border-: 1px solid #555555; border-: 1px solid #D8D8D8; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; border-top: 1px solid #D8D8D8; - border-bottom: 1px solid #dee7ec; - -moz-box-shadow: 2px 0px 4px #898484; - -webkit-box-shadow: 2px 0px 4px #898484; - box-shadow: 2px 0px 4px #898484; + border-bottom: 2px solid #dee7ec; } a.tmenu:active { background: #F4F4F4; @@ -307,19 +289,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { font-weight: normal; color: #234046; background: #F4F4F4; - -moz-border-radius: 6px 6px 0px 0px; - -webkit-border-radius: 6px 6px 0px 0px; - border-radius: 6px 6px 0px 0px; - -moz-background-clip: padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -moz-box-shadow: 2px 0px 4px #0C0C0C; - -webkit-box-shadow: 2px 0px 4px #0C0C0C; - box-shadow: 2px 0px 4px #0C0C0C; border-: 1px solid #555555; border-top: 1px solid #D8D8D8; border-: 1px solid #D8D8D8; - border-bottom: 1px solid #F4F4F4; + border-bottom: 2px solid #F4F4F4; white-space: nowrap; } @@ -1091,15 +1064,6 @@ border-bottom-color: #BBBBBB; border-bottom-style: solid; margin: 0px 0px 2px 0px; - -box-shadow: 4px 4px 4px #CCC; - } table.noborder tr { @@ -1117,7 +1081,6 @@ height: 18px; table.noborder td { padding: 1px 2px 0px 1px; /* t r b l */ - } table.nobordernopadding { @@ -1251,14 +1214,6 @@ border: 0px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; - - }