[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5394 - in phpcompta/trunk: html html/js include
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5394 - in phpcompta/trunk: html html/js include |
|
Date: |
Mon, 16 Sep 2013 23:30:17 +0200 (CEST) |
Author: danydb
Date: 2013-09-16 23:30:16 +0200 (Mon, 16 Sep 2013)
New Revision: 5394
Modified:
phpcompta/trunk/html/js/scripts.js
phpcompta/trunk/html/style.css
phpcompta/trunk/include/ajax_bookmark.php
phpcompta/trunk/include/ajax_navigator.php
phpcompta/trunk/include/ajax_preference.php
phpcompta/trunk/include/class_acc_account_ledger.php
phpcompta/trunk/include/class_fiche.php
Log:
Cosmetique - preference - bookmark
Modified: phpcompta/trunk/html/js/scripts.js
===================================================================
--- phpcompta/trunk/html/js/scripts.js 2013-09-16 16:42:25 UTC (rev 5393)
+++ phpcompta/trunk/html/js/scripts.js 2013-09-16 21:30:16 UTC (rev 5394)
@@ -1847,7 +1847,7 @@
onFailure:ajax_misc_failure,
onSuccess:function(req){
remove_waiting_box();
-
add_div({id:'preference_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
+
add_div({id:'preference_div',drag:1});
$('preference_div').innerHTML=req.responseText;
try
{
@@ -1884,7 +1884,7 @@
onFailure:ajax_misc_failure,
onSuccess:function(req){
remove_waiting_box();
-
add_div({id:'bookmark_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
+
add_div({id:'bookmark_div',cssclass:'inner_box',drag:1});
$('bookmark_div').innerHTML=req.responseText;
try
{
@@ -1916,9 +1916,9 @@
method:'get', parameters:queryString,
onFailure:ajax_misc_failure,
onSuccess:function(req){
- removeDiv('bookmark_div');
remove_waiting_box();
-
add_div({id:'bookmark_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
+ // removeDiv('bookmark_div');
+ //
add_div({id:'bookmark_div',cssclass:'inner_box',drag:1});
$('bookmark_div').innerHTML=req.responseText;
try
{
@@ -1951,8 +1951,8 @@
onFailure:ajax_misc_failure,
onSuccess:function(req){
remove_waiting_box();
- removeDiv('bookmark_div');
-
add_div({id:'bookmark_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
+ // removeDiv('bookmark_div');
+ //
add_div({id:'bookmark_div',cssclass:'inner_box',drag:1});
$('bookmark_div').innerHTML=req.responseText;
try
{
Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css 2013-09-16 16:42:25 UTC (rev 5393)
+++ phpcompta/trunk/html/style.css 2013-09-16 21:30:16 UTC (rev 5394)
@@ -943,13 +943,9 @@
margin:0;
overflow:hidden;
z-index:3;
-
position:absolute;
left:10%;
-
-
border:1px solid darkblue;
-
}
div.op_detail_title {
background-color:grey;
@@ -1260,8 +1256,8 @@
overflow:hidden;
z-index:3;
position:absolute;
- left:10%;
- width:60%;
+ left:30%;
+ width:40%;
border:1px solid darkblue;
}
div#notice {
@@ -1290,5 +1286,34 @@
margin-right:0.48%;
}
div.inner_box tr.odd {
- background: white;
+ background: #CBD9F4;
+}
+#modele_op_tab tr.odd {
+ background: #CBD9F4;
+}
+div#bookmark_div {
+ background-color:#e4e7ed;
+ font-family:arial,verdana,sans-serif,helvetica;
+ padding:0;
+ margin:0;
+ overflow:hidden;
+ z-index:3;
+ position:absolute;
+ border:1px solid darkblue;
+ top:2em;
+ left:30%;
+ width:40%;
+}
+div#preference_div {
+ background-color:#e4e7ed;
+ font-family:arial,verdana,sans-serif,helvetica;
+ padding:0;
+ margin:0;
+ overflow:hidden;
+ z-index:3;
+ position:absolute;
+ border:1px solid darkblue;
+ top:2em;
+ left:20%;
+ width:50%;
}
\ No newline at end of file
Modified: phpcompta/trunk/include/ajax_bookmark.php
===================================================================
--- phpcompta/trunk/include/ajax_bookmark.php 2013-09-16 16:42:25 UTC (rev
5393)
+++ phpcompta/trunk/include/ajax_bookmark.php 2013-09-16 21:30:16 UTC (rev
5394)
@@ -27,12 +27,22 @@
if ( ! defined ('ALLOWED')) die('Appel direct ne sont pas permis');
echo HtmlInput::title_box("Favoris", "bookmark_div");
if (! isset($_GET['ac'])) {
- die ('CODE ACCES DIRECT INCORRECT');
+ /*
+ * find default module
+ */
+ $_GET['ac']= find_default_module();
}
// Add bookmark
if (isset($_GET['bookmark_add'])){
- $cn->exec_sql("insert into bookmark(b_action,login) values($1,$2)",
+ $count=$cn->get_value("select count(*) from bookmark"
+ . " where b_action=$1 and login=$2",
+ array($_GET['ac'],$g_user->login)
+ );
+ // Add bookmark only if absent
+ if ( $count == 0 ){
+ $cn->exec_sql("insert into bookmark(b_action,login) values($1,$2)",
array($_GET['ac'],$g_user->login));
+ }
}
// remove bookmark
if (isset($_GET['bookmark_delete']) && isset ($_GET['book'])){
@@ -77,15 +87,15 @@
</tr>
<?php endfor; ?>
</table>
-<?php echo HtmlInput::submit("bookmark_delete", "Supprimez favoris
sélectionnés"); ?>
+<?php echo HtmlInput::submit("bookmark_delete", "Supprimez favoris
sélectionnés","","smallbutton"); ?>
</form>
<form id="bookmark_frm" method="get" onsubmit="save_bookmark();return false">
<?php
-echo "Menu actuel : ".$_GET['ac'];
+echo "Menu actuel : ".hb($_GET['ac']);
echo HtmlInput::array_to_hidden(array("gDossier","ac"), $_REQUEST);
?>
<p>
-<?php echo HtmlInput::submit("bookmark_add", "Ajoutez le menu actuel à vos
favoris"); ?>
+<?php echo HtmlInput::submit("bookmark_add", "Ajoutez le menu actuel à vos
favoris","","smallbutton"); ?>
</form>
Modified: phpcompta/trunk/include/ajax_navigator.php
===================================================================
--- phpcompta/trunk/include/ajax_navigator.php 2013-09-16 16:42:25 UTC (rev
5393)
+++ phpcompta/trunk/include/ajax_navigator.php 2013-09-16 21:30:16 UTC (rev
5394)
@@ -39,7 +39,7 @@
</p>
<p style='margin-left: 5%'>
Filtre : <?php
- echo HtmlInput::filter_table("navi_tb", "1,2", '1');
+ echo HtmlInput::filter_table("navi_tb", "0,1,2", '1');
?>
</p>
<table id="navi_tb" class="sortable" style="width:90%;margin-left:
5%;border-spacing:0em 0.50em;border-collapse: separate">
Modified: phpcompta/trunk/include/ajax_preference.php
===================================================================
--- phpcompta/trunk/include/ajax_preference.php 2013-09-16 16:42:25 UTC (rev
5393)
+++ phpcompta/trunk/include/ajax_preference.php 2013-09-16 21:30:16 UTC (rev
5394)
@@ -31,7 +31,7 @@
require_once('class_periode.php');
echo HtmlInput::title_box(_('Préférence'), 'preference_div');
echo '<DIV class="content">';
-echo '<p class="notice"> Si vous validez la page sera rechargée et vous
pourriez perdre'
+echo '<p class="notice"> Si vous validez, la page sera rechargée et vous
pourriez perdre'
. ' ce que vous faisiez</p>';
//----------------------------------------------------------------------
//
Modified: phpcompta/trunk/include/class_acc_account_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_account_ledger.php 2013-09-16
16:42:25 UTC (rev 5393)
+++ phpcompta/trunk/include/class_acc_account_ledger.php 2013-09-16
21:30:16 UTC (rev 5394)
@@ -331,9 +331,9 @@
echo '<h2 class="title">'.$this->id." ".$this->name.'</h2>';
if ( $from_div == 0)
- echo "<TABLE class=\"resultfooter\"
style=\"border-collapse:separate;width:100%;border-spacing:5px\">";
+ echo "<TABLE class=\"resultfooter\"
style=\"border-collapse:separate;width:100%;border-spacing:0px 5px\">";
else
- echo "<TABLE class=\"resultfooter\"
style=\"border-collapse:separate;width:100%;border-spacing:2px\">";
+ echo "<TABLE class=\"resultfooter\"
style=\"border-collapse:separate;width:100%;border-spacing:0px 2px\">";
echo '<tbody>';
echo "<TR>".
"<TH style=\"text-align:left\"> Date</TH>".
Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php 2013-09-16 16:42:25 UTC (rev
5393)
+++ phpcompta/trunk/include/class_fiche.php 2013-09-16 21:30:16 UTC (rev
5394)
@@ -1263,11 +1263,11 @@
$rep="";
if ( $from_div==1)
{
- echo "<TABLE class=\"resultfooter\"
style=\"width:100%;border-collapse:separate;border-spacing:5px\">";
+ echo "<TABLE class=\"resultfooter\"
style=\"width:100%;border-collapse:separate;border-spacing:0px 5px\">";
}
else
{
- echo "<TABLE id=\"tb" . $from_div . "\"class=\"result\"
style=\"width:100%;border-collapse:separate;border-spacing:2px\">";
+ echo "<TABLE id=\"tb" . $from_div . "\"class=\"result\"
style=\"width:100%;border-collapse:separate;border-spacing:0px 2px\">";
}
echo '<tbody>';
echo "<TR>".
---
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] r5394 - in phpcompta/trunk: html html/js include,
phpcompta-dev <=