From 68b867ffc86af77605cf40c5264ebec20a652827 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 16 Sep 2013 21:30:16 +0000 Subject: [PATCH] Cosmetique - preference - bookmark --- html/js/scripts.js | 12 ++++----- html/style.css | 39 +++++++++++++++++++++++----- include/ajax_bookmark.php | 20 ++++++++++---- include/ajax_navigator.php | 2 +- include/ajax_preference.php | 2 +- include/class_acc_account_ledger.php | 4 +-- include/class_fiche.php | 4 +-- 7 files changed, 59 insertions(+), 24 deletions(-) diff --git a/html/js/scripts.js b/html/js/scripts.js index 74d9bd611..8ad60e383 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -1847,7 +1847,7 @@ function set_preference(p_dossier) { 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 @@ function show_bookmark(p_dossier) { 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 @@ function save_bookmark() { 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 @@ function remove_bookmark() { 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 { diff --git a/html/style.css b/html/style.css index 959e8798a..a8190a7c7 100644 --- a/html/style.css +++ b/html/style.css @@ -943,13 +943,9 @@ div.inner_box { 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 @@ div#modele_op_div{ 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 @@ div.bxbutton 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 diff --git a/include/ajax_bookmark.php b/include/ajax_bookmark.php index 6e8184bc7..f5d2f3ba4 100644 --- a/include/ajax_bookmark.php +++ b/include/ajax_bookmark.php @@ -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 @@ $url="do.php?gDossier=".Dossier::id()."&ac="; - +

- +

diff --git a/include/ajax_navigator.php b/include/ajax_navigator.php index d490db178..ceb4c2785 100644 --- a/include/ajax_navigator.php +++ b/include/ajax_navigator.php @@ -39,7 +39,7 @@ $a_menu=$cn->get_array($sql,array($_SESSION['g_user']));

Filtre :

diff --git a/include/ajax_preference.php b/include/ajax_preference.php index d18a66d0e..3ebff400e 100644 --- a/include/ajax_preference.php +++ b/include/ajax_preference.php @@ -31,7 +31,7 @@ require_once('class_acc_report.php'); require_once('class_periode.php'); echo HtmlInput::title_box(_('Préférence'), 'preference_div'); echo '
'; -echo '

Si vous validez la page sera rechargée et vous pourriez perdre' +echo '

Si vous validez, la page sera rechargée et vous pourriez perdre' . ' ce que vous faisiez

'; //---------------------------------------------------------------------- // diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php index edd3a01cd..90c0e7c0a 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class_acc_account_ledger.php @@ -331,9 +331,9 @@ class Acc_Account_Ledger echo '

'.$this->id." ".$this->name.'

'; if ( $from_div == 0) - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo ''; echo "". "". diff --git a/include/class_fiche.php b/include/class_fiche.php index dd5fb0f83..e60b67427 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -1263,11 +1263,11 @@ class Fiche $rep=""; if ( $from_div==1) { - echo "
Date
"; + echo "
"; } else { - echo "
"; + echo "
"; } echo ''; echo "".