';
- }
-
- print '| '.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).' | ';
-
if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
- print '| ';
+ if ($conf->browser->layout == 'phone') {
+ print ' | | ';
+ print ' ';
+ }
+ print '| '.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).' | ';
+ print '';
+ print '';
$tmpcode = $object->code_fournisseur;
if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
@@ -1581,8 +1581,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
print $form->textwithpicto('', $s, 1);
print ' ';
+ print ' | ';
+ } else {
+ print ' | ';
}
- print ' ';
+ print '';
// Status
print '| '.$form->editfieldkey('Status', 'status', '', $object, 0).' | ';
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 57f09fd9329..4dfac945de9 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -99,18 +99,18 @@ class SocieteAccount extends CommonObject
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 5, 'default' => '1'),
- 'login' => array('type' => 'varchar(64)', 'label' => 'Login', 'visible' => 1, 'enabled' => 1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1, 'autofocusoncreate' => 1),
+ 'login' => array('type' => 'varchar(64)', 'label' => 'Login', 'visible' => 1, 'enabled' => 1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1, 'autofocusoncreate' => 1, 'csslist' => 'tdoverflowmax150'),
'pass_encoding' => array('type' => 'varchar(24)', 'label' => 'PassEncoding', 'visible' => 0, 'enabled' => 1, 'position' => 30),
'pass_crypted' => array('type' => 'password', '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, 'picto' => 'company', 'css' => 'maxwidth300 widthcentpercentminusxx'),
'site' => array('type' => 'varchar(128)', 'label' => 'WebsiteTypeLabel', 'visible' => 0, 'enabled' => 0, 'position' => 41, 'notnull' => 1, 'default' => '', 'help' => 'Name of the website or service if this is account on an external website or service', 'csslist' => 'tdoverflowmax150', 'arrayofkeyval' => array(/* For static analysis, filled in constructor */)),
- 'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx'),
+ 'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
'site_account' => array('type' => 'varchar(128)', 'label' => 'ExternalSiteAccount', 'visible' => 0, 'enabled' => 1, 'position' => 44, 'help' => 'A key to identify the account on external web site if this is an account on an external website'),
'key_account' => array('type' => 'varchar(128)', 'label' => 'KeyAccount', 'visible' => 0, 'enabled' => 1, 'position' => 48, 'notnull' => 0, 'index' => 1, 'searchall' => 1, 'comment' => 'The id of third party in the external web site (for site_account if site_account defined)',),
- 'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0,),
- 'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0,),
- 'date_last_reset_password' => array('type' => 'datetime', 'label' => 'PreviousResetPassword', 'visible' => 0, 'enabled' => 1, 'position' => 53, 'notnull' => 0,),
+ 'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'css' => 'nowraponall'),
+ 'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0, 'css' => 'nowraponall'),
+ 'date_last_reset_password' => array('type' => 'datetime', 'label' => 'PreviousResetPassword', 'visible' => 0, 'enabled' => 1, 'position' => 53, 'notnull' => 0, 'css' => 'nowraponall'),
//'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => -1, 'enabled' => 1, 'position' => 46, 'notnull' => -1,),
'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 5b55fe39776..c1f309ad643 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -749,6 +749,7 @@ input:-webkit-autofill {
/* CSS for placeholder */
.placeholder { color: #ccc; }
select.placeholder { color: #ccc; }
+.select2-selection__choice .placeholder { color: #aaa; }
::-webkit-input-placeholder { color: #ccc; }
input:-moz-placeholder { color: #ccc; }
select.placeholder option:not(.opacitymediumbycolor):not(.opacitymedium) {
@@ -4207,6 +4208,7 @@ div .tdtop:not(.tagtdnote) {
padding-bottom: 2px !important; */
padding-top: 7px !important;
padding-bottom: 0px !important;
+ height: unset !important;
}
table.border td, table.bordernooddeven td, div.border div div.tagtd {
@@ -6533,10 +6535,6 @@ a.cke_dialog_ui_button
-webkit-box-shadow: 3px 3px 4px #DDD !important;
box-shadow: 3px 3px 4px #DDD !important;
}
-.cke_dialog_ui_hbox_last
-{
- vertical-align: bottom !important;
-}
.cke_dialog_ui_hbox_first {
vertical-align: middle !important;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 621f27e1090..2a76da44afa 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -934,6 +934,7 @@ input[type=checkbox], input[type=radio] {
/* CSS for placeholder */
.placeholder { color: #ccc; }
select.placeholder { color: #ccc; }
+.select2-selection__choice .placeholder { color: #aaa; }
::-webkit-input-placeholder { color:#ccc; }
:-moz-placeholder { color:#bbb; } /* firefox 18- */
::-moz-placeholder { color:#bbb; } /* firefox 19+ */
@@ -3968,9 +3969,10 @@ div.tabs {
margin-right: 6px !important;*/
clear:both;
height:100%;
+ margin-top: 18px;
}
div.tabsElem {
- margin-top: 12px;
+/* margin-top: 18px; */
} /* To avoid overlap of tabs when not browser */
div.tabsElem a {
font-weight: normal !important;
@@ -6428,7 +6430,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
body.cke_show_borders {
margin: 5px !important;
}
-
+table.cke_dialog.cke_browser_webkit {
+ border-collapse: separate;
+ border-radius: 10px;
+}
.cke_dialog {
border: 1px #bbb solid ! important;
}
@@ -6449,17 +6454,10 @@ a.cke_dialog_ui_button
-webkit-box-shadow: 3px 3px 4px #f4f4f4 !important;
box-shadow: 3px 3px 4px #f4f4f4 !important;
}
-.cke_dialog_ui_hbox_last
-{
- vertical-align: bottom !important;
-}
-.cke_dialog_ui_hbox_last
-{
- vertical-align: bottom !important;
-}
.cke_combo_text {
width: 40px !important;
}
+
/*
.cke_editable
{
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 7c82bf48493..846b1e57d44 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php';
*/
// Load translation files required by the page
-$langs->loadLangs(array("website", "other"));
+$langs->loadLangs(array("companies", "website", "other"));
// Get parameters
$id = GETPOSTINT('id');
@@ -383,6 +383,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ''."\n";
// Common attributes
+ $keyforbreak='note_private'; // We change column just before this field
+ //unset($object->fields['fk_project']); // Hide field already shown in banner
+ //unset($object->fields['fk_soc']); // Hide field already shown in banner
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
// Other attributes
|
|