diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index ba3332f1e2b..a1c9ac3c33a 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -22,7 +22,8 @@ AppVerName=DoliWamp-3.3.0-alpha OutputBaseFilename=DoliWamp-3.3.0-alpha ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory -SourceDir=c:\Documents and Settings\ldestail\git\dolibarr +;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold +SourceDir=Z:\home\ldestail\git\dolibarrold ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log AppId=doliwamp diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7fdb6927509..8f6aadbd010 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -38,7 +38,7 @@ $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD"; $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; -$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD"; +$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD"; if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake @@ -763,8 +763,10 @@ if ($nboftargetok) { print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n"; unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; - $cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\""; + $SOURCEBACK=$SOURCE; + $SOURCEBACK =~ s/\//\\/g; + print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n"; + $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\""; print "$cmd\n"; $ret= `$cmd`; #print "$ret\n"; @@ -772,6 +774,8 @@ if ($nboftargetok) { # Move to final dir print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"); + print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n"; + $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`; next; } } diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php index ca4aed2d98c..8fd23b96af0 100755 --- a/htdocs/admin/system/xcache.php +++ b/htdocs/admin/system/xcache.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2009-2012 Laurent Destailleur * * 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 @@ -24,8 +24,7 @@ require("../../main.inc.php"); $langs->load("admin"); -if (!$user->admin) - accessforbidden(); +if (!$user->admin) accessforbidden(); $action=GETPOST('action'); @@ -49,8 +48,17 @@ if (!function_exists('xcache_info')) } -print 'Opcode cache XCache is on
'."\n"; +print 'Opcode cache XCache is on

'."\n\n"; +print $langs->trans("Split").': '.ini_get('xcache.count').'       '.$langs->trans("Recommanded").': (cat /proc/cpuinfo | grep -c processor) + 1
'."\n"; +print $langs->trans("Size").': '.ini_get('xcache.size').'       '.$langs->trans("Recommanded").': 16*Split
'."\n"; + +print $langs->trans("xcache.cacher").': '.yn(ini_get('xcache.cacher')).'
'."\n"; +print $langs->trans("xcache.optimizer").': '.yn(ini_get('xcache.optimizer')).' (will be usefull only with xcache v2)
'."\n"; +print $langs->trans("xcache.stat").': '.yn(ini_get('xcache.stat')).'
'."\n"; +print $langs->trans("xcache.coverager").': '.yn(ini_get('xcache.coverager')).'
'."\n"; + +//print xcache_get(); /* $cacheinfos = array(); for ($i = 0; $i < 10; $i ++) @@ -69,4 +77,6 @@ if ($action == 'clear') */ llxFooter(); + +$db->close(); ?> diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php index 977df17e831..3b829d33ec8 100644 --- a/htdocs/admin/system/xdebug.php +++ b/htdocs/admin/system/xdebug.php @@ -1,19 +1,19 @@ +/* Copyright (C) 2009-2012 Laurent Destailleur * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +* 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 +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ /** * \file htdocs/admin/system/xdebug.php @@ -25,11 +25,11 @@ require("../../main.inc.php"); $langs->load("admin"); if (!$user->admin) - accessforbidden(); +accessforbidden(); /* -* View + * View */ llxHeader(); @@ -42,8 +42,8 @@ print "
\n"; if (!function_exists('xdebug_is_enabled')) { print 'XDebug seems to be not installed. Function xdebug_is_enabled not found.'; - llxFooter(); - exit; + llxFooter(); + exit; } @@ -56,48 +56,55 @@ if (function_exists('socket_create')) print 'XDEBUG_PORT: '.$port."
\n"; print "
\n"; $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); - if (empty($socket)) die('Unable to preapre a socket'); - //socket_bind($sock, $address, $port) or die('Unable to bind on address='.$address.' port='.$port); - //socket_listen($sock); - //$client = socket_accept($sock); - $client=socket_connect($socket, $address, $port); - if ($client) - { - echo "Connection established: ".$client." - address=".$address." port=".$port."
\n"; - echo "There is a Remote debug server at this address.
\n"; - echo "
\n"; - echo "To be sure this debugger accepts input from your PHP server, be sure to have\n"; - echo "your php.ini file with this :
\n"; - echo 'xdebug.remote_enable=on
- xdebug.remote_handle=dbgp
- xdebug.remote_host=localhost
- xdebug.remote_port=9000
- xdebug.profiler_enable=1
- xdebug.show_local_vars=off
- xdebug.profiler_output_dir=/tmp/xdebug
- xdebug.profiler_append=0
- '."\n"; - print "
\n"; - echo 'Then check in your debug server (Eclipse), you have setup:
+ if (empty($socket)) die('Unable to preapre a socket'); + //socket_bind($sock, $address, $port) or die('Unable to bind on address='.$address.' port='.$port); + //socket_listen($sock); + //$client = socket_accept($sock); + $client=socket_connect($socket, $address, $port); + if ($client) + { + echo "Connection established: ".$client." - address=".$address." port=".$port."
\n"; + echo "There is a Remote debug server at this address.
\n"; + echo "
\n"; + echo "To be sure this debugger accepts input from your PHP server, be sure to have\n"; + echo "your php.ini file with this :
\n"; + echo 'xdebug.remote_enable=on
+ xdebug.remote_handle=dbgp
+ xdebug.remote_host=localhost
+ xdebug.remote_port=9000
+ xdebug.profiler_enable=0
+ xdebug.profiler_enable_trigger=1
+ xdebug.show_local_vars=off
+ xdebug.profiler_output_dir=/tmp/xdebug
+ xdebug.profiler_append=0
+
+ xdebug.trace_enable_trigger=1
+ xdebug.show_mem_delta=1
+ xdebug.trace_output_dir=/tmp/trace
+ xdebug.auto_trace=0
+ '."\n"; + print "
\n"; + echo 'Then check in your debug server (Eclipse), you have setup:
XDebug with same port than in php.ini
Allow Remote debug=yes or prompt
'."\n"; - print "
\n"; - echo "Then, to run a debug session, add parameter XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.\n"; - } - else - { - print socket_strerror(socket_last_error()); + print "
\n"; + echo "Then, to run a debug session, add parameter XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.\n"; + } + else + { + print socket_strerror(socket_last_error()); echo "Failed to connect to address=".$address." port=".$port."
\n"; echo "There is no Remote debug server at this address.\n"; - } - socket_close($client); - socket_close($socket); + } + socket_close($socket); } else { - print "Can't test if PHPDebug is OK as PHP socket functions are not enabled."; + print "Can't test if PHPDebug is OK as PHP socket functions are not enabled."; } llxFooter(); + +$db->close(); ?> diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index dbdf3b535af..dad1f127ca1 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -74,7 +74,7 @@ print ''.$langs->trans("Statistics").''.$langs->trans("NbOfInvoiceToWithdraw").''; print ''; -print ''; +print ''; print $bprev->NbFactureAPrelever(); print ''; print ''; diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index 5a7c461dc1e..aa5209af653 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -163,7 +163,7 @@ function dol_loginfunction($langs,$conf,$mysoc) { global $dolibarr_main_demo,$db; global $smartphone,$hookmanager; - + // Instantiate hooks of thirdparty module only if not already define if (! is_object($hookmanager)) { @@ -209,7 +209,7 @@ function dol_loginfunction($langs,$conf,$mysoc) } } - $conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang; + $conf->css = "/theme/".(GETPOST('theme')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php?lang=".$langs->defaultlang; $conf_css = DOL_URL_ROOT.$conf->css; // Set cookie for timeout management @@ -237,7 +237,7 @@ function dol_loginfunction($langs,$conf,$mysoc) $demologin=$tab[0]; $demopassword=$tab[1]; } - + // Execute hook getLoginPageOptions // Should be an array with differents options in $hookmanager->resArray $parameters=array('entity' => $_POST['entity']); diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 72de98269af..fc6fd8db29e 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -41,20 +41,7 @@ print ''."\n"; if (constant('JS_JQUERY')) print ''."\n"; else print ''."\n"; print ''."\n"; -print ' -'."\n"; +print ''."\n"; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; print ' '; @@ -82,7 +69,7 @@ $(document).ready(function () { - +
@@ -134,7 +121,7 @@ if (! empty($hookmanager->resArray['options'])) { -Logo + diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 22a012032f8..c9ea31a7117 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -38,20 +38,7 @@ else print ''."\n"; else print ''."\n"; -print ' -'."\n"; +print ''."\n"; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; print ' '; @@ -64,7 +51,7 @@ print ' - +
@@ -92,9 +79,9 @@ print '   trans('SecurityCode'); ?> - + - + @@ -105,7 +92,7 @@ print ' -Logo + diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index a46b87b2ea4..a08bdad1814 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -55,9 +55,6 @@ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); // Security check if (! $conf->agenda->enabled) accessforbidden('',1,1,1); -$mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; -$leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; - // Define format, type and filter $format='ical'; $type='event'; diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 7b6261dac70..ae45b03b9eb 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -69,12 +69,12 @@ body { font-family: ; trans("DIRECTION").";\n"; ?> } - + a { text-decoration: none; color:#333; } - + a:hover, a:sel{ color:black; } @@ -109,7 +109,7 @@ border-left: solid 1px rgba(0,0,0,.3); border-top:solid 1px rgba(0,0,0,.1); */ border-radius:.6em; - + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); @@ -123,7 +123,7 @@ border-left: solid 1px rgba(0,0,0,.3); color-stop(1, rgba(0,0,0,.3)) ); } - + .button, a.butAction{color:white;} .butActionDelete{color:white;} @@ -150,6 +150,8 @@ td.formdocbutton {padding-top:6px;} /* LOGIN : */ form#login { + margin-top: 70px; + margin-bottom: 30px; display:block; border:solid 1px rgba(0,0,0,.4); border-top:solid 1px white; @@ -187,19 +189,19 @@ form#login img { border-bottom:solid 1px rgba(0,0,0,.3); box-shadow: 1px 1px 6px rgba(0,0,0,.3) inset , 0 0 1px rgba(255,255,255,.6); } - + form#login input{ padding:8px; font-size:120%; } - + form#login label { vertical-align:middle; line-height:46px; color:rgba(0,0,0,.4); text-shadow: 1px 1px 1px rgba(255,255,255,.6); } - + form#login table.login{margin:0;border:none;background:none !important;} table.login tr td a {color:#333 !important;} table.login tr td a:hover {color:#000 !important;} @@ -213,7 +215,7 @@ table.login .button { border:solid 1px #2e7992; box-shadow: 1px 1px 3px rgba(0,0,0,.4); } - + table.login .vmenu{ color:rgba(0,0,0,.3); text-shadow: 1px 1px 1px rgba(255,255,255,.6); @@ -235,12 +237,12 @@ div.tmenu { white-space: nowrap; height:36px; line-height:36px; - + background: #168ac2; /* bleu */ background: #b7e0e7; /* bleu_clair */ background: #6d6887; /* violet */ background: #333; /* obsidienne */ - + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); @@ -253,7 +255,7 @@ div.tmenu { color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - + border-bottom:solid 1px rgba(0,0,0,.8); box-shadow: 0 0 6px rgba(0,0,0,.4) !important; z-index:100; @@ -319,7 +321,7 @@ div.vmenu { padding-left:3px; border-top: solid 1px rgba(255,255,255,.5); border-bottom: solid 1px rgba(0,0,0,.5); - + } .menu_contenu { @@ -339,7 +341,7 @@ div.vmenu { .blockvmenusearch .menu_titre { margin-top:6px; } - + /* AIDE EN LIGNE : */ #blockvmenuhelp { @@ -355,13 +357,13 @@ div.vmenu { margin-bottom:-2px; padding-bottom:0; } - -.tabTitle { + +.tabTitle { color:rgba(0,0,0,.5); margin-right:12px; text-shadow: 1px 1px 1px white; } - + .tab { margin-left:2px; margin-right:2px; @@ -395,7 +397,7 @@ table { } table.liste{border:solid 0px #aaa; padding:.6em;} - + table.liste tbody tr.liste_titre>td, table.liste .liste_total, table.liste .liste_titre { padding:4px; background-color:white; @@ -417,7 +419,7 @@ tr.liste_titre td.liste_titre_sel { background-color: rgba(0,0,0,.2); color:black; } - + table.liste a img{padding: 1px;} table#undertopmenu { /* tableau contenant tous les autres : */ @@ -439,7 +441,7 @@ tr.liste_titre td { border-top:solid 1px rgba(0,0,0,.08); color:rgba(0,0,0,.6); } - + table.noborder, table.border, div.tabBar, table.liste { background-color:white; border:solid 1px #aaa; @@ -447,7 +449,7 @@ table.noborder, table.border, div.tabBar, table.liste { width:99% !important; border-bottom:solid 2px #aaa; } - + table.liste tr td img {padding-right:2px;} table.noborder tr td{padding-right:2px;} table.noborder tr.liste_total td{ /* total en bas d'un tableau */ @@ -474,7 +476,7 @@ table.noborder tbody tr.liste_titre td { /* titre des tableaux : */ ); border-bottom:solid 1px rgba(0,0,0,.2); } - + table.noborder tbody{ border:solid 1px rgba(0,0,0,.3); border-bottom:solid 1px rgba(0,0,0,.08); diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 47df134444f..cf25d391669 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -449,10 +449,44 @@ foreach($mainmenuusedarray as $key => $val) /* Login */ -table.login { +form#login { + margin-top: 70px; + margin-bottom: 30px; + font-size: 13px; +} +.login_table_title { + width: 540px; + color: #888888; + text-shadow: 1px 1px 1px #FFF; +} +.login_table label { + text-shadow: 1px 1px 1px #FFF; +} +.login_table { + padding:12px; + width: 540px; + border: 1px solid #C0C0C0; + background-color: #E0E0E0; + -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + border-radius: 12px; + border:solid 1px rgba(168,168,168,.4); + border-top:solid 1px f8f8f8; + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); +} +#img_securitycode { + border: 1px solid #DDDDDD; +} +#img_logo { + max-width: 200px; } div.login_block { diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index f400ef43d72..acd4ce6afa9 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -524,6 +524,46 @@ li.tmenu a.tmenudisabled { /* Login */ +form#login { + margin-top: 70px; + margin-bottom: 30px; + font-size: 13px; +} +.login_table_title { + width: 540px; + color: #888888; + text-shadow: 1px 1px 1px #FFF; +} +.login_table label { + text-shadow: 1px 1px 1px #FFF; +} +.login_table { + padding:12px; + width: 540px; + border: 1px solid #C0C0C0; + background-color: #E0E0E0; + + -moz-box-shadow: 4px 4px 4px #CCC; + -webkit-box-shadow: 4px 4px 4px #CCC; + box-shadow: 4px 4px 4px #CCC; + + border-radius: 12px; + border:solid 1px rgba(168,168,168,.4); + border-top:solid 1px f8f8f8; + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); +} +#img_securitycode { + border: 1px solid #DDDDDD; +} +#img_logo { + max-width: 200px; +} + div.login_block { position: absolute; : 5px; diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php index 2733d1793d2..283959138c0 100644 --- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php @@ -38,20 +38,7 @@ else print ''."\n"; else print ''."\n"; -print ' -'."\n"; +print ''."\n"; if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; print ' '; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index ac5932e80fb..8cc873eefc9 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -522,6 +522,46 @@ foreach($mainmenuusedarray as $key => $val) /* Login */ +form#login { + margin-top: 70px; + margin-bottom: 30px; + font-size: 13px; +} +.login_table_title { + width: 540px; + color: #888888; + text-shadow: 1px 1px 1px #FFF; +} +.login_table label { + text-shadow: 1px 1px 1px #FFF; +} +.login_table { + padding:12px; + width: 540px; + border: 1px solid #C0C0C0; + background-color: #E0E0E0; + + -moz-box-shadow: 4px 4px 4px #CCC; + -webkit-box-shadow: 4px 4px 4px #CCC; + box-shadow: 4px 4px 4px #CCC; + + border-radius: 12px; + border:solid 1px rgba(168,168,168,.4); + border-top:solid 1px f8f8f8; + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); +} +#img_securitycode { + border: 1px solid #DDDDDD; +} +#img_logo { + max-width: 200px; +} + div.login_block { position: absolute; : 5px; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index dcfe11147f7..e0d82a22852 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -628,10 +628,44 @@ foreach($mainmenuusedarray as $key => $val) /* Login */ +form#login { + margin-top: 70px; + margin-bottom: 30px; + font-size: 13px; +} +.login_table_title { + width: 540px; + color: #888888; + text-shadow: 1px 1px 1px #FFF; +} +.login_table label { + text-shadow: 1px 1px 1px #FFF; +} .login_table { + padding:12px; + width: 540px; + border: 1px solid #C0C0C0; + background-color: #E0E0E0; + -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; box-shadow: 4px 4px 4px #CCC; + + border-radius: 12px; + border:solid 1px rgba(168,168,168,.4); + border-top:solid 1px f8f8f8; + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(240,240,240,.3) 0%, rgba(192,192,192,.3) 100%); +} +#img_securitycode { + border: 1px solid #DDDDDD; +} +#img_logo { + max-width: 200px; } div.login_block { @@ -749,7 +783,7 @@ div.blockvmenusearch padding-right: 1px; padding-top: 3px; padding-bottom: 3px; - margin: 6px 0px 8px 2px; + margin: 12px 0px 8px 2px; background: #E3E6E8;