diff --git a/.gitignore b/.gitignore index 9560e8f5f..affc88c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,10 +47,6 @@ local/* .idea/* include/tfpdf/font/unifont/* html/ads.html -<<<<<<< HEAD -/nbproject/private/ -======= doc/code/* nbproject/private/ ->>>>>>> unstable diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index fecde1ce2..384fe5494 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -1500,7 +1500,6 @@ div#jrn_name_div div#jrn_name_div { float: right; - margin-right:2%; display:block; } } @@ -4238,4 +4237,45 @@ span.nb-round { background-color: var(--bg-inner-box); margin-left: 2px; color:navy; -} \ No newline at end of file +} +/* + * Tab : when show the operation to confirm + */ + #document_div_id { + height:185px; + 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%; + } + } diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index 5017ddda2..861733713 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -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 '

'.$button.'

'; } @@ -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 ''; } @@ -3685,10 +3685,8 @@ EOF; $supplemental_doc->setAlertOnSize(true); $supplemental_doc->set_multiple(true); $r=""; - $r.='

'; $r.= _("Ajoutez des documents additionnels"); $r.=$supplemental_doc->input(); - $r.='

'; return $r; } /** @@ -3703,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(); diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php index ab8e09b63..2ba56b493 100644 --- a/include/class/acc_ledger_purchase.class.php +++ b/include/class/acc_ledger_purchase.class.php @@ -2119,7 +2119,7 @@ EOF; public function extra_info() { $r=""; - $r = '
'; + $r = '
'; $r.='

'; // check for upload piece $file=new IFile(); @@ -2140,8 +2140,9 @@ EOF; " from document_modele where md_affect='ACH' order by 2"); $r.=$doc_gen->input().'
'; } + $r.='

'; $r.=$this->input_supplemental_document(); - $r.='
'; + $r.='

'; $obj=new IText(); $r.=_('Numero de bon de commande : ').$obj->input('bon_comm').'
'; $r.=_('Autre information : ').$obj->input('other_info').'
'; diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index 4ea6d6097..c7f997e90 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -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 ''; + echo '

'; + echo '
    '; + echo '
  • '; + echo HtmlInput::submit("record", _("Confirmer"), 'onClick="return verify_ca(\'\');"', p_class: "button"); + echo '
    • '; + echo '
  • '; + echo HtmlInput::submit('correct', _("Corriger"), p_class: "button"); + echo '
    • '; + echo '
'; + echo '
'; + echo ''; echo '
'; if (DEBUGNOALYSS>1) { echo "";} return; @@ -179,6 +187,7 @@ if (isset($_POST['record'])) echo ''._('Date invalide, opération non extournée').''; } } + echo '
'; echo '"; echo '
'; + echo '
'; return; } } @@ -285,10 +295,20 @@ try echo ''; } echo '
'; - echo HtmlInput::button('act', _('Actualiser'), - 'onClick="compute_all_ledger();"'); - echo HtmlInput::submit("view_invoice", _("Enregistrer")); - echo HtmlInput::reset(_('Effacer ')); + echo '
'; + echo ''; + echo '
'; + echo '
'; echo ""; } diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php index e9d853ee9..48f904725 100644 --- a/include/compta_fin.inc.php +++ b/include/compta_fin.inc.php @@ -85,9 +85,16 @@ if ( isset($_POST['save'])) echo '
'; echo HtmlInput::hidden('ac',$_REQUEST['ac']); echo $Ledger->confirm($_POST); - echo HtmlInput::submit('confirm',_('Confirmer')); - echo HtmlInput::submit('correct',_('Corriger')); - + echo '
'; + echo ''; + echo '
'; echo '
'; echo ''; return; @@ -132,7 +139,13 @@ if ( isset($_POST['confirm'])) echo ''; echo ''; + echo '
'; + echo ''; + echo '
'; 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 '
'; + echo ''; + echo '
'; $script="update_name();"; $e_date=$http->request("e_date","string",""); diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php index 8bde2927e..0fd3b5529 100644 --- a/include/compta_ods.inc.php +++ b/include/compta_ods.inc.php @@ -124,6 +124,7 @@ if (!isset($_POST['summary']) && !isset($_POST['save'])) { echo '' . _('Date invalide, opération non extournée') . ''; } } + echo '
'; echo '"; + echo '
'; } catch (Exception $e) { require NOALYSS_INCLUDE . '/operation_ods_new.inc.php'; alert($e->getMessage()); diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 97231536e..ce015f568 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -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 '
'; + echo '
'; echo ''; echo ''; if (DEBUGNOALYSS>1) { echo "";} @@ -320,6 +327,7 @@ if ( isset($_POST['record']) ) echo ''._('Date invalide, opération non extournée').''; } } + echo '
'; echo '"; echo '
'; + echo ''; return; } } @@ -433,14 +442,24 @@ catch (Exception $e) } echo '
'; +echo '
'; +echo ''; +echo '
'; - echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"'); - echo HtmlInput::submit("view_invoice",_("Enregistrer")); - echo HtmlInput::reset(_('Effacer ')); - echo '
'; - echo ""; +echo ''; +echo ""; - /* 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 ''; diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 4ff84fe24..cf0b0f877 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -240,9 +240,9 @@ class HtmlInput return ''; } - static function reset($p_value) + static function reset($p_value,$p_class="smallbutton") { - return ''; + return ''; } static function hidden($p_name, $p_value, $p_id="") diff --git a/include/operation_ods_confirm.inc.php b/include/operation_ods_confirm.inc.php index fff8de6be..869f7aaff 100644 --- a/include/operation_ods_confirm.inc.php +++ b/include/operation_ods_confirm.inc.php @@ -41,8 +41,14 @@ echo '
'; 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 '
'; +echo '
'; ?>
diff --git a/include/operation_ods_new.inc.php b/include/operation_ods_new.inc.php index 4e45dc970..6d91ba409 100644 --- a/include/operation_ods_new.inc.php +++ b/include/operation_ods_new.inc.php @@ -128,9 +128,24 @@ printf (_("Opération rapprochée : %s"),$iconcerned->input()); echo '

'; echo Html_Input_Noalyss::ledger_add_item("M"); -echo HtmlInput::submit('summary', _('Sauvez')); + echo '

'; +echo '
'; +echo ''; +echo '
'; + + echo ''; echo ""; diff --git a/include/template/acc_ledger-input_extra_info.php b/include/template/acc_ledger-input_extra_info.php index 446829dab..e0bfc9cd2 100644 --- a/include/template/acc_ledger-input_extra_info.php +++ b/include/template/acc_ledger-input_extra_info.php @@ -100,7 +100,8 @@ if ( in_array("document",$a_show)) { throw new Exception("ACC_LEDGER_INPUT100 : document and invoice available in same time"); } ?> -