lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor look fix, fix into ecm module when dir does not exists

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-26 18:23:08 +02:00
parent 7da4d7f072
commit f52a07eee5
6 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/ajax/ajaxdirpreview.php
View File

@ -141,9 +141,10 @@ $type='directory';
// This test if file exists should be useless. We keep it to find bug more easily // This test if file exists should be useless. We keep it to find bug more easily
if (! dol_is_dir($upload_dir)) 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)); dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
exit; exit;*/
} }
print '<!-- TYPE='.$type.' -->'."\n"; print '<!-- TYPE='.$type.' -->'."\n";

2
htdocs/core/ajax/ajaxdirtree.php
View File

@ -152,7 +152,7 @@ if( file_exists($fullpathselecteddir) )
print '</td>'; print '</td>';
// Edit link // Edit link
print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view().'</a></td>'; print '<td align="right" width="18"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'&relativedir='.urlencode($val['fullrelativename']).'">'.img_view('',$langs->trans("Edit").' - '.$langs->trans("View")).'</a></td>';
// Add link // Add link
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>'; //print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';

2
htdocs/ecm/index.php
View File

@ -784,7 +784,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print '</td>'; print '</td>';
// Edit link // Edit link
print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'">'.img_view().'</a></td>'; print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docmine.php?section='.$val['id'].'">'.img_view($langs->trans("Edit").' - '.$langs->trans("Show")).'</a></td>';
// Add link // Add link
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>'; //print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';

9
htdocs/projet/fiche.php
View File

@ -339,6 +339,7 @@ if ($action == 'create' && $user->rights->projet->creer)
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
} }
print '</center>'; print '</center>';
print '</form>'; print '</form>';
} }
@ -443,10 +444,12 @@ else
print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$project->description.'</textarea>'; print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$project->description.'</textarea>';
print '</td></tr>'; print '</td></tr>';
print '<tr><td align="center" colspan="2">';
print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
print '<input type="submit" class="button" name="cancel" Value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>'; print '</table>';
print '<div align="center"><br>';
print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
print '<input type="submit" class="button" name="cancel" Value="'.$langs->trans("Cancel").'"></div>';
print '</form>'; print '</form>';
} }
else else

14
htdocs/societe/soc.php
View File

@ -985,7 +985,8 @@ else
/* /*
* Edition * Edition
*/ */
print_fiche_titre($langs->trans("EditCompany"));
//print_fiche_titre($langs->trans("EditCompany"));
if ($socid) if ($socid)
{ {
@ -995,6 +996,12 @@ else
$res=$object->fetch_optionals($object->id,$extralabels); $res=$object->fetch_optionals($object->id,$extralabels);
//if ($res < 0) { dol_print_error($db); exit; } //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 // Load object modCodeTiers
$module=$conf->global->SOCIETE_CODECLIENT_ADDON; $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined")); if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
@ -1430,6 +1437,8 @@ else
print '</center>'; print '</center>';
print '</form>'; print '</form>';
dol_fiche_end();
} }
} }
else else
@ -1448,9 +1457,6 @@ else
dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
$form = new Form($db);
// Confirm delete third party // Confirm delete third party
if ($action == 'delete' || $conf->use_javascript_ajax) if ($action == 'delete' || $conf->use_javascript_ajax)
{ {

17
htdocs/theme/eldy/style.css.php
View File

@ -185,7 +185,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
background: #FDFDFD; background: #FDFDFD;
border: 1px solid #ACBCBB; border: 1px solid #C0C0C0;
padding: 1px 1px 1px 1px; padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
@ -196,6 +196,7 @@ input:disabled {
background:#ddd; background:#ddd;
} }
input:-webkit-autofill { background-color: #FCFEFA !important; background-image:none !important; } input:-webkit-autofill { background-color: #FCFEFA !important; background-image:none !important; }
textarea:disabled { textarea:disabled {
background:#ddd; background:#ddd;
} }
@ -203,7 +204,7 @@ textarea:disabled {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
background-image: url(<?php echo $img_button ?>); background-image: url(<?php echo $img_button ?>);
background-position: bottom; background-position: bottom;
border: 1px solid #ACBCBB; border: 1px solid #C0C0C0;
padding: 0.1em 0.7em; padding: 0.1em 0.7em;
margin: 0em 0.5em; margin: 0em 0.5em;
-moz-border-radius:0px 5px 0px 5px; -moz-border-radius:0px 5px 0px 5px;
@ -218,7 +219,7 @@ textarea:disabled {
color: #222244; color: #222244;
background-image: url(<?php echo $img_button ?>); background-image: url(<?php echo $img_button ?>);
background-position: bottom; background-position: bottom;
border: 1px solid #ACBCBB; border: 1px solid #C0C0C0;
} }
.button:hover { .button:hover {
background: #dee7ec; background: #dee7ec;
@ -1302,7 +1303,7 @@ table.border {
} }
table.border td { table.border td {
padding: 1px 2px 1px 1px; padding: 1px 2px 1px 2px;
border: 1px solid #9CACBB; border: 1px solid #9CACBB;
border-collapse: collapse; border-collapse: collapse;
} }
@ -1866,9 +1867,9 @@ td.hidden {
/* Module agenda */ /* Module agenda */
/* ============================================================================== */ /* ============================================================================== */
.cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_other_month { opacity: 0.6; background: #DDDDDD; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_past_month { opacity: 0.6; background: #EEEEEE; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
.cal_past { } .cal_past { }
table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } 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: <?php print $fontlist ?> !important; font-family: <?php print $fontlist ?> !important;
background-image: url(<?php echo $img_button ?>) !important; background-image: url(<?php echo $img_button ?>) !important;
background-position: bottom !important; background-position: bottom !important;
border: 1px solid #ACBCBB !important; border: 1px solid #C0C0C0 !important;
padding: 0.1em 0.7em !important; padding: 0.1em 0.7em !important;
margin: 0em 0.5em !important; margin: 0em 0.5em !important;
-moz-border-radius:0px 5px 0px 5px !important; -moz-border-radius:0px 5px 0px 5px !important;