[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5319 - in phpcompta/trunk: . html html/js
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5319 - in phpcompta/trunk: . html html/js |
Date: |
Wed, 5 Jun 2013 18:41:39 +0200 (CEST) |
Author: danydb
Date: 2013-06-05 18:41:38 +0200 (Wed, 05 Jun 2013)
New Revision: 5319
Modified:
phpcompta/trunk/
phpcompta/trunk/html/js/acc_ledger.js
phpcompta/trunk/html/style-color.css
phpcompta/trunk/html/style-epad.css
phpcompta/trunk/html/style-light.css
phpcompta/trunk/html/style.css
Log:
Merged revisions 5317-5318 via svnmerge from
svn+ssh://ns352270.ovh.net/svn/phpcompta/tags/rel660
........
r5317 | danydb | 2013-06-05 18:12:33 +0200 (Wed, 05 Jun 2013) | 1 line
bug #0000851: bug avec % dans d?\195?\169tail op?\195?\169ration
........
r5318 | danydb | 2013-06-05 18:12:55 +0200 (Wed, 05 Jun 2013) | 1 line
Am?\195?\169lioration esth?\195?\169tique
........
Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /phpcompta/tags/rel660:1-5315
+ /phpcompta/tags/rel660:1-5318
Modified: phpcompta/trunk/html/js/acc_ledger.js
===================================================================
--- phpcompta/trunk/html/js/acc_ledger.js 2013-06-05 16:12:55 UTC (rev
5318)
+++ phpcompta/trunk/html/js/acc_ledger.js 2013-06-05 16:41:38 UTC (rev
5319)
@@ -774,13 +774,9 @@
{
layer++;
id = 'det' + layer;
- var popup = {'id':
- id, 'cssclass': 'inner_box'
- , 'html':
- loading(), 'drag':
- true};
- querystring = 'gDossier=' + dossier + '&act=de&jr_id=' + p_value +
'&div=' + id;
- add_div(popup);
+ waiting_box();
+ var querystring = 'gDossier=' + dossier + '&act=de&jr_id=' + p_value +
'&div=' + id;
+
var action = new Ajax.Request(
"ajax_ledger.php",
{
@@ -788,6 +784,10 @@
parameters: querystring,
onFailure: error_box,
onSuccess: function(xml, txt) {
+ var popup = {'id':id, 'cssclass':
'inner_box'
+ , 'html':"",
'drag':true};
+ remove_waiting_box();
+ add_div(popup);
success_box(xml, txt);
g(id).style.top = calcy(100 + (layer *
3));
g(id).style.left = '10%';
@@ -953,11 +953,9 @@
{
try {
var queryString=$(obj).serialize();
- queryString+="&lib="+obj.lib.value;
queryString+="&gDossier="+obj.gDossier.value;
var rapt2="rapt"+obj.whatdiv.value;
queryString+="&rapt="+g(rapt2).value;
- queryString+="&npj="+obj.npj.value;
queryString+='&jr_id='+obj.jr_id.value;
queryString+='&div='+obj.whatdiv.value;
queryString+='&act=save';
Modified: phpcompta/trunk/html/style-color.css
===================================================================
--- phpcompta/trunk/html/style-color.css 2013-06-05 16:12:55 UTC (rev
5318)
+++ phpcompta/trunk/html/style-color.css 2013-06-05 16:41:38 UTC (rev
5319)
@@ -792,11 +792,11 @@
}
input[disabled], textarea[disabled], option[disabled], optgroup[disabled],
select[disabled] {
--moz-user-focus:ignore;
--moz-user-input:disabled;
background-color:lightgrey;
color:black;
cursor:inherit;
+-moz-user-focus:ignore;
+-moz-user-input:disabled;
}
a#anchorbutton, .button, a.button,div.content a.button {
@@ -820,7 +820,7 @@
margin-top:3px;
cursor:pointer;
margin:1 2 1 2;
- border-radius: 4px;
+ border-radius: 4px;
-moz-border-radius:4px;
}
@@ -1147,3 +1147,12 @@
margin-right: 5px;
border:lightgrey 2px groove;
}
+#info_div {
+ display:none;
+ background-color: yellow;
+ color:black;
+ z-index: 15;
+ position: absolute;
+ top:20;
+ left:20;
+}
\ No newline at end of file
Modified: phpcompta/trunk/html/style-epad.css
===================================================================
--- phpcompta/trunk/html/style-epad.css 2013-06-05 16:12:55 UTC (rev 5318)
+++ phpcompta/trunk/html/style-epad.css 2013-06-05 16:41:38 UTC (rev 5319)
@@ -1150,7 +1150,8 @@
#info_div {
display:none;
background-color: yellow;
- color:red;
+ font-size:120%;
+ color:black;
z-index: 15;
position: absolute;
top:0;
Modified: phpcompta/trunk/html/style-light.css
===================================================================
--- phpcompta/trunk/html/style-light.css 2013-06-05 16:12:55 UTC (rev
5318)
+++ phpcompta/trunk/html/style-light.css 2013-06-05 16:41:38 UTC (rev
5319)
@@ -800,11 +800,11 @@
a#anchorbutton, .button, a.button,div.content a.button {
font-size:10px;
- color:lightblue;
+ color:white;
font-weight: bold;
border:1px black outset ;
-background-image: url("image/bg-submit5.png");
+background-image: url("image/bg-submit3.gif");
background-repeat: repeat-x;
background-position: left;
text-decoration:none;
@@ -819,6 +819,8 @@
margin-left:3px;
cursor:pointer;
font-size:1.1em;
+ border-radius: 8px;
+ -moz-border-radius:8px;
}
a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover
{
@@ -828,12 +830,13 @@
margin-bottom:3px;
margin-right:3px;
margin-left:3px;
-
+ border-radius: px;
+ -moz-border-radius:8px;
border:1px #90f979 inset;
}
td.tool {
border: solid 1px gray;
- background-color:lightgrey;
+ border-bottom-width: 3px;
}
div.topmenu {
@@ -1143,8 +1146,8 @@
}
#info_div {
display:none;
- background-color: yellow;
- color:red;
+ background-color: blue;
+ color:white;
z-index: 15;
position: absolute;
top:0;
Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css 2013-06-05 16:12:55 UTC (rev 5318)
+++ phpcompta/trunk/html/style.css 2013-06-05 16:41:38 UTC (rev 5319)
@@ -835,7 +835,7 @@
td.tool {
border: solid 1px gray;
background-color: white;
-
+ border-bottom-width: 2px;
}
div.topmenu {
margin-top:2px;
@@ -1150,9 +1150,9 @@
#info_div {
display:none;
background-color: yellow;
- color:red;
+ color:black;
z-index: 15;
position: absolute;
top:0;
- left:0;
+ left:45%;
}
\ No newline at end of file
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5319 - in phpcompta/trunk: . html html/js,
phpcompta-dev <=