[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/04: Task #1118 - Partage de notes via le
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 02/04: Task #1118 - Partage de notes via le Pense-bête #1118 : permet le zoom de la todo list corrige bug , colonne manquante |
Date: |
Mon, 25 May 2015 21:49:55 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit c76a6fc2fd6383bf785a69f5e50e4f90d7e0b69d
Author: Dany De Bontridder <address@hidden>
Date: Sun May 24 21:14:01 2015 +0200
Task #1118 - Partage de notes via le Pense-bête
#1118 : permet le zoom de la todo list
corrige bug , colonne manquante
---
html/js/todo_list.js | 25 +++++++++++++++++++++++++
include/class_html_input.php | 1 +
include/class_todo_list.php | 2 +-
include/template/dashboard.php | 5 +++--
include/template/todo_list_display.php | 1 +
5 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/html/js/todo_list.js b/html/js/todo_list.js
index b8b1f96..81c3b3c 100644
--- a/html/js/todo_list.js
+++ b/html/js/todo_list.js
@@ -173,4 +173,29 @@ function todo_list_save(p_form)
return false;
}
return false;
+}
+
+/**
+ * @brief maximize or minimize the todo list from the
+ * dashboard.
+ */
+var todo_maximize=false;
+
+function zoom_todo ()
+{
+ if ( ! todo_maximize)
+ {
+
+ $('todo_listg_div').setStyle({'z-index':3,'position':'absolute'});
+ new
Effect.Scale('todo_listg_div',200,{scaleContent:false,scaleMode:'contents'});
+ todo_maximize=true;
+ } else
+ {
+ todo_maximize=false;
+ $('todo_listg_div').setAttribute('style',"");
+ /* IE Bug */
+ if ($('todo_listg_div').style.setAttribute) {
$('todo_listg_div').style.setAttribute('cssText', "") ;}
+ new
Effect.Scale('todo_listg_div',100,{scaleContent:false,scaleMode:'contents'});
+ }
+
}
\ No newline at end of file
diff --git a/include/class_html_input.php b/include/class_html_input.php
index 720b2d5..28639c3 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -713,6 +713,7 @@ class HtmlInput
{
if ($mod=='close')
$r=HtmlInput::anchor_close($div);
if ($mod=='hide')
$r=HtmlInput::anchor_hide("⨉","$('$div').hide();$p_js");
+ if ($mod=='zoom') $r='<span
style="float:right;margin-right:5px">'.HtmlInput::anchor("⬜","",$p_js,'
id="close_div" class="input_text" ').'</span>';
if ( $mod == 'none') $r="";
$r.=h2($name,' class="title" ');
return $r;
diff --git a/include/class_todo_list.php b/include/class_todo_list.php
index 7f494fa..a9af11a 100644
--- a/include/class_todo_list.php
+++ b/include/class_todo_list.php
@@ -140,7 +140,7 @@ class Todo_List
/* limit the title to 35 char */
$this->tl_title=mb_substr(trim($this->tl_title),0,30);
- $sql="insert into todo_list (tl_date,tl_title,tl_desc,use_login) ".
+ $sql="insert into todo_list
(tl_date,tl_title,tl_desc,use_login,is_public) ".
" values (to_date($1,'DD.MM.YYYY'),$2,$3,$4,$5) returning tl_id";
$res=$this->cn->exec_sql(
$sql,
diff --git a/include/template/dashboard.php b/include/template/dashboard.php
index 8964358..407c5d9 100644
--- a/include/template/dashboard.php
+++ b/include/template/dashboard.php
@@ -3,11 +3,12 @@
//see licence.txt
?><!-- left div -->
<div id="calendar_box_div" class="box">
-<?php echo HtmlInput::title_box(_('Calendrier'),'cal_div','none');?>
+<?php echo
HtmlInput::title_box(_('Calendrier'),'cal_div','zoom',"onclick=\"calendar_zoom($obj)\"");?>
<?php echo HtmlInput::calendar_zoom($obj); ?>
<?php echo $cal->display('short'); ?>
</div>
-<div id="todo_listg_div" class="box"> <?php echo
HtmlInput::title_box(_('Pense-Bête'),"todo_listg_div",'none')?>
+
+<div id="todo_listg_div" class="box"> <?php echo
HtmlInput::title_box(_('Pense-Bête'),"todo_listg_div",'zoom',"
onclick=\"zoom_todo()\"\"")?>
<?php
/*
diff --git a/include/template/todo_list_display.php
b/include/template/todo_list_display.php
index 70162ff..82e36c9 100644
--- a/include/template/todo_list_display.php
+++ b/include/template/todo_list_display.php
@@ -23,6 +23,7 @@
* create a html with content
* @see Todo_List
*/
+global $g_user;
$wDate=new IDate('p_date_todo',$this->tl_date);
$wTitle=new IText('p_title',$this->tl_title);