Skip to content

Commit

Permalink
Minor look fix, fix into ecm module when dir does not exists
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Mar 26, 2012
1 parent 7da4d7f commit f52a07e
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 19 deletions.
5 changes: 3 additions & 2 deletions htdocs/core/ajax/ajaxdirpreview.php
View file
Expand Up @@ -141,9 +141,10 @@
// 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 '<!-- TYPE='.$type.' -->'."\n";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/ajax/ajaxdirtree.php
View file
Expand Up @@ -152,7 +152,7 @@
print '</td>';

// 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
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
Expand Down
2 changes: 1 addition & 1 deletion htdocs/ecm/index.php
View file
Expand Up @@ -784,7 +784,7 @@ function(file) {
print '</td>';

// 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
//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
Expand Down
9 changes: 6 additions & 3 deletions htdocs/projet/fiche.php
View file
Expand Up @@ -339,6 +339,7 @@
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
}
print '</center>';

print '</form>';

}
Expand Down Expand Up @@ -443,10 +444,12 @@
print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$project->description.'</textarea>';
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 '<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>';
}
else
Expand Down
14 changes: 10 additions & 4 deletions htdocs/societe/soc.php
View file
Expand Up @@ -985,7 +985,8 @@
/*
* Edition
*/
print_fiche_titre($langs->trans("EditCompany"));

//print_fiche_titre($langs->trans("EditCompany"));

if ($socid)
{
Expand All @@ -995,6 +996,12 @@
$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"));
Expand Down Expand Up @@ -1430,6 +1437,8 @@
print '</center>';

print '</form>';

dol_fiche_end();
}
}
else
Expand All @@ -1448,9 +1457,6 @@

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)
{
Expand Down
17 changes: 9 additions & 8 deletions htdocs/theme/eldy/style.css.php
View file
Expand Up @@ -185,7 +185,7 @@
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
background: #FDFDFD;
border: 1px solid #ACBCBB;
border: 1px solid #C0C0C0;
padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px;
}
Expand All @@ -196,14 +196,15 @@
background:#ddd;
}
input:-webkit-autofill { background-color: #FCFEFA !important; background-image:none !important; }

textarea:disabled {
background:#ddd;
}
.button {
font-family: <?php print $fontlist ?>;
background-image: url(<?php echo $img_button ?>);
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;
Expand All @@ -218,7 +219,7 @@
color: #222244;
background-image: url(<?php echo $img_button ?>);
background-position: bottom;
border: 1px solid #ACBCBB;
border: 1px solid #C0C0C0;
}
.button:hover {
background: #dee7ec;
Expand Down Expand Up @@ -1302,7 +1303,7 @@
}

table.border td {
padding: 1px 2px 1px 1px;
padding: 1px 2px 1px 2px;
border: 1px solid #9CACBB;
border-collapse: collapse;
}
Expand Down Expand Up @@ -1866,9 +1867,9 @@
/* 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_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_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_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 #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 #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_past { }
table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; }
Expand Down Expand Up @@ -2217,7 +2218,7 @@
font-family: <?php print $fontlist ?> !important;
background-image: url(<?php echo $img_button ?>) !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;
Expand Down

0 comments on commit f52a07e

Please sign in to comment.