Work on 6.0 look and feel

This commit is contained in:
Laurent Destailleur
2017-03-28 18:42:23 +02:00
parent e8e7732820
commit e416ea275e
39 changed files with 550 additions and 444 deletions

View File

@@ -2589,7 +2589,7 @@ function img_edit_remove($titlealt = 'default', $other='')
* @param string $other Add more attributes on img
* @return string Return tag img
*/
function img_edit($titlealt = 'default', $float = 0, $other = '')
function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"')
{
global $conf, $langs;
@@ -2624,7 +2624,7 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
* @param string $other Add more attributes on img
* @return string Retourne tag img
*/
function img_delete($titlealt = 'default', $other = '')
function img_delete($titlealt = 'default', $other = 'class="pictodelete"')
{
global $conf, $langs;
@@ -3450,8 +3450,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
}
if ($page > 0)
{
if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><</a></li>';
else print '<li><a data-role="button" data-icon="arrow-l" data-iconpos="left" href="'.$file.'?page='.($page-1).$options.'">'.$langs->trans("Previous").'</a></li>';
print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page-1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
}
if ($betweenarrows)
{
@@ -3459,8 +3458,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
}
if ($nextpage > 0)
{
if (($conf->dol_use_jmobile != 4)) print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'">></a></li>';
else print '<li><a data-role="button" data-icon="arrow-r" data-iconpos="right" href="'.$file.'?page='.($page+1).$options.'">'.$langs->trans("Next").'</a></li>';
print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page+1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
}
if ($afterarrows)
{