diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 7002c42e737..4e1996cf658 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -27,32 +27,40 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
$langs->load("bookmarks");
$langs->load("admin");
+$action=GETPOST('action','alpha');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
// Security check
if (! $user->rights->bookmark->lire) {
restrictedArea($user, 'bookmarks');
}
$optioncss = GETPOST('optioncss','alpha');
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
+if ($page == -1) { $page = 0; }
+$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position";
-$limit=$conf->liste_limit;
+if (! $sortfield) $sortfield='position';
+if (! $sortorder) $sortorder='ASC';
+
+$id = GETPOST("bid",'int');
/*
* Actions
*/
-if ($_GET["action"] == 'delete')
+if ($action == 'delete')
{
$bookmark=new Bookmark($db);
- $res=$bookmark->remove($_GET["bid"]);
+ $res=$bookmark->remove($id);
if ($res > 0)
{
header("Location: ".$_SERVER["PHP_SELF"]);
@@ -100,7 +108,7 @@ if ($resql)
print "
";
//print "| | ";
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","", $param,'align="left"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Title"),'','');
+ print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"title","", $param,'align="left"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Link"),'','');
print_liste_field_titre($langs->trans("Target"),'','','','','align="center"');
print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","", $param,'align="center"',$sortfield,$sortorder);
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0bbfdd82514..9dba03c5978 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -78,7 +78,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
//var_dump($user->conf->THEME_ELDY_RGB);
// Colors
-$colorbackhmenu1='90,100,130'; // topmenu
+$colorbackhmenu1='80,90,120'; // topmenu
$colorbackvmenu1='255,255,255'; // vmenu
$colortopbordertitle1='120,120,120'; // top border of title
$colorbacktitle1='240,240,240'; // title of tables,list
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 611ae895872..546cff1d9c7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -90,7 +90,7 @@ $colorbacklineimpair2='255,255,255'; // line impair
$colorbacklinepair1='250,250,250'; // line pair
$colorbacklinepair2='248,248,248'; // line pair
$colorbacklinepairhover='244,244,244'; // line pair
-$colorbackbody='248,248,248';
+$colorbackbody='240,240,240';
$colortexttitlenotab='90,90,90';
$colortexttitle='20,20,20';
$colortext='0,0,0';
@@ -2367,6 +2367,12 @@ table.paddingtopbottomonly tr td {
tr.liste_titre_filter td.liste_titre {
border-bottom: 1px solid #FDFFFF;
}
+.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
+{
+ /*border-top-width: 1px;
+ border-top-color: rgb();
+ border-top-style: solid;*/
+}
.liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
{
border-top-width: 2px;