diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index d2130845bf7..6b6277bb3fa 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -141,9 +141,10 @@ $type='directory';
// This test if file exists should be useless. We keep it to find bug more easily
if (! dol_is_dir($upload_dir))
{
- $langs->load("install");
+// dol_mkdir($upload_dir);
+/* $langs->load("install");
dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
- exit;
+ exit;*/
}
print ''."\n";
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index e3f0f17850c..2896d5543c0 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -152,7 +152,7 @@ if( file_exists($fullpathselecteddir) )
print '';
// Edit link
- print '| '.img_view().' | ';
+ print ''.img_view('',$langs->trans("Edit").' - '.$langs->trans("View")).' | ';
// Add link
//print ''.img_edit_add().' | ';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 54092313f36..1d53d81839e 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -784,7 +784,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print '';
// Edit link
- print ''.img_view().' | ';
+ print ''.img_view($langs->trans("Edit").' - '.$langs->trans("Show")).' | ';
// Add link
//print ''.img_edit_add().' | ';
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index d93a6462db6..edc44e5e7fd 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -339,6 +339,7 @@ if ($action == 'create' && $user->rights->projet->creer)
print '';
}
print '';
+
print '';
}
@@ -443,10 +444,12 @@ else
print '';
print '';
- print '| ';
- print ' ';
- print ' |
';
print '';
+
+ print '
';
+ print ' ';
+ print '
';
+
print '';
}
else
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1ec26a874d7..2a9e3a3efdf 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -985,7 +985,8 @@ else
/*
* Edition
*/
- print_fiche_titre($langs->trans("EditCompany"));
+
+ //print_fiche_titre($langs->trans("EditCompany"));
if ($socid)
{
@@ -995,6 +996,12 @@ else
$res=$object->fetch_optionals($object->id,$extralabels);
//if ($res < 0) { dol_print_error($db); exit; }
+
+ $head = societe_prepare_head($object);
+
+ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+
+
// Load object modCodeTiers
$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
@@ -1430,6 +1437,8 @@ else
print '';
print '';
+
+ dol_fiche_end();
}
}
else
@@ -1448,9 +1457,6 @@ else
dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
- $form = new Form($db);
-
-
// Confirm delete third party
if ($action == 'delete' || $conf->use_javascript_ajax)
{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a35c02228d4..c87ce557d3f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -185,7 +185,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: px;
font-family: ;
background: #FDFDFD;
- border: 1px solid #ACBCBB;
+ border: 1px solid #C0C0C0;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
@@ -196,6 +196,7 @@ input:disabled {
background:#ddd;
}
input:-webkit-autofill { background-color: #FCFEFA !important; background-image:none !important; }
+
textarea:disabled {
background:#ddd;
}
@@ -203,7 +204,7 @@ textarea:disabled {
font-family: ;
background-image: url();
background-position: bottom;
- border: 1px solid #ACBCBB;
+ border: 1px solid #C0C0C0;
padding: 0.1em 0.7em;
margin: 0em 0.5em;
-moz-border-radius:0px 5px 0px 5px;
@@ -218,7 +219,7 @@ textarea:disabled {
color: #222244;
background-image: url();
background-position: bottom;
- border: 1px solid #ACBCBB;
+ border: 1px solid #C0C0C0;
}
.button:hover {
background: #dee7ec;
@@ -1302,7 +1303,7 @@ table.border {
}
table.border td {
- padding: 1px 2px 1px 1px;
+ padding: 1px 2px 1px 2px;
border: 1px solid #9CACBB;
border-collapse: collapse;
}
@@ -1866,9 +1867,9 @@ td.hidden {
/* Module agenda */
/* ============================================================================== */
-.cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #C0C0C0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #C0C0C0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; border: solid 1px #C0C0C0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past { }
table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; }
@@ -2217,7 +2218,7 @@ a.cke_dialog_ui_button
font-family: !important;
background-image: url() !important;
background-position: bottom !important;
- border: 1px solid #ACBCBB !important;
+ border: 1px solid #C0C0C0 !important;
padding: 0.1em 0.7em !important;
margin: 0em 0.5em !important;
-moz-border-radius:0px 5px 0px 5px !important;