[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5366 - in phpcompta/trunk: html html/image include incl
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5366 - in phpcompta/trunk: html html/image include include/template |
|
Date: |
Fri, 30 Aug 2013 15:57:40 +0200 (CEST) |
Author: danydb
Date: 2013-08-30 15:57:39 +0200 (Fri, 30 Aug 2013)
New Revision: 5366
Modified:
phpcompta/trunk/html/ajax_card.php
phpcompta/trunk/html/ajax_history.php
phpcompta/trunk/html/ajax_poste.php
phpcompta/trunk/html/image/search.png
phpcompta/trunk/html/style.css
phpcompta/trunk/include/class_acc_ledger.php
phpcompta/trunk/include/class_anc_table.php
phpcompta/trunk/include/class_fiche.php
phpcompta/trunk/include/class_html_input.php
phpcompta/trunk/include/class_ibutton.php
phpcompta/trunk/include/class_icard.php
phpcompta/trunk/include/class_iposte.php
phpcompta/trunk/include/class_itextarea.php
phpcompta/trunk/include/class_itva_popup.php
phpcompta/trunk/include/class_pre_operation.php
phpcompta/trunk/include/class_user.php
phpcompta/trunk/include/fiche.inc.php
phpcompta/trunk/include/operation_ods_new.inc.php
phpcompta/trunk/include/template/anc_balance_group.php
phpcompta/trunk/include/template/dashboard.php
phpcompta/trunk/include/template/detail-action.php
phpcompta/trunk/include/verif_bilan.inc.php
Log:
am?\195?\169liore apparence
Modified: phpcompta/trunk/html/ajax_card.php
===================================================================
--- phpcompta/trunk/html/ajax_card.php 2013-08-28 21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/html/ajax_card.php 2013-08-30 13:57:39 UTC (rev 5366)
@@ -332,7 +332,7 @@
$r.='<span style="margin-left:50px">';
$r.=_('Fiche contenant').HtmlInput::infobulle(19);
$r.=$q->input();
- $r.=HtmlInput::submit('fs',_('Recherche'));
+ $r.=HtmlInput::submit('fs',_('Recherche'),"","smallbutton");
$r.='</span>';
$r.=dossier::hidden().HtmlInput::hidden('op','fs');
$array=array();
Modified: phpcompta/trunk/html/ajax_history.php
===================================================================
--- phpcompta/trunk/html/ajax_history.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/html/ajax_history.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -107,7 +107,7 @@
require_once('template/history_top.php');
$detail_card=HtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUICKCODE),$fiche->getName());
echo h2info(
$fiche->getName().'['.$fiche->strAttribut(ATTR_DEF_QUICKCODE).']');
- echo '<p style="text-align:center;font-size:125%">'.$detail_card.'</p>';
+ echo '<p style="text-align:center;">'.$detail_card.'</p>';
if ( $fiche->HtmlTable($array,0,$from_div)==-1){
echo h2("Aucune opération pour l'exercice courant",'class="error"');
Modified: phpcompta/trunk/html/ajax_poste.php
===================================================================
--- phpcompta/trunk/html/ajax_poste.php 2013-08-28 21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/html/ajax_poste.php 2013-08-30 13:57:39 UTC (rev 5366)
@@ -80,7 +80,7 @@
$it->size=30;
$it->value=(isset($q))?$q:'';
$str_poste=$it->input();
- $str_submit=HtmlInput::submit('sf',_('Recherche'));
+ $str_submit=HtmlInput::submit('sf',_('Recherche'),"","smallbutton");
$r='';
$r=HtmlInput::anchor_close('search_account');
$r.='<div> '.h2info(_('Poste Comptable')).'</div>';
Modified: phpcompta/trunk/html/image/search.png
===================================================================
(Binary files differ)
Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css 2013-08-28 21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/html/style.css 2013-08-30 13:57:39 UTC (rev 5366)
@@ -2,10 +2,11 @@
BODY {
background-color:#EDF3FF;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
padding: 0px 0px 0px 0px ;
margin:0;
color:blue;
+ font-size:1em;
}
.notice {
color:red;
@@ -21,17 +22,17 @@
}
table.resultfooter tfoot {
- font-size:110%;
+ font-size:0.57em;
font-weight: bold;
}
table.sortable th, table.table_large th,table.result th {
font-weight:bold;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
border-bottom:1px solid blue;
border-top:0;
- font-size:90%;
+ font-size:0.75em;;
color:#25238F;
text-align: left;
@@ -40,8 +41,8 @@
}
h2 {
- font-family:verdana,sans-serif,helvetica;
- font-size:120%;
+ font-family:arial,verdana,sans-serif,helvetica;
+ font-size:1.35em;
color:grey;
margin:1px;
padding:1px;
@@ -50,14 +51,14 @@
div.info {
background:#879ed4;
color:white;
- font-size:120%;
+ font-size:0.87em;
text-align:center;
}
content h2.info {
background:#879ed4;
color:black;
- font-size:120%;
+ font-size:0.87em;
text-align:center;
padding:0px;
margin:0px;
@@ -65,7 +66,7 @@
redcontent h2.info {
background:#879ed4;
color:white;
- font-size:120%;
+ font-size:0.87em;
text-align:center;
padding:0px;
margin:0px;
@@ -73,7 +74,7 @@
h2.info {
background-color:#879ed4;
color:white;
- font-size:120%;
+ font-size:1.34em;
text-align:center;
padding:0px;
margin:0px;
@@ -84,13 +85,13 @@
h3.info {
background:#879ed4;
color:white;
- font-size:120%;
+ font-size:0.87em;
text-align:center;
}
h2.info2 {
color:blue;
- font-size:100%;
+ font-size:1em;;
text-align:center;
}
@@ -99,7 +100,7 @@
h2.error {
background:red;
color:white;
- font-size:120%;
+ font-size:0.87em;
}
@@ -138,12 +139,13 @@
text-decoration:none;
display:inline;
color: blue;
- font-size:75%;
+ font-size:0.75em;
+
}
td.tool a.mtitle:hover {
text-decoration:none;
display:inline;
- font-size:75%;
+ font-size:0.75em;;
color: darkblue;
background-color:#5D90CD;
@@ -169,14 +171,14 @@
div.lmenu {
float:left;
clear:left;
- font-size:90%;
+ font-size:0.75em;;
}
div.lextmenu {
float:left;
- font-family:verdana,sans-serif,helvetica;
- font-size:90%;
+ font-family:arial,verdana,sans-serif,helvetica;
+ font-size:0.75em;;
}
div.searchmenu {
@@ -189,8 +191,8 @@
div.recherche_form{
width:700px;
- font-size:90%;
- font-family:verdana,sans-serif,helvetica;
+ font-size:0.75em;;
+ font-family:arial,verdana,sans-serif,helvetica;
border-style:outset;
border-width:1px;
@@ -200,8 +202,8 @@
float:left;
padding-top:7px;
padding-left:8px;
- font-size:90%;
- font-family:verdana,sans-serif,helvetica;
+ font-size:0.75em;;
+ font-family:arial,verdana,sans-serif,helvetica;
width:75%;
}
@@ -209,7 +211,7 @@
padding-top:0.0030%;
margin-top:0.0030%;
width:100%;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
}
@@ -218,12 +220,12 @@
float:left;
padding-top:7px;
width:35%;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
}
div.no span{
position:static;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
font-weight:bold;
color:red;
@@ -238,7 +240,7 @@
}
table.document th{
font-weight:bold;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
border-bottom:2px solid blue;
border-top:0;
color:#25238F;
@@ -254,7 +256,7 @@
color:white;
background-color:red;
font-weight: bolder;
- font-size:120%;
+ font-size:0.87em;
}
table.mtitle {
@@ -273,20 +275,21 @@
text-align:center;
width:95px;
height :30px;
- font-size:90%;
+ font-size:0.75em;;
background-color:#DDE6FF;
border:1px solid #99B1DF;
+ border-radius:5px;
}
td.msubtitle {
text-align:center;
height:20px;
- font-size:90%;
+ font-size:0.75em;;
background-color:#DDE6FF;
}
span.mtitle {
color:gray;
background-color:blue;
- font-size:90%;
+ font-size:0.75em;;
border-style:groove
}
span.odd {
@@ -300,10 +303,10 @@
tr.odd {
background-color:#DDE6FF;
- font-size:75%;
+ font-size:0.87em;;
}
tr.even {
- font-size:75%;
+ font-size:0.87em;;
}
td.odd{
background-color:#DDE6FF ;
@@ -314,16 +317,19 @@
td.cell{
height:32px;
padding: 1px;
+
}
td.selectedcell{
border-style:inset;
border-color:blue;
border-width:1pt ;
- font-size:90%;
+ font-size:1.2em;
+ font-weight: bold;
background:#5D90CD ;
color:white;
text-align:center;
width:120px;
+ border-radius:5px;
}
a.mtitle {
text-decoration:none;
@@ -332,7 +338,6 @@
}
a.mtitle:hover {
- font-size:110%;
text-decoration:none;
display:inline;
@@ -341,13 +346,13 @@
}
td.selectedcell a.mtitle,div.content td.selectedcell a.mtitle {
- font-size:90%;
+ font-size:0.75em;;
text-decoration:none;
display:block;
color:white;
}
a.dossier {
- font-size:90%;
+ font-size:0.75em;;
text-decoration:none;
display:block;
color: #202267;
@@ -380,11 +385,11 @@
display:block;
color:blue;
background-color:white;
- font-size:90%;
+ font-size:0.75em;;
}
a.cell:hover {
- font-size:90%;
+ font-size:0.75em;;
color:white;
background-color:#5D90CD;
text-decoration:none;
@@ -414,8 +419,8 @@
a.detail
{
- font-size:90%;
- font-family:verdana,sans-serif,helvetica;
+ font-size:0.87em;;
+ font-family:arial,verdana,sans-serif,helvetica;
text-decoration: none;
display: block;
color: blue;
@@ -423,8 +428,8 @@
a.detail:hover
{
- font-size:90%;
- font-family:verdana,sans-serif,helvetica;
+/* font-size:0.75em;; */
+ font-family:arial,verdana,sans-serif,helvetica;
color: white;
background-color: rgb(93, 144, 205);
text-decoration: none;
@@ -436,7 +441,7 @@
padding:1em 1em;
}
div.redcontent a {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
text-decoration: none;
display: block;
color: blue;
@@ -444,7 +449,7 @@
}
div.redcontent a:hover {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
color: white;
background-color: rgb(93, 144, 205);
text-decoration: none;
@@ -452,7 +457,7 @@
}
div.content a {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
text-decoration: none;
display: block;
color: blue;
@@ -462,7 +467,7 @@
div.content a:hover {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
color: white;
background-color: rgb(93, 144, 205);
text-decoration: none;
@@ -488,7 +493,6 @@
}
div.content a.mtitle {
- font-size:90%;
text-decoration:none;
display:inline;
color:blue;
@@ -506,7 +510,7 @@
}
div.redcontent input.text {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
font-weight:normal;
border-color:336699;
border-style:solid;
@@ -515,7 +519,7 @@
color:blue;
}
div.content input.text {
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
font-weight:normal;
border-color:336699;
border-style:solid;
@@ -539,9 +543,9 @@
color: #1a207d;
border-collapse:collapse;
}
-a.document{
- font-size:90%;
- text-decoration:none;
+div.content a.document, a.document{
+/* font-size:0.75em;;*/
+ text-decoration:underline;
display:block;
}
a.document:hover {
@@ -568,11 +572,11 @@
h1.legend, legend {
font-weight: bold;
font-style: italic;
- font-size: 120% ;
+ font-size: 1.2em ;
}
fieldset fieldset legend {
- font-size:120%;
+ font-size:0.87em;
color:grey;
}
select {
@@ -614,7 +618,7 @@
padding-left: 3px;
padding-right:3px;
text-decoration:none;
- font-size:120%;
+ font-size:0.87em;
display:inline;
color:black;
@@ -651,8 +655,8 @@
/*border:dotted 1px black;*/
border: 2px outset #201e87;
background-color:#879ED4;
- font-size: 90% ;
- font-family: verdana,sans-serif,helvetica;
+ font-size:0.75em; ;
+ font-family: arial,verdana,sans-serif,helvetica;
font-style: italic;
font-weight: bolder;
text-align:center;
@@ -674,7 +678,7 @@
/*border:dotted 1px black;*/
border: 3px outset #201e87;
background-color: #879ED4;
- font-family: verdana,sans-serif,helvetica;
+ font-family: arial,verdana,sans-serif,helvetica;
font-style: italic;
font-weight: bolder;
text-align:center;
@@ -695,8 +699,8 @@
height:96%;
overflow: auto;
background-color:#DFE7FF;
- font-size:90% ;
- font-family: verdana,sans-serif,helvetica;
+ font-size:0.75em; ;
+ font-family: arial,verdana,sans-serif,helvetica;
font-style: normal;
font-weight: normal;
color: black;
@@ -713,7 +717,7 @@
margin:0;
padding:0;
text-align:left;
- font-size:90%;
+ font-size:0.75em;;
}
div.autocomplete em {
@@ -738,7 +742,7 @@
/*height:32px;*/
cursor:pointer;
}
-span.informal{ font-size:90%; color:black;}
+span.informal{ font-size:0.75em;; color:black;}
ul.select_table {
/*padding:5px;*/
@@ -820,25 +824,22 @@
a#anchorbutton, .button, a.button,div.content a.button {
color:white;
font-weight: bold;
- font-size:87%;
+ font-size:0.87em;
text-decoration:none;
- font-family: verdana,sans-serif,helvetica;
+ font-family: arial,verdana,sans-serif,helvetica;
background-image: url("image/bg-submit2.gif");
background-repeat: repeat-x;
background-position: left;
border-style: outset ;
border-color: blue ;
- border-width:0;
- padding-bottom: 4;
- padding-top: 4;
- padding-right: 6;
- padding-left: 6;
+ border-width:0px;
+ padding:8px;
margin-top:3px;
cursor:pointer;
margin:1 2 1 2;
- border-radius: 4px;
- moz-border-radius:4px;
+ border-radius: 5px;
+ moz-border-radius:5px;
}
a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover
{
@@ -849,11 +850,44 @@
margin:1 2 1 2;
}
+a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
+ color:white;
+ font-weight: bold;
+ font-size:0.75em;
+ text-decoration:none;
+ font-family: arial,verdana,sans-serif,helvetica;
+ background-image: url("image/bg-submit2.gif");
+ background-repeat: repeat-x;
+ background-position: left;
+
+ border-style: outset ;
+ border-color: blue ;
+ border-width:0;
+ padding-bottom: 3px;
+ padding-top: 3px;
+ padding-right: 3px;
+ padding-left: 3px;
+ margin-top:3px;
+ cursor:pointer;
+ margin:1 2 1 2;
+ border-radius: 2px;
+ moz-border-radius:2px;
+
+}
+a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content
a.smallbutton:hover {
+ cursor:pointer;
+ background-color:white;
+ border-style: inset ;
+ color:red;
+ margin:1 2 1 2;
+
+}
td.tool {
border: solid 1px gray;
background-color: white;
border-bottom-width: 2px;
text-align:center;
+ border-radius:2px;
}
div.topmenu {
@@ -862,7 +896,7 @@
#dossier h2{
color:darkblue;
display:inline;
- font-size:120%;
+ font-size:2em;
margin:0px;
padding:0px;
font-variant:small-caps;
@@ -877,7 +911,6 @@
text-align:left;
z-index:1;
width:17.9687%;
- font-size:95%;
}
div.welcome {
@@ -903,8 +936,7 @@
}
div.inner_box {
background-color:#e4e7ed;
- font-size:90%;
- font-family:verdana,sans-serif,helvetica;
+ font-family:arial,verdana,sans-serif,helvetica;
padding:0;
margin:0;
overflow:hidden;
@@ -966,24 +998,24 @@
}
table.info_op
{
- font-size:90%;
+// font-size:0.75em;;
width:100%;
}
table.info_op tr
{
- font-size:120%;
+ // font-size:0.87em;
background:white;
}
h2#jrn_name
{
color:darkgrey;
- font-size:274%;
+ font-size:2.74em;
margin-right:30%;
float: right;
}
tr.footer{
- font-size:120%;
+ font-size:0.87em;
font-style: italic;
font-weight: bold;
@@ -1009,7 +1041,7 @@
{
display:inline;
float:left;
- font-size:75%;
+ font-size:0.75em;;
}
#calc
{
@@ -1019,8 +1051,8 @@
div#wait_box
{
background-color:#F1E6E6;
- font-size:120%;
- font-family: verdana,helvetica,arial,sans-serif;
+ font-size:0.87em;
+ font-family: arial,verdana,helvetica,arial,sans-serif;
padding:0;
margin:0;
overflow:hidden;
@@ -1054,14 +1086,14 @@
}
a.line,div.content a.line
{
- font-size:110%;
+ font-size:0.87em;
text-decoration:underline;
display:inline;
color: #0000ff;
}
a.line:hover,div_content a.line
{
- font-size:110%;
+ font-size:0.57em;
text-decoration:underline;
display:inline;
color: #0000ff;
@@ -1076,7 +1108,7 @@
margin-left: 2px;
margin-right:2px;
margin-top:0px;
- font-size:85%;
+ font-size:0.75em;
}
#close_div:hover
{
@@ -1090,7 +1122,7 @@
border:1px solid blue;
margin-left: 2px;
margin-right:18px;
- font-size:85%;
+ font-size:0.75em;
}
#popmeout:hover
{
@@ -1109,12 +1141,12 @@
width:300px;
border:1px solid black;
background-color:#aec3e8;
- font-size:120%;
+ font-size:0.87em;
padding: 20px 20px;
}
span.invoice
{
- font-size: 120%;
+ font-size: 1.2em;
font-style: italic;
display:block;
margin: 20px;
@@ -1123,14 +1155,14 @@
a.nav,div.content a.nav,div.redcontent a.nav {
display:inline;
text-decoration:none;
- font-size:90%;
+ font-size:0.75em;;
}
a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover {
display:inline;
text-decoration:none;
background-color:darkblue;
color:white;
- font-size:90%;
+ font-size:0.75em;;
}
#dossier {
display:inline;
@@ -1146,30 +1178,30 @@
h1.title {
color: blue;
- font-size:120%;
+ font-size:0.87em;
font-style: italic;
}
h2.title {
color: blue;
- font-size:120%;
+ font-size:0.87em;
font-weight:bold;
font-style: italic;
margin-left: 15px;
}
h3.title {
color: blue;
- font-size:120%;
+ font-size:0.87em;
margin-left: 30px;
}
h4.title {
color: blue;
- font-size:120%;
+ font-size:0.87em;
margin-left: 45px;
text-decoration: underline;
}
h5.title {
color: blue;
- font-size:120%;
+ font-size:0.87em;
margin-left: 45px;
text-decoration: none;
font-style: italic;
@@ -1180,6 +1212,7 @@
margin-left:5px;
margin-right: 5px;
border:lightgrey 2px groove;
+ border-radius: 4px;
}
#info_div {
display:none;
@@ -1191,14 +1224,30 @@
left:45%;
}
div.menu2 a.mtitle{
- font-size:85%;
+
}
div.menu3 {
}
#go_submit_id {
- font-size:116%;
+ font-size:1.25em;
}
.decale {
margin-left:30px;
+}
+#folder {
+ font-size:1.4em;
+ width:auto;
+ border-width:0px;
+ border-collapse:separate;
+
+
+}
+/*#folder tr.odd,#folder tr.even {
+ font-size : 1.2em;
+}*/
+textarea.itextarea{
+ border:solid blue 1px;
+ width:90%;
+ margin-left:5%;
}
\ No newline at end of file
Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/class_acc_ledger.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -718,7 +718,7 @@
$tmp_jr_comment = h($row['jr_comment']);
$r.=$tmp_jr_comment;
$r.="</TD>";
- $r.=td(h($row['n_text']), ' style="font-size:90%"');
+ $r.=td(h($row['n_text']), ' style="font-size:0.87em"');
// Amount
// If the ledger is financial :
// the credit must be negative and written in red
@@ -914,7 +914,7 @@
$tmp_jr_comment = h($row['jr_comment']);
$r.=$tmp_jr_comment;
$r.="</TD>";
- $r.=td(h($row['n_text']), ' style="font-size:90%"');
+ $r.=td(h($row['n_text']), ' style="font-size:0.87em%"');
// Amount
// If the ledger is financial :
// the credit must be negative and written in red
@@ -3079,7 +3079,7 @@
$op->od_direct = 't';
if ($op->count() != 0)
{
- echo HtmlInput::submit('use_opd',
'Utilisez une opération prédéfinie');
+ echo HtmlInput::submit('use_opd',
'Utilisez une opération prédéfinie',"","smallbutton");
echo $op->show_button();
}
echo '</form>';
Modified: phpcompta/trunk/include/class_anc_table.php
===================================================================
--- phpcompta/trunk/include/class_anc_table.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_anc_table.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -174,7 +174,7 @@
{
echo td(nbm($tot_col[$i]),' class="num"');
}
- echo td(nbm($tot_global),' class="num"
style="font-size:130%;text-weight:bold;border:solid 1px blue"');
+ echo td(nbm($tot_global),' class="num"
style="font-size:1.3em;text-weight:bold;border:solid 1px blue"');
echo '</tr>';
echo '</table>';
}
@@ -228,7 +228,7 @@
{
echo td(nbm($tot_col[$i]),' class="num"');
}
- echo td(nbm($tot_global),' class="num"
style="font-size:130%;text-weight:bold;border:solid 1px blue"');
+ echo td(nbm($tot_global),' class="num"
style="font-size:1.3em;text-weight:bold;border:solid 1px blue"');
echo '</tr>';
echo '</table>';
Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_fiche.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -367,7 +367,8 @@
}
return $return;
}
- /*!\brief make an array of attributes of the category of card
(FICHE_DEF.FD_ID)
+ /**
+ * @brief make an array of attributes of the category of card
(FICHE_DEF.FD_ID)
*The array can be used with the function insert, it will return a struct
like this :
* in the first key (av_textX), X is the ATTR_DEF::AD_ID
\verbatim
Modified: phpcompta/trunk/include/class_html_input.php
===================================================================
--- phpcompta/trunk/include/class_html_input.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/class_html_input.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -175,15 +175,15 @@
$readonly=($this->readonly==false)?"false":"true";
echo "read only".$readonly."<br>";
}
- static function submit ($p_name,$p_value,$p_javascript="")
+ static function submit
($p_name,$p_value,$p_javascript="",$p_class="button")
{
- return '<INPUT TYPE="SUBMIT" class="button" NAME="'.$p_name.'"
ID="'.$p_name.'_submit_id" VALUE="'.$p_value.'" '.$p_javascript.'>';
+ return '<INPUT TYPE="SUBMIT" class="'.$p_class.'" NAME="'.$p_name.'"
ID="'.$p_name.'_submit_id" VALUE="'.$p_value.'" '.$p_javascript.'>';
}
- static function button ($p_name,$p_value,$p_javascript="")
+ static function button
($p_name,$p_value,$p_javascript="",$p_class="button")
{
- return '<INPUT TYPE="button" class="button" NAME="'.$p_name.'"
ID="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>';
+ return '<INPUT TYPE="button" class="'.$p_class.'" NAME="'.$p_name.'"
ID="'.$p_name.'" VALUE="'.$p_value.'" '.$p_javascript.'>';
}
static function reset ($p_value)
@@ -718,7 +718,7 @@
$r= "
<span>
<input id=\"lk_".$p_table_id."\" class=\"input_text\"
name=\"filter\" onkeyup=\"filter_table(this, '$p_table_id','$p_col',$start_row
)\" type=\"text\">
- <input type=\"button\" class=\"button\"
onclick=\"$('lk_".$p_table_id."').value='';filter_table($('lk_".$p_table_id."'),
'$p_table_id','$p_col',$start_row );\" value=\"X\">
+ <input type=\"button\" class=\"smallbutton\"
onclick=\"$('lk_".$p_table_id."').value='';filter_table($('lk_".$p_table_id."'),
'$p_table_id','$p_col',$start_row );\" value=\"X\">
</span>
";
return $r;
Modified: phpcompta/trunk/include/class_ibutton.php
===================================================================
--- phpcompta/trunk/include/class_ibutton.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_ibutton.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -39,6 +39,7 @@
$tab=(isset($this->tabindex))?'
tabindex="'.$this->tabindex.'"':"";
$r='<input type="BUTTON" name="'.$this->name.'"'.
' class="button" '.
+ $this->extra.
$tab.
' id="'.$this->id.'"'.
' value="'.$this->label.'"'.
@@ -87,3 +88,29 @@
{
}
}
+class ISmallButton extends IButton
+{
+ var $label;
+ /*!\brief show the html input of the widget*/
+ public function input($p_name=null,$p_value=null,$p_style=null)
+ {
+ $this->name=($p_name==null)?$this->name:$p_name;
+ $this->value=($p_value==null)?$this->value:$p_value;
+ $this->label=(trim($this->label) !=
'')?$this->label:$this->value;
+ if ( $this->readOnly==true) return $this->display();
+ $extra= ( isset($this->extra))?$this->extra:"";
+ $this->id=($this->id=="")?$this->name:$this->id;
+ $tab=(isset($this->tabindex))?'
tabindex="'.$this->tabindex.'"':"";
+ $r='<input type="BUTTON" name="'.$this->name.'"'.
+ ' class="smallbutton" '.
+ $this->extra.
+ $tab.
+ ' id="'.$this->id.'"'.
+ ' value="'.$this->label.'"'.
+ ' onClick="'.$this->javascript.'"'.$extra.'>';
+ $attr=$this->get_js_attr();
+ $r.=$attr;
+ return $r;
+
+ }
+}
\ No newline at end of file
Modified: phpcompta/trunk/include/class_icard.php
===================================================================
--- phpcompta/trunk/include/class_icard.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_icard.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -287,7 +287,8 @@
{
if ( $this->readOnly==true) return '';
if ( ! isset($this->id )) $this->id=$this->name;
- $button=new IButton($this->name.'_bt');
+ $button=new ISmallButton($this->name.'_bt');
+ $button->label=_('Recherche');
$a="";
foreach (array('typecard','jrn','label','price','tvaid') as $att)
{
Modified: phpcompta/trunk/include/class_iposte.php
===================================================================
--- phpcompta/trunk/include/class_iposte.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_iposte.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -92,7 +92,8 @@
$this->javascript="";
$this->extra2="all";
$this->attribute=array();
- $this->id=$p_id;
+ $this->id=$p_id;
+
}
@@ -129,7 +130,9 @@
public function dsp_button()
{
$this->id=($this->id=="")?$this->name:$this->id;
- $ib=new IButton($this->id.'_bt');
+ $ib=new ISmallButton($this->id.'_bt');
+ $ib->label=_('Recherche');
+ // $ib->extra='style="background:url(image/search.png)
no-repeat;background-position:0;padding-left:36px;"';
$ib->javascript='search_poste(this)';
/* add the property */
Modified: phpcompta/trunk/include/class_itextarea.php
===================================================================
--- phpcompta/trunk/include/class_itextarea.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_itextarea.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -31,15 +31,15 @@
{
$this->name=($p_name==null)?$this->name:$p_name;
$this->value=($p_value==null)?$this->value:$p_value;
- if ( !isset ($this->style )) $this->style=' style="border:solid blue
1px" ';
+ if ( !isset ($this->style )) $this->style=' class="itextarea" ';
$this->id=($this->id=="")?$this->name:$this->id;
if ( $this->readOnly==true) return $this->display();
$r="";
$r.='<TEXTAREA '.$this->style.' name="'.$this->name.'"
id="'.$this->id.'"';
- $r.=" rows=\"$this->heigh\" ";
- $r.=" cols=\"$this->width\" ";
+ /*$r.=" rows=\"$this->heigh\" ";
+ $r.=" cols=\"$this->width\" "; */
$r.='>';
$r.=$this->value;
Modified: phpcompta/trunk/include/class_itva_popup.php
===================================================================
--- phpcompta/trunk/include/class_itva_popup.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/class_itva_popup.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -127,7 +127,7 @@
$this->id=($this->id=="")?$this->name:$this->id;
// button
- $bt=new IButton('bt_'.$this->id);
+ $bt=new ISmallButton('bt_'.$this->id);
$bt->tabindex="-1";
$bt->label=_(' TVA ');
$bt->set_attribute('gDossier',dossier::id());
Modified: phpcompta/trunk/include/class_pre_operation.php
===================================================================
--- phpcompta/trunk/include/class_pre_operation.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/class_pre_operation.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -227,7 +227,7 @@
$hid=new IHidden();
$r=$hid->input("action","use_opd");
$r.=$hid->input("jrn_type",$this->get("ledger_type"));
- $r.= HtmlInput::submit('use_opd','Utilisez une opération
prédéfinie');
+ $r.= HtmlInput::submit('use_opd','Utilisez une opération
prédéfinie','','smallbutton');
$r.= $this->show_button();
return $r;
Modified: phpcompta/trunk/include/class_user.php
===================================================================
--- phpcompta/trunk/include/class_user.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/class_user.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -935,7 +935,7 @@
if ($p_array == 0)
return $result . " * Aucun dossier *";
- $result.="<TABLE id=\"folder\"
style=\"font-size:154%;width:auto;border-width:0px;border-collapse:collapse;\">";
+ $result.="<TABLE id=\"folder\" >";
for ($i = 0; $i < sizeof($p_array); $i++)
{
Modified: phpcompta/trunk/include/fiche.inc.php
===================================================================
--- phpcompta/trunk/include/fiche.inc.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/fiche.inc.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -85,7 +85,7 @@
$search_card=new IText('card_search');
$search_card_js=sprintf('onclick="boxsearch_card(\'%d\')"',dossier::id());
?>
-<div style="position:absolute;right:230px;top:110px">
+<div style="position:absolute;right:15.625%;top:35%">
<?php echo _('Recherche de fiche')?> <?php echo
HtmlInput::infobulle(18)?> :<?php echo $search_card->input()?>
<?php echo
HtmlInput::button_anchor("Chercher","javascript:void(0)","",$search_card_js)?>
Modified: phpcompta/trunk/include/operation_ods_new.inc.php
===================================================================
--- phpcompta/trunk/include/operation_ods_new.inc.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/operation_ods_new.inc.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -88,9 +88,7 @@
echo $ledger->input($p_post);
-echo HtmlInput::button('add', _('Ajout d\'une ligne'),
'onClick="quick_writing_add_row()"');
-echo HtmlInput::submit('summary', _('Sauvez'));
echo '<div style="position:absolute;width:40%;right:20px">';
echo '<table class="info_op">'.
@@ -103,6 +101,12 @@
$iconcerned=new IConcerned('jrn_concerned');
$iconcerned->amount_id="totalDeb";
echo "Opération rapprochée : ".$iconcerned->input();
+
+echo '<p>';
+echo HtmlInput::button('add', _('Ajout d\'une ligne'),
'onClick="quick_writing_add_row()"');
+echo HtmlInput::submit('summary', _('Sauvez'));
+echo '</p>';
+
echo '</form>';
echo "<script>checkTotalDirect();</script>";
Modified: phpcompta/trunk/include/template/anc_balance_group.php
===================================================================
--- phpcompta/trunk/include/template/anc_balance_group.php 2013-08-28
21:25:58 UTC (rev 5365)
+++ phpcompta/trunk/include/template/anc_balance_group.php 2013-08-30
13:57:39 UTC (rev 5366)
@@ -14,7 +14,7 @@
if ( $i==0) {
$prev=$array[$i]['ga_id'];
echo '<tr>';
- echo td($array[$i]['ga_id'],' colspan="5"
style="width:auto;font-size:120%"');
+ echo td($array[$i]['ga_id'],' colspan="5"
style="width:auto;font-size:1.2em"');
echo '</tr>';
?>
<tr>
@@ -39,7 +39,7 @@
$tot_group_deb=0;$tot_group_cred=0;
$prev=$array[$i]['ga_id'];
echo '<tr>';
- echo td($array[$i]['ga_id'],' colspan="5"
style="width:auto;font-size:120%"');
+ echo td($array[$i]['ga_id'],' colspan="5"
style="width:auto;font-size:1.2em"');
echo '</tr>';
?>
<tr>
Modified: phpcompta/trunk/include/template/dashboard.php
===================================================================
--- phpcompta/trunk/include/template/dashboard.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/template/dashboard.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -48,7 +48,7 @@
'</a>'.
'</td>'.
'<td>'.
-
HtmlInput::button('del','X','onClick="todo_list_remove('.$row['tl_id'].')"').
+
HtmlInput::smallbutton('del','X','onClick="todo_list_remove('.$row['tl_id'].')"').
'</td>'.
'</tr>';
}
Modified: phpcompta/trunk/include/template/detail-action.php
===================================================================
--- phpcompta/trunk/include/template/detail-action.php 2013-08-28 21:25:58 UTC
(rev 5365)
+++ phpcompta/trunk/include/template/detail-action.php 2013-08-30 13:57:39 UTC
(rev 5366)
@@ -197,12 +197,12 @@
<p>
<script language="javascript">
function enlarge(p_id_textarea){
- $(p_id_textarea).rows=40; $(p_id_textarea).cols=120;
+ $(p_id_textarea).style.height='80%';
$('bt_enlarge').style.display="none";
$('bt_small').style.display="inline";
}
function small(p_id_textarea){
- $(p_id_textarea).rows=5; $(p_id_textarea).cols=70;
+ $(p_id_textarea).style.height="auto";
$('bt_enlarge').style.display="inline";
$('bt_small').style.display="none";
Modified: phpcompta/trunk/include/verif_bilan.inc.php
===================================================================
--- phpcompta/trunk/include/verif_bilan.inc.php 2013-08-28 21:25:58 UTC (rev
5365)
+++ phpcompta/trunk/include/verif_bilan.inc.php 2013-08-30 13:57:39 UTC (rev
5366)
@@ -39,11 +39,11 @@
if ( $cred == $deb )
{
- $result ='<span style="color:green;font-size:120%;font-weight:bold;"> OK
</span>';
+ $result ='<span style="color:green;font-size:1.2em;font-weight:bold;"> OK
</span>';
}
else
{
- $result ='<span style="color:red;font-size:120%;font-weight:bold;"> NON OK
</span>';
+ $result ='<span style="color:red;font-size:1.2em;font-weight:bold;"> NON
OK </span>';
}
printf ('<li> Solde Grand Livre : debit %f credit %f
%s</li>',$deb,$cred,$result);
@@ -60,11 +60,11 @@
if ( $cred == $deb )
{
- $result ='<span style="color:green;font-size:120%;font-weight:bold;">
OK </span>';
+ $result ='<span style="color:green;font-size:1.2em;font-weight:bold;">
OK </span>';
}
else
{
- $result ='<span style="color:red;font-size:120%;font-weight:bold;">
NON OK </span>';
+ $result ='<span style="color:red;font-size:1.2em;font-weight:bold;">
NON OK </span>';
}
printf ('<li> Journal %s Solde : debit %f credit %f
%s</li>',$name,$deb,$cred,$result);
@@ -79,11 +79,11 @@
if ( $cred == $deb )
{
- $result ='<span style="color:green;font-size:120%;font-weight:bold;"> OK
</span>';
+ $result ='<span style="color:green;font-size:1.2em;font-weight:bold;"> OK
</span>';
}
else
{
- $result ='<span style="color:red;font-size:120%;font-weight:bold;"> NON OK
</span>';
+ $result ='<span style="color:red;font-size:1.2em;font-weight:bold;"> NON
OK </span>';
}
printf ('<li> Total solde Grand Livre : debit %f credit %f
%s</li>',$deb,$cred,$result);
@@ -99,11 +99,11 @@
if ( $cred == $deb )
{
- $result ='<span style="color:green;font-size:120%;font-weight:bold;">
OK </span>';
+ $result ='<span style="color:green;font-size:1.2em;font-weight:bold;">
OK </span>';
}
else
{
- $result ='<span style="color:red;font-size:120%;font-weight:bold;">
NON OK </span>';
+ $result ='<span style="color:red;font-size:1.2em;font-weight:bold;">
NON OK </span>';
}
printf ('<li> Journal %s total : debit %f credit %f
%s</li>',$name,$deb,$cred,$result);
---
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] r5366 - in phpcompta/trunk: html html/image include include/template,
phpcompta-dev <=