noalyss-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 06/30: #1118 : partage de note Esthétique Zo


From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 06/30: #1118 : partage de note Esthétique Zoom des notes partagées
Date: Tue, 02 Jun 2015 22:29:04 +0000

sparkyx pushed a commit to branch master
in repository noalyss.

commit c0776af73f896aea8154ec989feee0b72cc3ce12
Author: Dany De Bontridder <address@hidden>
Date:   Sat May 30 12:28:48 2015 +0200

    #1118 : partage de note
    Esthétique Zoom des notes partagées
---
 html/ajax_todo_list.php                |    3 +++
 html/js/todo_list.js                   |   21 +++++++++++++--------
 include/template/todo_list_display.php |    3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/html/ajax_todo_list.php b/html/ajax_todo_list.php
index 05b310b..df23aa5 100644
--- a/html/ajax_todo_list.php
+++ b/html/ajax_todo_list.php
@@ -166,6 +166,9 @@ if ($ac=='shared_note')
     ob_start();
     echo HtmlInput::title_box(_('Liste utilisateurs'), "shared_".$id);
     $todo->display_user();
+    echo '<p style="text-align:center">';
+    echo HtmlInput::submit('close'.$id, 'Ferme'," 
onclick=\"\$('shared_{$id}').remove();\"");
+    echo '</p>';
     $result=ob_get_clean();
     // 
     // output the XML
diff --git a/html/js/todo_list.js b/html/js/todo_list.js
index e729d19..daa8390 100644
--- a/html/js/todo_list.js
+++ b/html/js/todo_list.js
@@ -153,6 +153,8 @@ function todo_list_save(p_form)
                             tr.innerHTML=unescape_xml(html);
                             $w(tr.className).each ( function(p_class) { 
tr.removeClassName(p_class); } );
                             tr.addClassName(getNodeText(style[0]));
+                            // remove the user list if exists
+                            if ( $('shared_'+p_form)) 
{$('shared_'+p_form).remove();}
                            Effect.Fold('todo_list_div'+p_form,{duration:0.1});
                        }
                     }
@@ -176,21 +178,24 @@ var todo_maximize=false;
  */
 function zoom_todo ()
 {
+    waiting_box();
     if ( ! todo_maximize)
     {
-        
-        $('todo_listg_div').setStyle({'z-index':1,'position':'absolute'});
-        new 
Effect.Scale('todo_listg_div',200,{scaleContent:false,scaleMode:'contents',scaleFromCenter
 :false});
+        var clonetodo=$('todo_listg_div').clone();
+        clonetodo.setAttribute('id','clone_todo_list')
+        
clonetodo.setStyle({'z-index':1,'position':'absolute','width':'100%','height':'100%'})
+        clonetodo.innerHTML=$('todo_listg_div').innerHTML;
+        $('todo_listg_div').innerHTML="";
+
+        document.body.appendChild(clonetodo);
         todo_maximize=true;
     } else
     {
         todo_maximize=false;
-        new 
Effect.Scale('todo_listg_div',99,{scaleContent:false,scaleMode:'contents'});
-        $('todo_listg_div').setAttribute('style',"");
-        /* IE Bug */
-         if ($('todo_listg_div').style.setAttribute) { 
$('todo_listg_div').style.setAttribute('cssText', "") ;}
+         $('todo_listg_div').innerHTML=$('clone_todo_list').innerHTML;
+        $('clone_todo_list').remove();
     }
-   
+    remove_waiting_box();
 }
 function todo_list_share(p_note, p_dossier)
 {
diff --git a/include/template/todo_list_display.php 
b/include/template/todo_list_display.php
index 9427c2b..1970411 100644
--- a/include/template/todo_list_display.php
+++ b/include/template/todo_list_display.php
@@ -34,7 +34,8 @@ $is_public=new ICheckBox('p_public');
 $is_public->value='Y';
 $is_public->set_check($this->is_public);
 $dossier=Dossier::id();
-echo HtmlInput::title_box("Note","todo_list_div".$this->tl_id);
+$close_share=" if ( \$('shared_{$this->tl_id}') ){ 
\$('shared_{$this->tl_id}').remove();}";
+echo 
HtmlInput::title_box("Note","todo_list_div".$this->tl_id,'close',$close_share);
 ?>
 <form id="todo_form_<?php echo $this->tl_id?>" onsubmit="todo_list_save(<?php 
echo $this->tl_id?>);return false">
     <table>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]