[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r715 - in trunk: amortis amortis/include amortis/include
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r715 - in trunk: amortis amortis/include amortis/include/template importbank importbank/include/template rapport_avance tva |
|
Date: |
Sat, 1 Mar 2014 02:40:42 +0100 (CET) |
Author: danydb
Date: 2014-03-01 02:40:41 +0100 (Sat, 01 Mar 2014)
New Revision: 715
Modified:
trunk/amortis/amortize_javascript.js
trunk/amortis/include/class_am_card.php
trunk/amortis/include/material_modify.inc.php
trunk/amortis/include/template/listing_histo.php
trunk/amortis/include/template/material_add.php
trunk/amortis/include/template/material_detail.php
trunk/importbank/bank_js.js
trunk/importbank/include/template/detail_item.php
trunk/rapport_avance/ajax_include_follow.php
trunk/rapport_avance/ajax_include_follow_save.php
trunk/rapport_avance/ajax_listing_detail_modify.php
trunk/rapport_avance/ajax_listing_modify.php
trunk/rapport_avance/ajax_listing_remove_modele.php
trunk/rapport_avance/ajax_parameter_send_mail.php
trunk/rapport_avance/ajax_send_mail.php
trunk/tva/js_scripts.js
Log:
Adapt CSS3
Modified: trunk/amortis/amortize_javascript.js
===================================================================
--- trunk/amortis/amortize_javascript.js 2014-02-17 19:41:39 UTC (rev
714)
+++ trunk/amortis/amortize_javascript.js 2014-03-01 01:40:41 UTC (rev
715)
@@ -28,7 +28,7 @@
{
sx=document.body.scrollTop+120;
}
- var str_style="top:"+sx+";width:60%;height:70%";
+ var str_style="top:"+sx+"px;width:60%;height:70%";
var div={id:target,
cssclass:'inner_box',style:str_style,html:loading(),drag:1};
@@ -61,7 +61,7 @@
{
sx=document.body.scrollTop+120;
}
- var str_style="top:"+sx+";width:60%;height:auto";
+ var str_style="top:"+sx+"px;width:60%;height:auto";
var div={id:target,
cssclass:'inner_box',style:str_style,html:loading(),drag:1};
Modified: trunk/amortis/include/class_am_card.php
===================================================================
--- trunk/amortis/include/class_am_card.php 2014-02-17 19:41:39 UTC (rev
714)
+++ trunk/amortis/include/class_am_card.php 2014-03-01 01:40:41 UTC (rev
715)
@@ -53,7 +53,7 @@
public function add_card()
{
$add=new IButton('add_card');
- $add->label="Ajout d'un bien à amortir";
+ $add->label=_("Ajout d'un bien à amortir");
$add->javascript=sprintf("add_material(%d,'%s','bxmat')",
dossier::id(),
$_REQUEST['plugin_code']
Modified: trunk/amortis/include/material_modify.inc.php
===================================================================
--- trunk/amortis/include/material_modify.inc.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/amortis/include/material_modify.inc.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -37,7 +37,7 @@
if ( $cn->count() == 0 )
{
echo HtmlInput::anchor_close($t);
- echo '<h2 class="info">Détail de matériel</h2>';
+ echo '<h2 class="title">Détail de matériel</h2>';
echo "<h2 class=\"error\"> Bien à amortir effacé </h2>";
echo
HtmlInput::button('close','Fermer',"onclick=\"removeDiv('bxmat');refresh_window()\"
");
}
Modified: trunk/amortis/include/template/listing_histo.php
===================================================================
--- trunk/amortis/include/template/listing_histo.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/amortis/include/template/listing_histo.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -22,7 +22,8 @@
<?php
for ($i=0;$i<count($array);$i++) :
- echo '<tr>';
+ $class=($i%2==0)?"odd":"even";
+ echo '<tr class="'.$class.'">';
echo td($array[$i]['quick_code']);
echo td($array[$i]['vw_name']);
echo td(nbm($array[$i]['h_amount']), 'align="right"');
Modified: trunk/amortis/include/template/material_add.php
===================================================================
--- trunk/amortis/include/template/material_add.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/amortis/include/template/material_add.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -1,4 +1,4 @@
-<h2 class="info">Ajout de matériel</h2>
+<h2 class="title">Ajout de matériel</h2>
<form method="POST" onsubmit="save_new_material(this);return false;">
<span style="text-align:center;display:block;font-size:2em" id="p_card_label"
>Nouveau matériel</span>
<table>
Modified: trunk/amortis/include/template/material_detail.php
===================================================================
--- trunk/amortis/include/template/material_detail.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/amortis/include/template/material_detail.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -1,4 +1,4 @@
-<h2 class="info">Modification de matériel</h2>
+<h2 class="title">Modification de matériel</h2>
<form onsubmit="save_modify(this);return false">
<?php echo $p_card?>
<?php echo $a_id?>
@@ -125,17 +125,15 @@
<?php
if ( $annuite != $p_amount->value)
{
- echo '<h2 class="error">Différence entre le montant à amortir et le
montant amorti =';
- echo nbm($annuite - $p_amount->value);
- echo '<h2>';
+ printf ('<h2 class="error">'._("Différence entre le montant à amortir
et le montant amorti = %d'".'</h2>'),nbm($annuite - $p_amount->value));
}
?>
</fieldset>
<?php
- echo HtmlInput::submit('sauver','Sauver',"onclick=\"return confirm('Vous
confirmez ?')\" ");
+ echo HtmlInput::submit('sauver',_('Sauver'),"onclick=\"return confirm('Vous
confirmez ?')\" ");
$rm=sprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugin_code'],$value_a_id);
- echo HtmlInput::button('remove','Effacer',"onclick=\"$rm\" ");
- echo
HtmlInput::button('close','Fermer',"onclick=\"removeDiv('bxmat');refresh_window()\"
");
+ echo HtmlInput::button('remove',_('Effacer'),"onclick=\"$rm\" ");
+ echo
HtmlInput::button('close',_('Fermer'),"onclick=\"removeDiv('bxmat');refresh_window()\"
");
?>
</FORM>
Modified: trunk/importbank/bank_js.js
===================================================================
--- trunk/importbank/bank_js.js 2014-02-17 19:41:39 UTC (rev 714)
+++ trunk/importbank/bank_js.js 2014-03-01 01:40:41 UTC (rev 715)
@@ -14,17 +14,10 @@
{
removeDiv(target);
}
- var sx=0;
+ var sx=calcy(120);
var height=0;
- if ( window.scrollY)
- {
- sx=window.scrollY+height;
- }
- else
- {
- sx=document.body.scrollTop+height;
- }
- var str_style="top:"+sx+";margin-left:10%;";
+
+ var str_style="top:"+sx+"px;margin-left:10%;";
var div={id:target,
cssclass:'inner_box',style:str_style,html:loading(),drag:1};
Modified: trunk/importbank/include/template/detail_item.php
===================================================================
--- trunk/importbank/include/template/detail_item.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/importbank/include/template/detail_item.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -2,7 +2,7 @@
<?php echo HtmlInput::anchor_close($ctl)?>
<?php
-echo h2info('Détail opération');
+echo h2('Détail opération','class="title"');
if ($bi->id=='')
{
echo h2('Opération effacée','class="notice"');
Modified: trunk/rapport_avance/ajax_include_follow.php
===================================================================
--- trunk/rapport_avance/ajax_include_follow.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_include_follow.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -40,7 +40,6 @@
require_once 'include/template/include_follow.php';
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/rapport_avance/ajax_include_follow_save.php
===================================================================
--- trunk/rapport_avance/ajax_include_follow_save.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_include_follow_save.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -15,7 +15,6 @@
echo '</ol>';
echo HtmlInput::button_close('include_follow_save_result');
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/rapport_avance/ajax_listing_detail_modify.php
===================================================================
--- trunk/rapport_avance/ajax_listing_detail_modify.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_listing_detail_modify.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -74,7 +74,6 @@
echo '</p>';
echo '</form>';
$response = ob_get_clean();
- ob_end_clean();
} else {
$response='invalide id';
}
Modified: trunk/rapport_avance/ajax_listing_modify.php
===================================================================
--- trunk/rapport_avance/ajax_listing_modify.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_listing_modify.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -17,7 +17,6 @@
echo '</p>';
echo '</form>';
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/rapport_avance/ajax_listing_remove_modele.php
===================================================================
--- trunk/rapport_avance/ajax_listing_remove_modele.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_listing_remove_modele.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -7,7 +7,6 @@
$file=new IFile('listing_mod');
echo $file->input();
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/rapport_avance/ajax_parameter_send_mail.php
===================================================================
--- trunk/rapport_avance/ajax_parameter_send_mail.php 2014-02-17 19:41:39 UTC
(rev 714)
+++ trunk/rapport_avance/ajax_parameter_send_mail.php 2014-03-01 01:40:41 UTC
(rev 715)
@@ -29,7 +29,6 @@
}
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/rapport_avance/ajax_send_mail.php
===================================================================
--- trunk/rapport_avance/ajax_send_mail.php 2014-02-17 19:41:39 UTC (rev
714)
+++ trunk/rapport_avance/ajax_send_mail.php 2014-03-01 01:40:41 UTC (rev
715)
@@ -16,7 +16,6 @@
echo '</ol>';
echo HtmlInput::button_close('parameter_send_mail_result');
$response = ob_get_clean();
-ob_end_clean();
$html = escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
Modified: trunk/tva/js_scripts.js
===================================================================
--- trunk/tva/js_scripts.js 2014-02-17 19:41:39 UTC (rev 714)
+++ trunk/tva/js_scripts.js 2014-03-01 01:40:41 UTC (rev 715)
@@ -125,7 +125,7 @@
sx=document.body.scrollTop+120;
}
- var div_style="top:"+sx+";width:60%;heigth:80%";
+ var div_style="top:"+sx+"px;";
removeDiv("paramadd_id");
add_div({
"id":'paramadd_id',
---
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] r715 - in trunk: amortis amortis/include amortis/include/template importbank importbank/include/template rapport_avance tva,
phpcompta-dev <=