Cosmetic : Button to confirm, duplicate, ... more visible and coherent
This commit is contained in:
parent
aad1ace2a8
commit
f7d068e269
9 changed files with 149 additions and 30 deletions
|
|
@ -1500,7 +1500,6 @@ div#jrn_name_div
|
|||
div#jrn_name_div
|
||||
{
|
||||
float: right;
|
||||
margin-right:2%;
|
||||
display:block;
|
||||
}
|
||||
}
|
||||
|
|
@ -4247,3 +4246,36 @@ span.nb-round {
|
|||
height:10rem;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Button to confirm operation
|
||||
*/
|
||||
|
||||
.bt-center {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
|
||||
.bt-center .aligned-block {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.bt-center .aligned-block .button {
|
||||
font-size:115%;
|
||||
margin-left: 10px;
|
||||
}
|
||||
@media (min-width: 576px) {
|
||||
.bt-center .aligned-block {
|
||||
margin-left: min(40%,70rem);
|
||||
font-size:120%;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* LarGe */
|
||||
@media (min-width: 992px) {
|
||||
.bt-center .aligned-block {
|
||||
font-size:120%;
|
||||
margin-left: min(40%,70rem);
|
||||
font-size:120%;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3377,7 +3377,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
$url=http_build_query(array('ac'=>$_REQUEST['ac'], 'gDossier'=>$_REQUEST['gDossier'],
|
||||
'p_jrn'=>$_REQUEST['p_jrn']));
|
||||
$button=HtmlInput::button_anchor(_("Nouvelle opération"),
|
||||
'do.php?'.$url, "", "", "smallbutton");
|
||||
'do.php?'.$url, "", "", "button");
|
||||
return '<p>'.$button.'</p>';
|
||||
}
|
||||
|
||||
|
|
@ -3415,7 +3415,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
"ck".$i
|
||||
));
|
||||
}
|
||||
echo HtmlInput::submit("copy_operation", _("Opération identique"));
|
||||
echo HtmlInput::submit("copy_operation", _("Opération identique"),p_class:"button");
|
||||
|
||||
echo '</FORM>';
|
||||
}
|
||||
|
|
@ -3701,6 +3701,7 @@ EOF;
|
|||
return;
|
||||
}
|
||||
$nb=count($_FILES['document_supplemental']["name"]);
|
||||
$a=0;
|
||||
if ( $this->db->status() !== PGSQL_TRANSACTION_INTRANS ) {
|
||||
$a=1;
|
||||
$this->db->start();
|
||||
|
|
|
|||
|
|
@ -74,9 +74,17 @@ if (isset($_POST['view_invoice']))
|
|||
echo $Ledger->confirm($_POST);
|
||||
echo HtmlInput::hidden('ac', $ac);
|
||||
$Ledger->input_extra_info();
|
||||
echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"');
|
||||
echo HtmlInput::submit('correct', _("Corriger"));
|
||||
echo '</form>';
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("record", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
echo '</form>';
|
||||
echo '</div>';
|
||||
if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
|
||||
return;
|
||||
|
|
@ -179,6 +187,7 @@ if (isset($_POST['record']))
|
|||
echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>';
|
||||
}
|
||||
}
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo "<li>";
|
||||
echo $Ledger->button_new_operation();
|
||||
|
|
@ -188,6 +197,7 @@ if (isset($_POST['record']))
|
|||
echo "</li>";
|
||||
echo "</ul>";
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -285,10 +295,20 @@ try
|
|||
echo '</script>';
|
||||
}
|
||||
echo '<div class="content">';
|
||||
echo HtmlInput::button('act', _('Actualiser'),
|
||||
'onClick="compute_all_ledger();"');
|
||||
echo HtmlInput::submit("view_invoice", _("Enregistrer"));
|
||||
echo HtmlInput::reset(_('Effacer '));
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("view_invoice", _("Enregistrer"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::reset(_('Effacer '), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
echo "</FORM>";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,9 +85,16 @@ if ( isset($_POST['save']))
|
|||
echo '<form name="form_detail" class="print" enctype="multipart/form-data" class="print" METHOD="POST">';
|
||||
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
|
||||
echo $Ledger->confirm($_POST);
|
||||
echo HtmlInput::submit('confirm',_('Confirmer'));
|
||||
echo HtmlInput::submit('correct',_('Corriger'));
|
||||
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("confirm", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
echo '</form>';
|
||||
echo '</div>';
|
||||
return;
|
||||
|
|
@ -132,7 +139,13 @@ if ( isset($_POST['confirm']))
|
|||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo $Ledger->button_new_operation();
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -159,8 +172,19 @@ try
|
|||
echo $Ledger->input($array);
|
||||
|
||||
echo Html_Input_Noalyss::ledger_add_item("F");
|
||||
echo HtmlInput::submit('save',_('Sauve'));
|
||||
echo HtmlInput::reset(_('Effacer'));
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
/* echo '<li>';
|
||||
echo HtmlInput::button('act', _('Actualiser'), 'onClick="checkTotalDirect()();"', p_class: "button");
|
||||
echo '</li>';*/
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("save", _("Enregistrer"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::reset(_('Effacer '), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
|
||||
$script="update_name();";
|
||||
$e_date=$http->request("e_date","string","");
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) {
|
|||
echo '<span class="warning">' . _('Date invalide, opération non extournée') . '</span>';
|
||||
}
|
||||
}
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo "<li>";
|
||||
echo $ledger->button_new_operation();
|
||||
|
|
@ -132,6 +133,7 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) {
|
|||
echo $ledger->button_copy_operation();
|
||||
echo "</li>";
|
||||
echo "</ul>";
|
||||
echo '</div>';
|
||||
} catch (Exception $e) {
|
||||
require NOALYSS_INCLUDE . '/operation_ods_new.inc.php';
|
||||
alert($e->getMessage());
|
||||
|
|
|
|||
|
|
@ -108,8 +108,15 @@ if ( isset ($_POST['view_invoice'] ) )
|
|||
|
||||
echo HtmlInput::hidden('ac',$strac);
|
||||
$Ledger->input_extra_info();
|
||||
echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"');
|
||||
echo HtmlInput::submit('correct', _("Corriger"));
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("record", _("Confirmer"), 'onClick="return verify_ca(\'\');"',p_class:"button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit('correct', _("Corriger"),p_class:"button");
|
||||
echo '</li>';
|
||||
echo '</div>';
|
||||
echo '</form>';
|
||||
echo '</div>';
|
||||
if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
|
||||
|
|
@ -320,6 +327,7 @@ if ( isset($_POST['record']) )
|
|||
echo '<span class="warning">'._('Date invalide, opération non extournée').'</span>';
|
||||
}
|
||||
}
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo "<li>";
|
||||
echo $Ledger->button_new_operation();
|
||||
|
|
@ -329,6 +337,7 @@ if ( isset($_POST['record']) )
|
|||
echo "</li>";
|
||||
echo "</ul>";
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -433,14 +442,24 @@ catch (Exception $e)
|
|||
}
|
||||
echo '<div class="content">';
|
||||
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("view_invoice", _("Enregistrer"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::reset(_('Effacer '), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
|
||||
echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"');
|
||||
echo HtmlInput::submit("view_invoice",_("Enregistrer"));
|
||||
echo HtmlInput::reset(_('Effacer '));
|
||||
echo '</div>';
|
||||
echo "</FORM>";
|
||||
echo '</div>';
|
||||
echo "</FORM>";
|
||||
|
||||
/* if we suggest the pj n# the run the script */
|
||||
/* if we suggest the pj n# the run the script */
|
||||
if ( $g_parameter->MY_PJ_SUGGEST=='Y')
|
||||
{
|
||||
echo '<script> update_receipt()</script>';
|
||||
|
|
|
|||
|
|
@ -240,9 +240,9 @@ class HtmlInput
|
|||
return '<INPUT TYPE="button" class="'.$p_class.'" NAME="'.$p_name.'" ID="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>';
|
||||
}
|
||||
|
||||
static function reset($p_value)
|
||||
static function reset($p_value,$p_class="smallbutton")
|
||||
{
|
||||
return '<INPUT TYPE="RESET" class="smallbutton" VALUE="'.$p_value.'">';
|
||||
return '<INPUT TYPE="RESET" class="'.$p_class.'" VALUE="'.$p_value.'">';
|
||||
}
|
||||
|
||||
static function hidden($p_name, $p_value, $p_id="")
|
||||
|
|
|
|||
|
|
@ -41,8 +41,14 @@ echo '<FORM METHOD="POST" enctype="multipart/form-data" class="print">';
|
|||
echo HtmlInput::request_to_hidden(array('ac','p_currency_code','p_currency_rate'));
|
||||
echo $ledger->confirm($_POST,false);
|
||||
echo $ledger->input_extra_info();
|
||||
echo HtmlInput::submit("save",_("Confirmer"));
|
||||
echo HtmlInput::submit("correct",_("Corriger"));
|
||||
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("save", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit('correct', _("Corriger"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</div>';
|
||||
?>
|
||||
</FORM>
|
||||
|
|
|
|||
|
|
@ -128,9 +128,24 @@ printf (_("Opération rapprochée : %s"),$iconcerned->input());
|
|||
|
||||
echo '<p>';
|
||||
echo Html_Input_Noalyss::ledger_add_item("M");
|
||||
echo HtmlInput::submit('summary', _('Sauvez'));
|
||||
|
||||
echo '</p>';
|
||||
|
||||
echo '<div class="bt-center">';
|
||||
echo '<ul class="aligned-block">';
|
||||
echo '<li>';
|
||||
echo HtmlInput::button('act', _('Actualiser'), 'onClick="checkTotalDirect()();"', p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::submit("summary", _("Enregistrer"), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '<li>';
|
||||
echo HtmlInput::reset(_('Effacer '), p_class: "button");
|
||||
echo '</li>';
|
||||
echo '</ul>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</form>';
|
||||
|
||||
echo "<script>checkTotalDirect();</script>";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue