lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on package

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-07 23:44:55 +00:00
parent 4c56b15565
commit d05b2d8170
2 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/makepack-dolibarr.pl
View File

@ -2,7 +2,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl # \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) # \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 <eldy@users.sourceforge.net> # \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
use vars qw/ $REVISION $VERSION /; 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)"; $VERSION="3.1 (build $REVISION)";
@ -125,7 +125,7 @@ else {
my $NUM_SCRIPT; my $NUM_SCRIPT;
while (! $found) { while (! $found) {
my $cpt=0; 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) { foreach my $target (@LISTETARGET) {
$cpt++; $cpt++;
printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
@ -157,7 +157,7 @@ else {
} }
else { else {
foreach my $key (@LISTETARGET) { foreach my $key (@LISTETARGET) {
$CHOOSEDTARGET{$key}=1; if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; }
} }
} }
} }
@ -615,6 +615,8 @@ if ($nboftargetok) {
#rmdir "$BUILDROOT/$PROJECT.tmp"; #rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $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"; print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n"; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
@ -822,7 +824,7 @@ if ($nboftargetok) {
$ret=`$cmd`; $ret=`$cmd`;
# Creation of source package # 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"); chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc"; $cmd="dpkg-buildpackage -us -uc";

51
htdocs/theme/eldy/style.css.php
View File

@ -21,7 +21,7 @@
/** /**
* \file htdocs/theme/eldy/style.css.php * \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy * \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 //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; margin: 0px 1px 2px 1px;
font-weight: normal; font-weight: normal;
white-space: nowrap; 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 { a.tmenu:hover, a.tmenu:active {
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
background: #dee7ec; background: #dee7ec;
border-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 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-top: 1px solid #D8D8D8;
border-bottom: 1px solid #dee7ec; border-bottom: 2px solid #dee7ec;
-moz-box-shadow: 2px 0px 4px #898484;
-webkit-box-shadow: 2px 0px 4px #898484;
box-shadow: 2px 0px 4px #898484;
} }
a.tmenu:active { a.tmenu:active {
background: #F4F4F4; background: #F4F4F4;
@ -307,19 +289,10 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
font-weight: normal; font-weight: normal;
color: #234046; color: #234046;
background: #F4F4F4; 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-<?php print $right; ?>: 1px solid #555555; border-<?php print $right; ?>: 1px solid #555555;
border-top: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8;
border-<?php print $left; ?>: 1px solid #D8D8D8; border-<?php print $left; ?>: 1px solid #D8D8D8;
border-bottom: 1px solid #F4F4F4; border-bottom: 2px solid #F4F4F4;
white-space: nowrap; white-space: nowrap;
} }
@ -1091,15 +1064,6 @@ border-bottom-color: #BBBBBB;
border-bottom-style: solid; border-bottom-style: solid;
margin: 0px 0px 2px 0px; margin: 0px 0px 2px 0px;
box-shadow: 4px 4px 4px #CCC;
<!--[if lte IE 8]>
<style type="text/css">
background-color: #fff;
zoom: 1;
filter: progid:DXImageTransform.Microsoft.Shadow(color='#cccccc',
Direction=135, Strength=6);
<![endif]-->
} }
table.noborder tr { table.noborder tr {
@ -1117,7 +1081,6 @@ height: 18px;
table.noborder td { table.noborder td {
padding: 1px 2px 0px 1px; /* t r b l */ padding: 1px 2px 0px 1px; /* t r b l */
} }
table.nobordernopadding { table.nobordernopadding {
@ -1251,14 +1214,6 @@ border: 0px;
-moz-box-shadow: 4px 4px 4px #CCC; -moz-box-shadow: 4px 4px 4px #CCC;
-webkit-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC;
box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC;
<!--[if lte IE 8]>
<style type="text/css">
background-color: #fff;
zoom: 1;
filter: progid:DXImageTransform.Microsoft.Shadow(color='#cccccc',
Direction=135, Strength=6);
<![endif]-->
} }