[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5489 - phpcompta/trunk/include/template
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5489 - phpcompta/trunk/include/template |
Date: |
Sat, 12 Oct 2013 20:00:42 +0200 (CEST) |
Author: danydb
Date: 2013-10-12 20:00:42 +0200 (Sat, 12 Oct 2013)
New Revision: 5489
Modified:
phpcompta/trunk/include/template/dashboard.php
Log:
placement dashboard
Modified: phpcompta/trunk/include/template/dashboard.php
===================================================================
--- phpcompta/trunk/include/template/dashboard.php 2013-10-12 14:28:15 UTC
(rev 5488)
+++ phpcompta/trunk/include/template/dashboard.php 2013-10-12 18:00:42 UTC
(rev 5489)
@@ -1,13 +1,8 @@
-<div style="float:left;width: 49%">
-<fieldset >
-<legend><?php echo _('Calendrier')?>
-</legend>
-<?php echo HtmlInput::calendar_zoom($obj); ?>
-<?php echo $cal->display(); ?>
-</fieldset>
-</div>
+<!-- left div -->
+<div style="float:right;width: 49%">
<?php
+
/*
* Todo list
*/
@@ -24,7 +19,7 @@
$todo=new Todo_List($cn);
$array=$todo->load_all();
?>
-<div style="float:right;width: 49%">
+<div style="float:right;width: 100%">
<fieldset>
<legend> Situation </legend>
<table class='result'>
@@ -153,8 +148,7 @@
?>
</fieldset>
</div>
-
-<div style="float:right;width: 49%">
+<div style="float:right;width: 100%">
<div id="action_late_div" class="inner_box"
style="display:none;margin-left:25%;top:25%;width: 50%;height:50%;overflow:
auto;">
<?php
@@ -223,8 +217,52 @@
<?php display_dashboard_operation($customer_late,"Clients en
retard",'customer_late_div'); ?>
</div>
+
+
+<div style="float:right;width: 100%">
+<fieldset>
+<legend><?php echo _('Dernières opérations')?>
+</legend>
+<table style="width: 100%">
+<?php
+for($i=0;$i<count($last_ledger);$i++):
+ $class=($i%2==0)?' class="even" ':' class="odd" ';
+?>
+<tr <?php echo $class ?>>
+ <td><?php echo smaller_date($last_ledger[$i]['jr_date_fmt'])?>
+ </td>
+ <td>
+ <?php echo $last_ledger[$i]['jrn_def_code']?>
+ </td>
+<td>
+ <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?>
+</td>
+<td>
+<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'],
$last_ledger[$i]['jr_internal'])?>
+</td>
+<td class="num">
+<?php echo nbm($last_ledger[$i]['jr_montant'])?>
+</td>
+
+</tr>
+<?php endfor;?>
+</ul></table>
+</fieldset>
+</div>
+
+</div>
+<div style="float:right;width: 49%">
+
+<div style="float:left;width: 100%">
+<fieldset >
+<legend><?php echo _('Calendrier')?>
+</legend>
+<?php echo HtmlInput::calendar_zoom($obj); ?>
+<?php echo $cal->display(); ?>
+</fieldset>
+</div>
<!-- Mini rapport -->
- <div style="float:left;width: 47%">
+<div style="float:left;width: 100%">
<?php
/*
* Mini Report
@@ -238,8 +276,9 @@
$report=0;
}
-if ( $report != 0 ) {
- echo '<fieldset
style="height:50%;"><legend>'.$rapport->get_name().'</legend>';
+if ( $report != 0 ) : ?>
+<fieldset style="height:50%;"><legend><?php echo
$rapport->get_name()?></legend>
+<?php
$exercice=$g_user->get_exercice();
if ( $exercice == 0 ) {
alert(_('Aucune periode par defaut'));
@@ -261,53 +300,22 @@
}
echo '</table>';
}
- echo '</fieldset>';
- echo '</div>';
- } else {
- echo '<fieldset
style="height:50%;width:80%;background-color:white"><legend>'._('Aucun rapport
défini').'</legend>';
- echo '<a href="javascript:void(0)"
onclick="set_preference('.dossier::id().')">'._('Cliquez ici pour mettre à jour
vos préférences').'</a>';
-
-
-echo '</fieldset>';
-echo '</div>';
-}
-
+ ?>
+ </fieldset>
+<?php
+ else :
?>
-</div>
+ <fieldset style="height:50%;width:80%;background-color:white"><legend><?php
_('Aucun rapport défini')?></legend>
+ <a href="javascript:void(0)"
onclick="set_preference('.dossier::id().')"><?php echo _('Cliquez ici pour
mettre à jour vos préférences')?></a>
-<div style="float:right;width: 47%">
-<fieldset>
-<legend><?php echo _('Dernières opérations')?>
-</legend>
-<table style="width: 100%">
+</fieldset>
<?php
-for($i=0;$i<count($last_ledger);$i++):
- $class=($i%2==0)?' class="even" ':' class="odd" ';
+endif;
?>
-<tr <?php echo $class ?>>
- <td><?php echo smaller_date($last_ledger[$i]['jr_date_fmt'])?>
- </td>
- <td>
- <?php echo $last_ledger[$i]['jrn_def_code']?>
- </td>
-<td>
- <?php echo h(mb_substr($last_ledger[$i]['jr_comment'],0,40,'UTF-8'))?>
-</td>
-<td>
-<?php echo HtmlInput::detail_op($last_ledger[$i]['jr_id'],
$last_ledger[$i]['jr_internal'])?>
-</td>
-<td class="num">
-<?php echo nbm($last_ledger[$i]['jr_montant'])?>
-</td>
-
-</tr>
-<?php endfor;?>
-</ul></table>
-</fieldset>
</div>
+</div>
-
<div id="add_todo_list" >
<script charset="utf8" type="text/javascript" language="javascript">
new Draggable($('add_todo_list'),{});
---
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] r5489 - phpcompta/trunk/include/template,
phpcompta-dev <=