diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php index b796183782b..0c5283afa28 100644 --- a/htdocs/core/js/lib_foot.js.php +++ b/htdocs/core/js/lib_foot.js.php @@ -273,7 +273,7 @@ print ' jQuery(\'.clipboardCPShowOnHover\').hover( function() { console.log("We hover a value with a copy paste feature"); - $(this).children(".clipboardCPButton, .clipboardCPText").show(); + $(this).children(".clipboardCPButton, .clipboardCPText").css("display", "inline-block"); /* better than .show() because the show set the display to "inline" */ }, function() { console.log("We hover out the value with a copy paste feature"); @@ -306,7 +306,7 @@ print ' succeed = document.execCommand(\'copy\'); console.log("We set the style display back to inline-block"); - jqobj.css("display", "inline-block"); + jqobj.css("display", "inline-block"); /* better than .show() because the show set the display to "inline" */ } catch(e) { succeed = false; } @@ -315,16 +315,18 @@ print ' window.getSelection().removeAllRanges(); } - /* Show message */ - /* TODO Show message into a top left corner or center of screen */ + /* Show result - message */ + var lastparent = $(this).parent(); /* .parent is clipboardCP */ var lastchild = this.parentNode.lastChild; /* .parentNode is clipboardCP and last child is clipboardCPText */ var tmp = lastchild.innerHTML if (succeed) { - lastchild.innerHTML = \'
'.dol_escape_js($langs->trans('CopiedToClipboard')).'
\'; + $(this).parent().children(".clipboardCPButton").hide(); + $(this).parent().children(".clipboardCPTick").css("display", "inline-block"); /* better than .show() because the show set the display to "inline" */ + //lastchild.innerHTML = \'
'.dol_escape_js($langs->trans('CopiedToClipboard')).'
\'; } else { lastchild.innerHTML = \'
'.dol_escape_js($langs->trans('Error')).'
\'; } - setTimeout(() => { lastchild.innerHTML = tmp; }, 1000); + setTimeout(() => { lastchild.innerHTML = tmp; lastparent.children(".clipboardCPTick").hide(); }, 2000); }); });'."\n"; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1b0c9dad6f4..39cac4535a7 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6365,13 +6365,13 @@ function load_fiche_titre($title, $morehtmlright = '', $picto = 'generic', $pict $return .= "\n"; $return .= ''; // margin bottom must be same than into print_barre_list - $return .= ''; + $return .= ''; if ($picto) { $return .= ''; } $return .= ''; if (dol_strlen($morehtmlcenter)) { @@ -6439,7 +6439,8 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '', print "\n"; print "\n"; - print '
'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).''; $return .= '
'; - $return .= $title; // $title is already HTML sanitized content + $return .= ''.$title.''; // $title is already HTML sanitized content $return .= '
'; $return .= '
'; // margin bottom must be same than into load_fiche_tire + print '
'; + print ''; // margin bottom must be same than into load_fiche_tire // Left @@ -13547,21 +13548,24 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1) */ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '') { - /* - global $conf; - - if (!empty($conf->dol_no_mouse_hover)) { - $showonlyonhover = 0; - }*/ + global $langs; $tag = 'span'; // Using div (like any style of type 'block') does not work when using the js copy code. + + $result = ''; if ($texttoshow === 'none') { - $result = '<'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).''; + $result .= '<'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).''; + $result .= ''; } elseif ($texttoshow) { - $result = '<'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).''.dol_escape_htmltag($texttoshow, 1, 1).''; + $result .= '<'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).''; + $result .= ''.dol_escape_htmltag($texttoshow, 1, 1).''; } else { - $result = '<'.$tag.' class="clipboardCPValue">'.dol_escape_htmltag($valuetocopy, 1, 1).''; + $result .= '<'.$tag.' class="clipboardCPValue">'.dol_escape_htmltag($valuetocopy, 1, 1).''; } + $result .= ''; + $result .= img_picto('', 'tick', 'class="clipboardCPTick hidden paddingleft pictomodule"'); + $result .= ''; + $result .= ''; return $result; } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e84bd5e09b0..df2bf4bc2c1 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -883,6 +883,7 @@ toward=toward Access=Access SelectAction=Select action SelectTargetUser=Select target user/employee +ClickToCopyToClipboard=Click to copy to clipboard HelpCopyToClipboard=Use Ctrl+C to copy to clipboard SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") OriginFileName=Original filename diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index bf875a17b7b..80b66777d5a 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -207,7 +207,6 @@ $thirdpartygraph .= ''; $thirdpartycateggraph = ''; if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES')) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; - $elementtype = 'societe'; $thirdpartycateggraph = '
'; $thirdpartycateggraph .= '
'; @@ -218,7 +217,7 @@ if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRD $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid"; $sql .= " WHERE c.type = 2"; if (!is_numeric(getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES'))) { - $sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'"; + $sql .= " AND c.label like '".$db->escape(getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES'))."'"; } $sql .= " AND c.entity IN (".getEntity('category').")"; $sql .= " GROUP BY c.label"; @@ -258,7 +257,7 @@ if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRD while ($i < $num) { $obj = $db->fetch_object($result); - $thirdpartycateggraph .= ''; + $thirdpartycateggraph .= ''; $total += $obj->nb; $i++; } @@ -278,6 +277,7 @@ if (isModEnabled('category') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRD /* * Latest modified third parties */ + $sql = "SELECT s.rowid, s.nom as name, s.email, s.client, s.fournisseur"; $sql .= ", s.code_client"; $sql .= ", s.code_fournisseur"; diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 6efc1670553..72f6cdc978a 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -70,6 +70,7 @@ $pagenext = $page + 1; $now = dol_now(); +// Security check $object = new Societe($db); $permissiontoadd = $user->hasRight('societe', 'lire'); @@ -79,6 +80,10 @@ $permissiontoadd = $user->hasRight('societe', 'lire'); * Actions */ +if (GETPOST('cancel', 'alpha')) { + $action = 'list'; +} + $parameters = array('id' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -88,10 +93,6 @@ if ($reshook < 0) { if (empty($reshook)) { $error = 0; - if (GETPOST('cancel', 'alpha')) { - $action = ''; - } - // Add a notification if ($action == 'add' && $permissiontoadd) { if (empty($contactid)) { @@ -101,6 +102,7 @@ if (empty($reshook)) { if ($actionid <= 0) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors'); $error++; + $action = 'create'; } if (!$error) { @@ -110,7 +112,7 @@ if (empty($reshook)) { $sql .= " WHERE fk_soc=".((int) $socid)." AND fk_contact=".((int) $contactid)." AND fk_action = ".((int) $actionid); if ($db->query($sql)) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)"; - $sql .= " VALUES ('".$db->idate($now)."',".((int) $socid).",".((int) $contactid).",".((int) $actionid).")"; + $sql .= " VALUES ('".$db->idate($now)."', ".((int) $socid).",".((int) $contactid).",".((int) $actionid).")"; if (!$db->query($sql)) { $error++; @@ -124,6 +126,7 @@ if (empty($reshook)) { $db->commit(); } else { $db->rollback(); + $action = 'create'; } } } @@ -200,8 +203,9 @@ if ($result > 0) { if ($tmpcheck != 0 && $tmpcheck != -5) { print ' ('.$langs->trans("WrongSupplierCode").')'; } - print ''; + print ''; } + print ''."\n"; /*print ''; // Notification for this thirdparty print '
'.$obj->label.''.$obj->nb.'
'.dolPrintHTML($obj->label).''.$obj->nb.'
'.$langs->trans("NbOfActiveNotifications").''; @@ -234,6 +238,16 @@ if ($result > 0) { print '

'."\n"; + + // Add notification form + + print '
'; + print ''; + print ''; + if ($action == 'create') { + print ''; + } + $nbtotalofrecords = ''; // List of notifications enabled for contacts of the thirdparty @@ -255,15 +269,18 @@ if ($result > 0) { } $param = ''; + $newcardbutton = ''; $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->hasRight("societe", "creer")); - $titlelist = $langs->trans("ListOfActiveNotifications"); + $titlelist = $form->textwithpicto($langs->trans("ListOfActiveNotifications"), $langs->trans("ListOfActiveNotificationsHelp", $langs->transnoentitiesnoconv("Target"), $langs->transnoentitiesnoconv("Event"))); - // Add notification form - //print load_fiche_titre($titlelist.' ('.$num.')', '', ''); $num = $nbtotalofrecords; - print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, (empty($nbtotalofrecords) ? -1 : $nbtotalofrecords), 'email', 0, $newcardbutton, '', $limit, 0, 0, 1); + + $limitforsubscription = 0; // We show all subscription of user. Pagination will be reserved for the section of notifications sent. + // List of active notifications + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition, PhanPluginSuspiciousParamOrder + print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, (empty($nbtotalofrecords) ? -1 : $nbtotalofrecords), 'email', 0, $newcardbutton, '', $limitforsubscription, 0, 0, 1); print ''; print ''; @@ -273,10 +290,10 @@ if ($result > 0) { // Line with titles print '
'; - print ''; + print '
'; print ''; print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, 'width="45%"', $sortfield, $sortorder); - print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, 'width="35%"', $sortfield, $sortorder); + print_liste_field_titre("Event", $_SERVER["PHP_SELF"], "", '', $param, 'width="35%"', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, 'width="10%"', $sortfield, $sortorder); print_liste_field_titre(''); print "\n"; @@ -307,7 +324,7 @@ if ($result > 0) { print img_picto('', 'contact', '', 0, 0, 0, '', 'paddingright'); print $form->selectarray("contactid", $newlistofemails, '', 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidthonsmartphone'); print ''; - print ''; @@ -317,6 +334,7 @@ if ($result > 0) { print ''; print ''; print ''; @@ -345,14 +363,14 @@ if ($result > 0) { print ' <'.$obj->email.'>'; } else { $langs->load("errors"); - print ' '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email).''; + print '   '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email).''; } } print ''; $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label); print ''; print '
'; + print ''; print img_picto('', 'object_action', '', 0, 0, 0, '', 'paddingright'); print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidthonsmartphone'); print ''; print ''; + print ' '; print ''; print '
'; - print img_picto('', 'object_action', '', 0, 0, 0, '', 'paddingright').$label; + print img_picto('', 'object_action', '', 0, 0, 0, '', 'pictofixedwidth').$label; print ''; if ($obj->type == 'email') { @@ -431,15 +449,17 @@ if ($result > 0) { print ''; print ''; + $titlelist = $form->textwithpicto($langs->trans("ListOfNotificationsDone"), $langs->trans("ListOfNotificationsDoneHelp")); + // List of active notifications @phan-suppress-next-line PhanPluginSuspiciousParamOrder - print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, empty($nbtotalofrecords) ? -1 : $nbtotalofrecords, 'email', 0, '', '', $limit); + print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, empty($nbtotalofrecords) ? -1 : $nbtotalofrecords, 'email', 0, '', '', $limit, ''); // Line with titles print '
'; print ''; print ''; print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder); - print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder); + print_liste_field_titre("Event", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder); //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder); print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right '); diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index ce657e78f77..3aa33b12a99 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -230,7 +230,7 @@ TITLE BUTTON text-decoration: none; position: relative; /* margin: 0 0 0 8px; */ - min-width: 72px; + min-width: 60px; text-align: center; color: var(--btncolortext); border: none; diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index c84bfd02cf2..597406c2d9a 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -105,7 +105,7 @@ button.dropdown-item.global-search-item { min-width: 160px; margin: 2px 0 0; font-size: 14px; - text-align: left; + text-align: ; list-style: none; background-color: #fff; -webkit-background-clip: padding-box; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 0092e11dbde..ada128f1a9f 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3912,7 +3912,7 @@ a.tabunactive { } a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 12px 14px 13px; + padding: 12px 14px 10px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; @@ -5342,11 +5342,14 @@ div.divphotoref > div > .photowithmargin, div.divphotoref > img.photowithmargin, opacity: 0.5; } +table.table-fiche-title tr.toptitle { + height: 60px; +} div.titre { font-size: 1.1em; text-decoration: none; - padding-top: 5px; - padding-bottom: 5px; + /* padding-top: 5px; + padding-bottom: 5px; */ font-weight: 400; } div.titre.small { @@ -5369,9 +5372,11 @@ div.titre { color: var(--colortexttitlenotab2); } +/* table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon { line-height: 40px; } +*/ table.table-fiche-title .col-title div.titre > span:not(.print-barre-liste) { line-height: normal; } diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php index b464e978081..f7e1e51da13 100644 --- a/htdocs/theme/md/btn.inc.php +++ b/htdocs/theme/md/btn.inc.php @@ -317,7 +317,6 @@ table.table-fiche-title tr.titre td.col-right a.btnTitle { text-decoration: none; position: relative; margin: 0 0 0 10px; - min-width: 80px; text-align: center; color: var(--btncolortext); border: none; @@ -325,6 +324,10 @@ table.table-fiche-title tr.titre td.col-right a.btnTitle { font-weight: 300; /* background-color: #fbfbfb; */ } +/* *:not(.paginationafterarrows) > .btnTitle, *:not(.paginationafterarrows) > a.btnTitle { */ +.btnTitle, a.btnTitle { + min-width: 60px; +} a.btnTitle.btnTitleSelected { border: 1px solid #ccc; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 88b454e7ff0..9245ccf663a 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2449,7 +2449,7 @@ td.showDragHandle { padding-bottom: 20px; padding-: px; - padding-top: 28px; + padding-top: 12px; } .bodyforlist #id-right { @@ -2783,7 +2783,6 @@ td.nobordernopadding.widthpictotitle.col-picto { } .pictotitle { margin-: 8px; - margin-bottom: 4px; } .pictoobjectwidth { width: 14px; @@ -3929,7 +3928,7 @@ div.tabs { height:100%; } div.tabsElem { - margin-top: 6px; + margin-top: 12px; } /* To avoid overlap of tabs when not browser */ div.tabsElem a { font-weight: normal !important; @@ -3975,59 +3974,7 @@ div.tabBar table.tableforservicepart2:last-child { .tableforservicepart1 .tdhrthin { height: unset; } -/* Payment Screen : Pointer cursor in the autofill image */ -.AutoFillAmount { - cursor:pointer; -} -/* ============================================================================== */ -/* Buttons for actions */ -/* ============================================================================== */ - -div.divButAction { - margin-bottom: 1.4em; -} -div.tabsAction { - margin: 20px 0em 20px 0em; - padding: 0em 0em; - text-align: right; -} -div.tabsActionNoBottom { - margin-bottom: 0px; -} -div.tabsAction > a { - margin-bottom: 16px !important; -} - -div.popuptabset { - padding: 6px; - background: #fff; - border: 1px solid #888; -} -div.popuptab { - padding-top: 5px; - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; -} - -a.tabTitle { - color:rgba(0,0,0,.5); - margin-: 10px; - text-shadow:1px 1px 1px #ffffff; - font-family: ; - font-weight: normal; - padding: 4px 6px 2px 6px; - margin: 0px 6px; - text-decoration: none; - white-space: nowrap; -} -.tabTitleText { - display: none; -} -.imgTabTitle { - max-height: 14px; -} div.tabs div.tabsElem:first-of-type a.tab { margin-left: 0px !important; } @@ -4037,7 +3984,7 @@ a.tabunactive { } a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 12px 13px 12px; + padding: 10px 13px 10px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; @@ -4094,6 +4041,63 @@ span.tabspan { border-top: 1px solid #D8D8D8; } +/* Payment Screen : Pointer cursor in the autofill image */ +.AutoFillAmount { + cursor:pointer; +} + + +/* ============================================================================== */ +/* Buttons for actions */ +/* ============================================================================== */ + +div.divButAction { + margin-bottom: 1.4em; +} +div.tabsAction { + margin: 20px 0em 20px 0em; + padding: 0em 0em; + text-align: right; +} +div.tabsActionNoBottom { + margin-bottom: 0px; +} +div.tabsAction > a { + margin-bottom: 16px !important; +} + +div.popuptabset { + padding: 6px; + background: #fff; + border: 1px solid #888; +} +div.popuptab { + padding-top: 5px; + padding-bottom: 5px; + padding-left: 5px; + padding-right: 5px; +} + +a.tabTitle { + color:rgba(0,0,0,.5); + margin-: 10px; + text-shadow:1px 1px 1px #ffffff; + font-family: ; + font-weight: normal; + padding: 4px 6px 2px 6px; + margin: 0px 6px; + text-decoration: none; + white-space: nowrap; +} +.tabTitleText { + display: none; +} +.imgTabTitle { + max-height: 14px; +} + + + /* ============================================================================== */ /* Buttons for actions */ /* ============================================================================== */ @@ -5344,11 +5348,14 @@ div.divphotoref > div > .photowithmargin, div.divphotoref > img.photowithmargin, opacity: 0.5; } +table.table-fiche-title tr.toptitle { + height: 60px; +} div.titre { font-size: 14px; text-decoration: none; - padding-top: 5px; - padding-bottom: 5px; + /*padding-top: 5px; + padding-bottom: 5px;*/ text-transform: uppercase; /* text-shadow: 1px 1px 2px #FFFFFF; */ } @@ -5372,10 +5379,11 @@ table.notopnoleftnoright.table-fiche-title { margin-bottom: 8px; } - +/* table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon { line-height: 40px; } +*/ table.table-fiche-title .col-title div.titre span { line-height: normal; } diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 1a4ad5a70c5..8de7876659e 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -90,10 +90,10 @@ if (GETPOST('cancel', 'alpha')) { $action = 'list'; } +$error = 0; + // Add a notification if ($action == 'add' && $permissiontoadd) { - $error = 0; - if ($actionid <= 0) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors'); $error++; @@ -149,6 +149,7 @@ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $title = $object->name.' - '.$langs->trans("Notification"); } $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; + llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-user page-notify_card'); @@ -205,7 +206,7 @@ if ($result > 0) { print "\n"; // Help - print ''; + print ''; print '
'.$langs->trans("NotificationsDesc"); print '
'.$langs->trans("NotificationsDescUser").' - '.$langs->trans("YouAreHere"); if (isModEnabled('societe')) { @@ -267,7 +268,7 @@ if ($result > 0) { print_liste_field_titre("Event", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder); print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder); print_liste_field_titre('', '', ''); - print ''; + print "\n"; if ($action == 'create') { @@ -300,13 +301,13 @@ if ($result > 0) { print $form->selectarray("typeid", $type); print ''; print ''; print ''; } else { - print ''; } @@ -334,7 +335,7 @@ if ($result > 0) { print ' <'.$obj->email.'>'; } else { $langs->load("errors"); - print '   '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email); + print '   '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email).''; } } print '';
'; - print ''; + print ''; print ' '; - print ''; + print ''; print '
'; + print '
'; print $langs->trans("YouMustAssignUserMailFirst"); print '