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

Enhance CSS capabilities

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-22 11:24:31 +02:00
parent 23f6464999
commit ee683049a6
7 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/ihm.php
View File

@ -343,7 +343,7 @@ else // Show
print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
print '</td>'; print '</td>';
print '<td width="20">'; print '<td width="20">';
if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation",$conf->global->MAIN_LANG_DEFAULT),1); if ($user->admin && $conf->global->MAIN_LANG_DEFAULT!='auto') print info_admin($langs->trans("SubmitTranslation".($conf->global->MAIN_LANG_DEFAULT=='en_US'?'ENUS':''),$conf->global->MAIN_LANG_DEFAULT),1);
print '</td>'; print '</td>';
print "</tr>"; print "</tr>";

2
htdocs/core/menus/standard/auguria.lib.php
View File

@ -235,7 +235,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
} }
$title=$langs->trans("GoIntoSetupToChangeLogo"); $title=$langs->trans("GoIntoSetupToChangeLogo");
print "\n".'<!-- Show logo on menu -->'."\n"; print "\n".'<!-- Show logo on menu -->'."\n";
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
print '<div class="menu_titre" id="menu_titre_logo"></div>'; print '<div class="menu_titre" id="menu_titre_logo"></div>';
print '<div class="menu_top" id="menu_top_logo"></div>'; print '<div class="menu_top" id="menu_top_logo"></div>';
print '<div class="menu_contenu" id="menu_contenu_logo">'; print '<div class="menu_contenu" id="menu_contenu_logo">';

15
htdocs/core/menus/standard/eldy.lib.php
View File

@ -439,7 +439,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
} }
$title=$langs->trans("GoIntoSetupToChangeLogo"); $title=$langs->trans("GoIntoSetupToChangeLogo");
print "\n".'<!-- Show logo on menu -->'."\n"; print "\n".'<!-- Show logo on menu -->'."\n";
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
print '<div class="menu_titre" id="menu_titre_logo"></div>'; print '<div class="menu_titre" id="menu_titre_logo"></div>';
print '<div class="menu_top" id="menu_top_logo"></div>'; print '<div class="menu_top" id="menu_top_logo"></div>';
print '<div class="menu_contenu" id="menu_contenu_logo">'; print '<div class="menu_contenu" id="menu_contenu_logo">';
@ -1395,7 +1395,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert"; $invert=empty($conf->global->MAIN_MENU_INVERT)?"":"invert";
if (empty($noout)) if (empty($noout))
{ {
$alt=0; $blockvmenuopened=false; $alt=0; $altok=0; $blockvmenuopened=false;
$num=count($menu_array); $num=count($menu_array);
for ($i = 0; $i < $num; $i++) for ($i = 0; $i < $num; $i++)
{ {
@ -1405,14 +1405,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$alt++; $alt++;
if (empty($menu_array[$i]['level']) && $showmenu) if (empty($menu_array[$i]['level']) && $showmenu)
{ {
$altok++;
$blockvmenuopened=true; $blockvmenuopened=true;
if (($alt%2==0)) if ($altok % 2 == 0)
{ {
print '<div class="blockvmenuimpair'.$invert.'">'."\n"; print '<div class="blockvmenuimpair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
} }
else else
{ {
print '<div class="blockvmenupair'.$invert.'">'."\n"; print '<div class="blockvmenupair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
} }
} }
@ -1478,9 +1479,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{ {
if ($showmenu) if ($showmenu)
print '<div class="menu_end"></div>'."\n"; print '<div class="menu_end"></div>'."\n";
if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; } if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
} }
} }
if ($altok) print '<div class="blockvmenuend"></div>';
} }
return count($menu_array); return count($menu_array);

3
htdocs/langs/en_US/admin.lang
View File

@ -279,7 +279,8 @@ MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
MAIN_SMS_SENDMODE=Method to use to send SMS MAIN_SMS_SENDMODE=Method to use to send SMS
MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum. SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
ModuleSetup=Module setup ModuleSetup=Module setup
ModulesSetup=Modules setup ModulesSetup=Modules setup
ModuleFamilyBase=System ModuleFamilyBase=System

4
htdocs/main.inc.php
View File

@ -1460,11 +1460,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
// User photo // User photo
$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">'; $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">';
$toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto'); $toprightmenu.=$user->getPhotoUrl(0,0,'loginphoto');
$toprightmenu.='</div></div>'; $toprightmenu.='</div></div>';
// Login name with tooltip // Login name with tooltip
$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem" style="padding: 0px;">'; $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
$toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, 'firstname','alogin'); $toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, 'firstname','alogin');
$toprightmenu.='</div></div>'; $toprightmenu.='</div></div>';

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

@ -557,9 +557,9 @@ td.showDragHandle {
width: 100%; width: 100%;
} }
#id-left { #id-left {
background-color: #fff; /* background-color: #fff;
border-right: 1px #888 solid; border-right: 1px #888 solid;
/* height: calc(100% - 50px);*/ height: calc(100% - 50px);*/
} }
@ -778,6 +778,9 @@ div.tmenucenter
<?php } ?> <?php } ?>
width: 100%; width: 100%;
} }
div.menu_titre {
padding-top: 5px;
}
.mainmenuaspan .mainmenuaspan
{ {
padding-right: 4px; padding-right: 4px;
@ -1064,6 +1067,8 @@ img.login, img.printer, img.entity {
} }
img.loginphoto { img.loginphoto {
border-radius: 2px; border-radius: 2px;
width: 16px;
height: 16px;
} }
.span-icon-user { .span-icon-user {
background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px; background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>) no-repeat scroll 7px 7px;
@ -1113,8 +1118,31 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenubookmarks
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks {
border-top: 1px solid #BBB;
}
.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
{
border-bottom: 1px solid #BBB;
}
.vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
{
margin: 0 0 8px 2px;
}
.vmenu div.blockvmenuend, div.blockvmenusearch
{
padding-bottom: 5px;
}
.vmenu div.blockvmenulogo
{
padding-bottom: 10px;
}
div.blockvmenubookmarks
{
padding-bottom: 6px !important;
}
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
color: #000000; color: #000000;
@ -1124,20 +1152,21 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
padding-right: 1px; padding-right: 1px;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
margin: 1px 0px 8px 2px; /* margin: 1px 0 8px 2px; */
margin: 0 0 0 2px;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
/*border-left: 1px solid #AAA; border-left: 1px solid #AAA;
border-right: 1px solid #BBB; border-right: 1px solid #BBB;
border-bottom: 1px solid #BBB; /* border-bottom: 1px solid #BBB;
border-top: 1px solid #BBB; border-top: 1px solid #BBB;
border-radius: 4px; border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
*/ */
} }
div.blockvmenusearch div.blockvmenusearch
@ -1152,17 +1181,16 @@ div.blockvmenusearch
padding-bottom: 3px; padding-bottom: 3px;
margin: 1px 0px 8px 2px; margin: 1px 0px 8px 2px;
background: rgb(<?php echo $colorbackvmenu2; ?>); background: rgb(<?php echo $colorbackvmenu2; ?>);
/*
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
border-right: 1px solid #CCC; border-right: 1px solid #BBB;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #BBB;
border-top: 1px solid #CCC; border-top: 1px solid #BBB;
border-radius: 4px; /*border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;*/
*/
} }
div.blockvmenusearch > form > div { div.blockvmenusearch > form > div {

13
htdocs/theme/md_exp/style.css.php
View File

@ -1050,8 +1050,8 @@ table.login_table_securitycode tr td {
div.login_block { div.login_block {
border-right: 1px solid rgba(0,0,0,0.3); border-right: 1px solid rgba(0,0,0,0.3);
padding-top: 8px; padding-top: 5px;
position: absolute; padding-bottom: 3px;
<?php print $left; ?>: 0; <?php print $left; ?>: 0;
top: 0px; top: 0px;
position: fixed; position: fixed;
@ -1089,6 +1089,9 @@ div.login_block_other { padding-top: 3px; }
padding: 0px 0px 0px 4px !important; padding: 0px 0px 0px 4px !important;
height: 16px; height: 16px;
} }
.login_block_elem_name {
margin-top: 5px;
}
.alogin, .alogin:hover { .alogin, .alogin:hover {
color: #888 !important; color: #888 !important;
font-weight: normal !important; font-weight: normal !important;
@ -1105,7 +1108,10 @@ img.login, img.printer, img.entity {
font-weight: bold; font-weight: bold;
} }
img.loginphoto { img.loginphoto {
border-radius: 2px; border-radius: 5px;
margin-top: -4px;
width: 20px;
height: 20px;
} }
.span-icon-user { .span-icon-user {
@ -2167,7 +2173,6 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
text-decoration: underline; text-decoration: underline;
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
} }
input.liste_titre { input.liste_titre {
background: transparent; background: transparent;