admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetique - preference - bookmark

Browse source
This commit is contained in:
Dany De Bontridder 2013-09-16 21:30:16 +00:00
parent e08c9ee654
commit 68b867ffc8
7 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
html/js/scripts.js
View file

@ -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
{

39
html/style.css
View file

@ -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%;
}

20
include/ajax_bookmark.php
View file

@ -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=";
</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>

2
include/ajax_navigator.php
View file

@ -39,7 +39,7 @@ $a_menu=$cn->get_array($sql,array($_SESSION['g_user']));
</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">

2
include/ajax_preference.php
View file

@ -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 '<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>';
//----------------------------------------------------------------------
//

4
include/class_acc_account_ledger.php
View file

@ -331,9 +331,9 @@ class Acc_Account_Ledger
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>".

4
include/class_fiche.php
View file

@ -1263,11 +1263,11 @@ class Fiche
$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>".