diff --git a/ChangeLog b/ChangeLog index d4d90a73359..38a1ca70d40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ For users: - New: [ task #608 ] Can clone a supplier order with prices updates - New: [ task #559 ] Can define a discount % regarding quantity in supplier prices and price by quantity in customer prices - New: [ task #527 ] After cloning a suplier invoice, go onto invoice ref into edit mode +- New: Add new theme Amarok. New experimental modules: - New: Add margin management module. diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 29fc767afa4..2ef0117609c 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -324,7 +324,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/amarok`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`; # Avoid errors into rpmlint $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`; # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems. diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index fedf74f74f2..9586ce352a8 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -941,7 +941,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: %sglobal->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,226'; $conf->global->THEME_ELDY_VERMENU_BACK1='253,253,253'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='226,228,230'; // vmenu (not menu) - $conf->global->THEME_ELDY_VERMENU_BACK2='220,224,227'; + $conf->global->THEME_ELDY_VERMENU_BACK2='232,234,236'; $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays $conf->global->THEME_ELDY_BACKTITLE2='210,220,235'; $conf->global->THEME_ELDY_BACKTABCARD1='231,232,235'; // card @@ -839,12 +839,12 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks margin: 1px 0px 8px 2px; - background-image: -o-linear-gradient(bottom, rgb() 80%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); -/* background-image: -webkit-linear-gradient(bottom, rgb() 20px, rgb() 100%); */ - background-image: -webkit-linear-gradient(top, rgb() 0px, rgb() 10px); - background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 8px); + background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 8px); +/* background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); */ + background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 8px); + background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 8px); + background-image: linear-gradient(bottom, rgb() 0px, rgb() 8px); background-image: url(); background-position:top; @@ -853,7 +853,8 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks border-left: 1px solid #CCCCCC; border-right: 1px solid #BBBBBB; border-bottom: 1px solid #BBBBBB; - border-radius: 5px; + border-top: 1px solid #DDDDDD; + border-radius: 5px; -moz-border-radius: 5px; -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC;