diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index 7f4a49dc3..94ebfefd3 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -155,7 +155,7 @@ if ($op == 'widget') {
$path = array(
// search accounting , detail ...
- "account"=>"ajax_poste",
+ "account"=>"ajax_account",
// display card detail :possible to update or add
"card"=>"ajax_card",
"ledger"=>"ajax_ledger",
diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css
index bc315848e..64c6e00fa 100644
--- a/html/css/style-classic7.css
+++ b/html/css/style-classic7.css
@@ -3327,25 +3327,25 @@ li.li-active {
width: 1.5rem;
height: 1.5rem;
display: inline-block;
- animation: turn-color 3.5s linear 0s infinite forwards;
+ animation: turn-color 6s linear 0s infinite forwards;
position: relative;
left: 0px;
top: 10px;
background: rgb(176, 173, 230);
box-shadow: #a7a7b3 1px 1px 40px;
- border-radius: 5px;
+ /* border-radius: 5px;*/
}
.loading_msg:nth-child(2) {
background:blue;
- animation: turn-color2 3.5s linear 0s infinite forwards;
+ animation: turn-color2 6s linear 0s infinite forwards;
}
.loading_msg:nth-child(3) {
background:red;
- animation: turn-color3 3.5s linear 0s infinite forwards;
+ animation: turn-color3 6s linear 0s infinite forwards;
}
.loading_msg:nth-child(4) {
background:navy;
- animation: turn-color2 3.5s linear 0s infinite forwards;
+ animation: turn-color2 6s linear 0s infinite forwards;
}
@keyframes turn-color{
@@ -3590,3 +3590,12 @@ div.widget-full_size {
max-height: 100%;
margin: 2px;
}
+
+
+ @keyframes fill_up_loading {
+
+ 30% {transform:rotateY(90deg);}
+ 60% {transform:rotateY(-90deg);}
+
+
+ }
\ No newline at end of file
diff --git a/html/js/noalyss_script.js b/html/js/noalyss_script.js
index 0a4b403a6..b803337a1 100644
--- a/html/js/noalyss_script.js
+++ b/html/js/noalyss_script.js
@@ -473,13 +473,23 @@ function success_misc(req) {
}
function loading() {
- var str = '
';
- str += '';
- str += '';
- str += '';
- str += '';
- return str;
+ var str ='';
+ str += '
';
+ str += '
';
+ str += '
';
+ str += '
';
+ str += '
';
+ str +='
';
+
+ var str2 = '';
+ str2 += '
';
+ str2 += '
';
+ str2 += '
';
+ str2 += '
';
+ str2 += '
';
+ str2 +='
';
+ return str+str2;
}
function ajax_misc_failure() {
@@ -3075,7 +3085,29 @@ function init_scroll() {
}
}
-
+function loading_page() {
+ var id_page = new Element('div', {
+ "class": "",
+ "style": "padding: 5px;\n" +
+ " width: 300px;\n" +
+ " height: 60px;\n" +
+ " display: block;\n" +
+ " position: fixed;\n" +
+ " bottom: 50px;\n" +
+ " left: 50px;\n" +
+ " text-align: center;\n" +
+ " animation-name: fill_up_loading;\n" +
+ " animation-duration: 8s;\n" +
+ " animation-iteration-count: infinite;"+
+ "opacity: 0.7;"+
+ "border-radius: 5px;"+
+ "font-size: 300%;"+
+ "animation-timing-function: linear;",
+ id: "loading_page_div"
+ });
+ id_page.update('');
+ document.body.appendChild(id_page);
+}
/**
* Confirm a form thanks a modal dialog Box, it returns true if we agree otherwise
* false
@@ -4635,4 +4667,11 @@ Widget.prototype.toggle_full_size=function (widget_domid) {
$(widget_domid).style.zIndex=layer;
}
-}
\ No newline at end of file
+};
+
+/**
+ * EXPERIMENTAL
+(function(){window.addEventListener("beforeunload", (event) => {waiting_box()});})();
+
+(function(){window.addEventListener("onload", (event) => {remove_waiting_box()});})();
+*/
\ No newline at end of file
diff --git a/include/ajax/ajax_poste.php b/include/ajax/ajax_account.php
similarity index 100%
rename from include/ajax/ajax_poste.php
rename to include/ajax/ajax_account.php
diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php
index 09c660669..128311e78 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -420,6 +420,7 @@ class Follow_Up
$iag_ref=new IText("ag_ref");
$iag_ref->value=$this->ag_ref;
$iag_ref->readOnly=false;
+ $iag_ref->css_size="100%";
$str_ag_ref=$iag_ref->input();
// Preparing the return string
$r="";
diff --git a/include/export/export_fiche_balance_pdf.php b/include/export/export_fiche_balance_pdf.php
index 8db11a6a3..393d92fd7 100644
--- a/include/export/export_fiche_balance_pdf.php
+++ b/include/export/export_fiche_balance_pdf.php
@@ -57,7 +57,7 @@ if ($histo == 4 || $histo==5)
$fd=new Fiche_Def($cn,$http->request('cat'));
if ($allcard==1 && $fd->hasAttribute(ATTR_DEF_ACCOUNT) == false )
{
- $pdf->write_cell(0,10, "Cette catégorie n'ayant pas de poste comptable n'a pas de balance");
+ $pdf->write_cell(0,10, _("Cette catégorie n'a pas de poste comptable"));
//Save PDF to file
$fDate=date('dmy-Hi');
$pdf->Output("category-$fDate.pdf", 'D');
@@ -86,7 +86,7 @@ if ($histo == 4 || $histo==5)
$name=$cn->get_value('select fd_label from fiche_def where fd_id=$1',array($afiche[$e]['fd_id']));
$pdf->SetFont('DejaVu','BI',14);
$pdf->write_cell(0,8,$name,0,1,'C');
-
+ $pdf->line_new();
$pdf->SetFont('DejaVuCond','',7);
$pdf->LongLine(30,7,'Quick Code',0,'L',0);
$pdf->LongLine(80,7,'Libellé',0,'L',0);
diff --git a/include/lib/iposte.class.php b/include/lib/iposte.class.php
index fb768e26d..74ea4b054 100644
--- a/include/lib/iposte.class.php
+++ b/include/lib/iposte.class.php
@@ -48,7 +48,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php';
- echo js_include('controls.js');
- echo js_include('dragdrop.js');
- echo js_include('accounting_item.js');
- *\see ajax_poste.php
+ *\see ajax_accountajax_account.php
*\code
// must be done BEFORE any FORM
echo js_include('prototype.js');
diff --git a/include/template/account_result.php b/include/template/account_result.php
index 1acb6fc64..1a109d73b 100644
--- a/include/template/account_result.php
+++ b/include/template/account_result.php
@@ -3,7 +3,6 @@
//see licence.txt
?>