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

Several fixes in CSS

Browse Source 
Conflicts:
	htdocs/core/menus/standard/empty.php
This commit is contained in:
Laurent Destailleur 2013-06-19 17:02:09 +02:00
parent e92e6f7131
commit 5cb2ba3909
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/menus/standard/auguria_menu.php
View File

@ -186,7 +186,7 @@ class MenuManager
print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n"; print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{ {
print '<ul data-role="listview" data-inset="true">'; print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">'; print '<li data-role="list-divider">';
if ($val['enabled'] == 1) if ($val['enabled'] == 1)
{ {

2
htdocs/core/menus/standard/eldy_menu.php
View File

@ -140,7 +140,7 @@ class MenuManager
print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n"; print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{ {
print '<ul data-role="listview" data-inset="true">'; print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">'; print '<li data-role="list-divider">';
if ($val['enabled'] == 1) if ($val['enabled'] == 1)
{ {

52
htdocs/core/menus/standard/empty.php
View File

@ -194,32 +194,32 @@ class MenuManager
} }
} }
if ($mode == 'jmobile') if ($mode == 'jmobile')
{ {
foreach($this->topmenu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' foreach($this->topmenu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{ {
print '<ul data-role="listview" data-inset="true">'; print '<ul class="ulmenu" data-role="listview" data-inset="true">';
print '<li data-role="list-divider">'; print '<li data-role="list-divider">';
if ($val['enabled'] == 1) if ($val['enabled'] == 1)
{ {
$relurl=dol_buildpath($val['url'],1); $relurl=dol_buildpath($val['url'],1);
$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl); $relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
$relurl=preg_replace('/__USERID__/',$user->id,$relurl); $relurl=preg_replace('/__USERID__/',$user->id,$relurl);
print '<a href="#">'.$val['titre'].'</a>'."\n"; print '<a href="#">'.$val['titre'].'</a>'."\n";
// Search submenu fot this entry // Search submenu fot this entry
$tmpmainmenu=$val['mainmenu']; $tmpmainmenu=$val['mainmenu'];
$tmpleftmenu='all'; $tmpleftmenu='all';
//$submenu=new Menu(); //$submenu=new Menu();
//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu); //$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
//$nexturl=dol_buildpath($submenu->liste[0]['url'],1); //$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
$submenu=$this->leftmenu; $submenu=$this->leftmenu;
$canonrelurl=preg_replace('/\?.*$/','',$relurl); $canonrelurl=preg_replace('/\?.*$/','',$relurl);
$canonnexturl=preg_replace('/\?.*$/','',$nexturl); $canonnexturl=preg_replace('/\?.*$/','',$nexturl);
//var_dump($canonrelurl); //var_dump($canonrelurl);
//var_dump($canonnexturl); //var_dump($canonnexturl);
print '<ul>'; print '<ul>';
if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))) if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
{ {
// We add sub entry // We add sub entry

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

@ -2695,6 +2695,10 @@ div.ui-radio
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
} }
ul.ulmenu {
border-radius: 0;
-webkit-border-radius: 0;
}
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();