Author: rhari
Date: Thu May  3 13:16:53 2007
New Revision: 403

URL: http://svn.gna.org/viewcvs/phplinker?rev=403&view=rev
Log:
#208 #205 #209

Modified:
    trunk/smarty/default/templates/admin/category.tpl
    trunk/www/admin/category.php
    trunk/www/js/drag-drop-folder-tree.js

Modified: trunk/smarty/default/templates/admin/category.tpl
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/smarty/default/templates/admin/category.tpl?rev=403&r1=402&r2=403&view=diff
==============================================================================
--- trunk/smarty/default/templates/admin/category.tpl (original)
+++ trunk/smarty/default/templates/admin/category.tpl Thu May  3 13:16:53 2007
@@ -43,6 +43,33 @@
 var deleteIds = "";
 
 
//******************************************************************************
+
+/***********************************************
+ * Disable "Enter" key in Form script- By Nurul Fadilah([EMAIL PROTECTED])
+ * This notice must stay intact for use
+ * Visit http://www.dynamicdrive.com/ for full source code
+ ***********************************************/
+
+function handleEnter (field, event) {
+//     alert(field.name);
+    var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : 
event.charCode;
+    if (keyCode == 13) {
+       if (field.name == 'tagname'){
+           addTag(field.value);
+       }
+
+       if (field.name == 'categname'){
+           addCateg(field.value);
+       }
+       var i;
+       for (i = 0; i < field.form.elements.length; i++)
+           if (field == field.form.elements[i])
+               break;
+       return false;
+    }
+    else
+       return true;
+}
 
        // Use something like this if you want to save data by Ajax.
        function saveMyTree()
@@ -219,7 +246,7 @@
          Nodenew.appendChild(aTag);
 
 //       //Recupération du Noeud "position"
-         var Node = document.getElementById("tag_tree");
+         var Node = document.getElementById("root_tag");
 
          Node.style.display='block';
 
@@ -262,9 +289,7 @@
       {$categ_ul_li}
     </td>
     <td width="50%">
-      <ul id="tag_tree" class="dhtmlgoodies_tree">
     {$tag_ul_li}
-      </ul>
     </td>
   </tr>
   {if $level != 'moderator'}
@@ -272,14 +297,14 @@
     <td>
       <form>
        <input type="text" value=""
-       name="categname" id="inputcateg"><input type="button" value="+" 
onclick="javascript:addCateg(document.getElementById('inputcateg').value);">
+       name="categname" id="inputcateg" onkeypress="return handleEnter(this, 
event)"><input type="button" value="+" 
onclick="javascript:addCateg(document.getElementById('inputcateg').value);">
 <!--  <input type="button" onclick="saveMyTree()" value="Save"> -->
   <input type="button" onclick="saveCateg()" value="Save">
       </form>
     </td>
     <td>
       <form>
-       <input type="text" value="" name="tagname" id="inputtag"><input 
type="button" value="+" 
onclick="javascript:addTag(document.getElementById('inputtag').value);">
+       <input type="text" value="" name="tagname" id="inputtag" 
onkeypress="return handleEnter(this, event)"><input type="button" value="+" 
onclick="javascript:addTag(document.getElementById('inputtag').value);">
       </form>
     </td>
   </tr>

Modified: trunk/www/admin/category.php
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/www/admin/category.php?rev=403&r1=402&r2=403&view=diff
==============================================================================
--- trunk/www/admin/category.php (original)
+++ trunk/www/admin/category.php Thu May  3 13:16:53 2007
@@ -66,7 +66,7 @@
          noDrag=\"true\" noSiblings=\"true\"
          noDelete=\"true\"
          noRename=\"true\">
-             <a href=\"#\">Root</a>";
+             <a href=\"#\">Cat&eacute;gories</a>";
 
   $categ_ul_li .="<ul>";
 for ($i=0;$i<sizeof($tree_categs);$i++){
@@ -84,7 +84,7 @@
           >
                  <a href=\"#\"
                    title=\"id : ".$tree_categs[$i]['id']."\"
-                 ><font 
color=\"".$color."\">".$tree_categs[$i]['name']."</font></a>";
+                 >".str_replace(" ", "&nbsp;", 
$tree_categs[$i]['name'])."</a>";
 
 // onclick=\"javascript:alert(parentNode.getAttribute('id_ad_tag'));\"
 
@@ -124,6 +124,14 @@
 ?>
 <?
 $tag_ul_li = "";
+$tag_ul_li .=  "<ul id=\"tag_tree\" class=\"dhtmlgoodies_tree\">";
+$tag_ul_li .="<li id=\"root_tag\"
+         noDrag=\"true\" noSiblings=\"true\"
+         noDelete=\"true\"
+         noRename=\"true\">
+             <a href=\"#\">Tags</a>";
+
+  $tag_ul_li .="<ul>";
 $tag_ul_li .= "<li id=\"tag_0\" noChildren=\"true\" is_tag=\"true\" title=\"id 
: 0\"><a href=\"#\">default (uncategorized)</a></li>";
 
 $tags = linker_get_tags ();
@@ -137,6 +145,7 @@
                                                                        
title=\"id
    : ".$tag['id']."\"><a href=\"#\">".$tag['description']."</a></li>";
 }
+$tag_ul_li .= "</ul></li></ul>";
 ?>
 <?
 linker_tpl("categ_ul_li" , $categ_ul_li);

Modified: trunk/www/js/drag-drop-folder-tree.js
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/www/js/drag-drop-folder-tree.js?rev=403&r1=402&r2=403&view=diff
==============================================================================
--- trunk/www/js/drag-drop-folder-tree.js (original)
+++ trunk/www/js/drag-drop-folder-tree.js Thu May  3 13:16:53 2007
@@ -846,7 +846,7 @@
                        inputObj.style.display='none';
                        inputObj.nextSibling.style.visibility='visible';
                        if(inputObj.value.length>0){
-                               inputObj.nextSibling.innerHTML = inputObj.value;
+                           inputObj.nextSibling.innerHTML = 
inputObj.value.replace(/ /g, "&nbsp;");
                                // Send changes to the server.
                                if (JSTreeObj.renameState != 
JSTreeObj.RENAME_STATE_BEGIN) {
                                        return;
@@ -914,7 +914,7 @@
                        JSTreeObj.renameState = JSTreeObj.RENAME_STATE_CANCELD;
                        if(!inputObj && this)inputObj = this;
                        inputObj.value = JSTreeObj.helpObj.innerHTML;
-                       inputObj.nextSibling.innerHTML = 
JSTreeObj.helpObj.innerHTML;
+                       inputObj.nextSibling.innerHTML = 
JSTreeObj.helpObj.innerHTML.replace(/ /g, "&nbsp;");
                        inputObj.style.display = 'none';
                        inputObj.nextSibling.style.visibility = 'visible';
                }
@@ -935,6 +935,7 @@
                        var textBox = document.createElement('INPUT');
                        textBox.className = 'folderTreeTextBox';
                        textBox.value = obj.innerHTML;
+                       textBox.value = textBox.value.replace(/&nbsp;/g, " ");
                        obj.parentNode.insertBefore(textBox,obj);
                        textBox.id = 'textBox' + 
obj.parentNode.id.replace(/[^0-9]/gi,'');
                        textBox.onblur = this.__saveTextBoxChanges;
@@ -947,6 +948,7 @@
                        JSTreeObj.renameState = JSTreeObj.RENAME_STATE_BEGIN;
                        obj.style.visibility = 'hidden';
                        obj.previousSibling.value = obj.innerHTML;
+                       obj.previousSibling.value = 
obj.previousSibling.value.replace(/&nbsp;/g, " ");
                        obj.previousSibling.style.display = 'inline';
                        obj.previousSibling.select();
                }
@@ -1064,6 +1066,9 @@
                                    folderImg.src = this.imageFolder + 
"folder_"  + menuItems[no].getAttribute('id_ad_tag') + ".gif";
 //                                 alert(folderImg.src);
                                }
+                               if (menuItems[no].id == 'root_tag'){
+                                   folderImg.src = this.imageFolder + 
"sheet_0.gif";
+                               }
                                if (menuItems[no].getAttribute('is_tag') == 
'true'){
                                    folderImg.src = this.imageFolder + "sheet_" 
 + menuItems[no].id.substring(4) + ".gif";
 //                                 alert(folderImg.src);


_______________________________________________
PHPLinker-commits mailing list
[email protected]
https://mail.gna.org/listinfo/phplinker-commits

Reply via email to