This commit is contained in:
Laurent Destailleur 2020-03-31 17:45:45 +02:00
parent 766f480741
commit b407797ca3
7 changed files with 11 additions and 11 deletions

View File

@ -113,7 +113,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' )
$coldisplay++; $coldisplay++;
if (($line->info_bits & 2) == 2 || ! empty($disableedit)) { if (($line->info_bits & 2) == 2 || ! empty($disableedit)) {
} else { } else {
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id.'">'.img_edit().'</a>'; print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id.'">'.img_edit().'</a>';
} }
print '</td>'; print '</td>';
@ -121,7 +121,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' )
$coldisplay++; $coldisplay++;
if (($line->fk_prev_id == null) && empty($disableremove)) { if (($line->fk_prev_id == null) && empty($disableremove)) {
//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">'; print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';
} }

View File

@ -191,7 +191,7 @@ print "</tr>\n";
</table> </table>
<br> <br>
<div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value="<?php echo dol_escape_htmltag($langs->trans("Connection")); ?>" /></span></div> <div align="center"><span class="bouton_login"><input class="button" type="submit" value="<?php echo dol_escape_htmltag($langs->trans("Connection")); ?>" /></span></div>
</form> </form>
</fieldset> </fieldset>

View File

@ -311,7 +311,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
$coldisplay++; $coldisplay++;
if (($line->info_bits & 2) == 2 || !empty($disableedit)) { if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
} else { ?> } else { ?>
<a href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>"> <a class="editfielda reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
<?php print img_edit().'</a>'; <?php print img_edit().'</a>';
} }
print '</td>'; print '</td>';
@ -319,7 +319,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
print '<td class="linecoldelete center">'; print '<td class="linecoldelete center">';
$coldisplay++; $coldisplay++;
if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id.'">'; print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id.'">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';
} }

View File

@ -2436,7 +2436,7 @@ elseif ($id || $ref)
{ {
// edit-delete buttons // edit-delete buttons
print '<td class="linecoledit center">'; print '<td class="linecoledit center">';
print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>'; print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
print '</td>'; print '</td>';
print '<td class="linecoldelete" width="10">'; print '<td class="linecoldelete" width="10">';
print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>'; print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';

View File

@ -1962,14 +1962,14 @@ elseif ($id || $ref)
print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>'; print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>'; print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
} }
elseif ($object->statut == 0) elseif ($object->statut == Reception::STATUS_DRAFT)
{ {
// edit-delete buttons // edit-delete buttons
print '<td class="linecoledit center">'; print '<td class="linecoledit center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>'; print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
print '</td>'; print '</td>';
print '<td class="linecoldelete" width="10">'; print '<td class="linecoldelete" width="10">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>'; print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
print '</td>'; print '</td>';
// Display lines extrafields // Display lines extrafields

View File

@ -405,7 +405,7 @@ div#moretabsList, div#moretabsListaction {
hr { border: 0; border-top: 1px solid #ccc; } hr { border: 0; border-top: 1px solid #ccc; }
.tabBar hr { margin-top: 20px; margin-bottom: 17px; } .tabBar hr { margin-top: 20px; margin-bottom: 17px; }
.button, .buttonDelete, input[name="sbmtConnexion"] { .button:not(.bordertransp), .buttonDelete:not(.bordertransp) {
margin-bottom: 0; margin-bottom: 0;
margin-top: 0; margin-top: 0;
margin-left: 5px; margin-left: 5px;

View File

@ -530,7 +530,7 @@ div#moretabsList, div#moretabsListaction {
hr { border: 0; border-top: 1px solid #ccc; } hr { border: 0; border-top: 1px solid #ccc; }
.button, .buttonDelete, input[name="sbmtConnexion"] { .button:not(.bordertransp), .buttonDelete:not(.bordertransp) {
border-color: #c5c5c5; border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
display: inline-block; display: inline-block;