diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 63411533ec6..5ad4a442e22 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -342,12 +342,12 @@ print ''; print ''; print ''; -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton.' '.$morehtmlcenter, $num, $nbtotalofrecords, 'unlock', 0, '', '', $limit); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton.' '.$morehtmlcenter, $num, $nbtotalofrecords, '', 0, '', '', $limit); $topicmail="Information"; -//$modelmail="websiteaccount"; -$objecttmp=new Product($db); -//$trackid='websiteaccount'.$object->id; +$modelmail="websiteaccount"; +$objecttmp=new WebsiteAccount($db); +$trackid='websiteaccount'.$object->id; include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) diff --git a/htdocs/theme/eldy/img/object_lock.png b/htdocs/theme/eldy/img/object_lock.png new file mode 100644 index 00000000000..3d99cf1eaef Binary files /dev/null and b/htdocs/theme/eldy/img/object_lock.png differ diff --git a/htdocs/theme/md/img/object_lock.png b/htdocs/theme/md/img/object_lock.png new file mode 100644 index 00000000000..3d99cf1eaef Binary files /dev/null and b/htdocs/theme/md/img/object_lock.png differ diff --git a/htdocs/website/class/websiteaccount.class.php b/htdocs/website/class/websiteaccount.class.php index 275b2491e49..f24847a4601 100644 --- a/htdocs/website/class/websiteaccount.class.php +++ b/htdocs/website/class/websiteaccount.class.php @@ -50,7 +50,7 @@ class WebsiteAccount extends CommonObject /** * @var string String with name of icon for websiteaccount. Must be the part after the 'object_' into object_myobject.png */ - public $picto = 'globe'; + public $picto = 'lock'; /** @@ -77,7 +77,7 @@ class WebsiteAccount extends CommonObject public $fields=array( 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',), 'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Login',), - 'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>-2, 'enabled'=>1, 'position'=>30), + 'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30), 'pass_crypted' => array('type'=>'varchar(128)', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1), 'pass_temp' => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,), 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1),