[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5367 - in phpcompta/trunk: html include include/templat
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5367 - in phpcompta/trunk: html include include/template |
|
Date: |
Fri, 30 Aug 2013 16:44:22 +0200 (CEST) |
Author: danydb
Date: 2013-08-30 16:44:22 +0200 (Fri, 30 Aug 2013)
New Revision: 5367
Modified:
phpcompta/trunk/html/ajax_card.php
phpcompta/trunk/html/style.css
phpcompta/trunk/include/class_html_input.php
phpcompta/trunk/include/fiche.inc.php
phpcompta/trunk/include/template/category_of_card.php
phpcompta/trunk/include/template/ledger_detail_fin.php
phpcompta/trunk/include/template/ledger_detail_misc.php
phpcompta/trunk/include/template/ledger_detail_top.php
phpcompta/trunk/include/template/ledger_detail_ven.php
Log:
am?\195?\169liore apparence
Modified: phpcompta/trunk/html/ajax_card.php
===================================================================
--- phpcompta/trunk/html/ajax_card.php 2013-08-30 13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/html/ajax_card.php 2013-08-30 14:44:22 UTC (rev 5367)
@@ -126,9 +126,7 @@
case 'dc':
$f=new Fiche($cn);
/* add title + close */
- $html="";
- $html=HtmlInput::anchor_close($ctl);
- $html.=h2info('Détail fiche');
+ $html=HtmlInput::title_box("Détail fiche", $ctl);
if ( $qcode != '')
{
$f->get_by_qcode($qcode);
@@ -180,12 +178,10 @@
case 'bc':
if ( $g_user->check_action(FICADD)==1 )
{
- $r='';
- $r=HtmlInput::anchor_close($ctl);
+ $r=HtmlInput::title_box("Nouvelle fiche", $ctl);
/* get cat. name */
$cat_name=$cn->get_value('select fd_label from fiche_def where
fd_id=$1',
array($fd_id));
- $r.=h2info(_('Nouvelle fiche ').$cat_name);
$f=new Fiche($cn);
$r.='<form id="save_card" method="POST"
onsubmit="this.ipopup=\''.$ctl.'\';save_card(this);return false;" >';
$r.=dossier::hidden();
@@ -261,8 +257,8 @@
$sql.=" ".$where." order by fd_label";
$array=$cn->make_array($sql);
- $html=HtmlInput::anchor_close('select_card_div');
- $html.=h2info('Choix de la catégorie');
+ $html=HtmlInput::title_box("Choix de la catégorie", $ctl);
+
if ( empty($array))
{
$html.=_("Aucune catégorie de fiche ne correspond à".
@@ -297,8 +293,7 @@
*
----------------------------------------------------------------------*/
case 'sc':
- $html=HtmlInput::anchor_close($ctl);
- $html.=h2info('Nouvelle fiche');
+ $html=HtmlInput::title_box("Choix de la catégorie", $ctl);
if ( $g_user->check_action(FICADD)==1 )
{
$f=new Fiche($cn);
@@ -322,10 +317,7 @@
*----------------------------------------------------------------------*/
case 'fs':
require_once('class_acc_ledger.php');
- $r='';
- $r.=HtmlInput::anchor_close('search_card');
- $r.='<div> '.h2info(_('Recherche de fiche')).'</div>';
-
+ $r=HtmlInput::title_box("Détail fiche", $ctl);
$r.='<form method="GET"
onsubmit="this.ctl=\'ipop_card\';search_get_card(this);return false;">';
$q=new IText('query');
$q->value=(isset($query))?$query:'';
@@ -491,8 +483,7 @@
}
break;
case 'upc':
- $html=HtmlInput::anchor_close($ctl);
- $html.=h2info('Détail fiche');
+ $html=HtmlInput::title_box("Détail fiche", $ctl);
if ( $g_user->check_action(FICADD)==0 )
{
Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css 2013-08-30 13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/html/style.css 2013-08-30 14:44:22 UTC (rev 5367)
@@ -82,6 +82,7 @@
}
+
h3.info {
background:#879ed4;
color:white;
@@ -1182,11 +1183,14 @@
font-style: italic;
}
h2.title {
- color: blue;
- font-size:0.87em;
- font-weight:bold;
- font-style: italic;
- margin-left: 15px;
+ background-color:#879ed4;
+ color:white;
+ font-size:1.34em;
+ text-align:center;
+ padding:0.24%;
+ //margin:0.24%;
+ border:1px solid darkblue;
+
}
h3.title {
color: blue;
Modified: phpcompta/trunk/include/class_html_input.php
===================================================================
--- phpcompta/trunk/include/class_html_input.php 2013-08-30 13:57:39 UTC
(rev 5366)
+++ phpcompta/trunk/include/class_html_input.php 2013-08-30 14:44:22 UTC
(rev 5367)
@@ -411,7 +411,7 @@
static function anchor_close($div)
{
$r='';
- $r.='<div
style="float:right;margin-right:2px;margin-top:1px;padding:0">';
+ $r.='<div
style="float:right;margin-right:2px;margin-top:5px;padding:0">';
$r.= '<A id="close_div" class="input_text" HREF="javascript:void(0)"
onclick="removeDiv(\''.$div.'\');">Fermer</A>';
$r.='</div>';
return $r;
@@ -648,7 +648,7 @@
{
if ($mod=='close')
$r=HtmlInput::anchor_close($div);
if ($mod=='hide')
$r=HtmlInput::anchor_hide(_('Fermer'),"$('$div').hide()");
- $r.=h2info($name);
+ $r.=h2($name,' class="title" ');
return $r;
}
/**
Modified: phpcompta/trunk/include/fiche.inc.php
===================================================================
--- phpcompta/trunk/include/fiche.inc.php 2013-08-30 13:57:39 UTC (rev
5366)
+++ phpcompta/trunk/include/fiche.inc.php 2013-08-30 14:44:22 UTC (rev
5367)
@@ -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:15.625%;top:35%">
+<div style="position:absolute;right:15.625%;top:150px">
<?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/template/category_of_card.php
===================================================================
--- phpcompta/trunk/include/template/category_of_card.php 2013-08-30
13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/category_of_card.php 2013-08-30
14:44:22 UTC (rev 5367)
@@ -1,7 +1,6 @@
<?php
- echo HtmlInput::anchor_close($ctl);
+$html=HtmlInput::title_box("Ajout d'une catégorie ".$msg, $ctl);
?>
- <?php echo h2info(_("Ajout d'une catégorie").$msg); ?>
<div class="content">
<form id="newcat" name="newcat" method="get" onsubmit="this.ipopup='<?php echo
$ipopup?>';save_card_category(this);return false;">
Modified: phpcompta/trunk/include/template/ledger_detail_fin.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_fin.php 2013-08-30
13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_fin.php 2013-08-30
14:44:22 UTC (rev 5367)
@@ -64,8 +64,8 @@
</tr>
</table>
-</td><td>
-<table style="border:solid 1px yellow">
+</td><td style='width:50%'>
+ <table style="width:100%;border:solid 1px yellow">
<tr>
<td>
Note
Modified: phpcompta/trunk/include/template/ledger_detail_misc.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_misc.php 2013-08-30
13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_misc.php 2013-08-30
14:44:22 UTC (rev 5367)
@@ -49,14 +49,16 @@
</td></tr>
</table>
- </td><td>
- <table style="border:solid 1px
yellow">
- <tr>
- <td>
- Note
- </td></tr>
- <tr>
- <td>
+ </td>
+ <td style='width:50%'>
+ <table style="width:100%;border:solid 1px yellow">
+ <tr>
+ <td>
+ Note
+ </td>
+ </tr>
+ <tr>
+ <td>
<?php
$inote=new
ITextarea('jrn_note');
$inote->width=25;
@@ -65,9 +67,9 @@
echo $inote->input();
?>
- </td>
- </tr>
- </table>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</table>
Modified: phpcompta/trunk/include/template/ledger_detail_top.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_top.php 2013-08-30
13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_top.php 2013-08-30
14:44:22 UTC (rev 5367)
@@ -1,4 +1,4 @@
-<div
style="float:right;height:10px;display:block;margin-top:2px;margin-right:2px">
+<div
style="float:right;height:10px;display:block;margin-top:0.48%;margin-right:0.48%">
<?php
if ($div != "popup") {
$callback=$_SERVER['PHP_SELF'];
@@ -10,7 +10,7 @@
?>
</div>
<div>
- <?php echo h2info($oLedger->get_name()); ?>
+ <?php echo h2($oLedger->get_name(),'class="title"'); ?>
</div>
<?php echo "Opération ID=".hb($obj->det->jr_internal); ?>
<div id="<?php echo $div.'info'?>" class="divinfo"></div>
Modified: phpcompta/trunk/include/template/ledger_detail_ven.php
===================================================================
--- phpcompta/trunk/include/template/ledger_detail_ven.php 2013-08-30
13:57:39 UTC (rev 5366)
+++ phpcompta/trunk/include/template/ledger_detail_ven.php 2013-08-30
14:44:22 UTC (rev 5367)
@@ -75,8 +75,8 @@
</tr>
</table>
</td>
-<td>
- <table style="border:solid 1px yellow">
+<td style='width:50%'>
+ <table style="width:100%;border:solid 1px yellow">
<tr>
<td>
Note
---
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] r5367 - in phpcompta/trunk: html include include/template,
phpcompta-dev <=