Changeset 157 for trunk

Timestamp:

03/12/2006 07:16:30 PM (6 years ago)

Author:

cirrus

Message:

Add: Links on nodes in google earth do not display the google map.
Bugfix: foreach array bug in search_suggest.
Changes: Javascript changes on the search_suggest page.
Add: Onkeydown javascript on the search input box.
Bugfix: Header sending location changed.

Location:

trunk

Files:

• includes/main.php (modified) (2 diffs)
• includes/pages/gearth/gearth_download.php (modified) (1 diff)
• includes/pages/search/search_suggest.php (modified) (1 diff)
• templates/basic/includes/main_menu.tpl (modified) (1 diff)
• templates/basic/includes/pages/search/search_suggest_js.tpl (modified) (4 diffs)

trunk/includes/main.php

@@ -56 +56 @@
                 $this->html->head->add_title($lang['site_title']);
                 $this->html->head->add_meta("text/html; charset=".$lang['charset'], "", "Content-Type");
+                header("Content-Type: text/html; charset=".$lang['charset']);
                 
                 $this->html->body->tpl['center'] = $this->center->output();
@@ -63 +64 @@
                 if ($this->message->show) $this->html->body->tpl['message'] = $this->message->output();
                 
-                header("Content-Type: text/html; charset=".$lang['charset']);
                 return $this->html->output();
         }

trunk/includes/pages/gearth/gearth_download.php

@@ -72 +72 @@
                                 }
                                 if ($value['total_clients'] != 0) $xml2 .= $lang['clients'].": ".$value['total_clients']."<br />";
-                                //if ($value['total_client_on_ap'] != 0) $xml2 .= "Client on: ".$value['total_client_on_ap']." Access Point(s)<br />";
-                                $xml2 .= "<a href=\"".$vars['site']['url'].makelink(array("page" => "nodes", "node" => $value['id']))."\">".$lang['node_page']."</a><br />";
+                                $xml2 .= "<a href=\"".$vars['site']['url'].makelink(array("page" => "nodes", "node" => $value['id'], "show_map" => "no"))."\">".$lang['node_page']."</a><br />";
                                 $xml2 .= "</description>";
                                 $xml2 .= "<name>".htmlspecialchars($value['nodes__name'], ENT_COMPAT, $lang['charset'])."</name>\n";

trunk/includes/pages/search/search_suggest.php

@@ -44 +44 @@
                                                                                 'nodes.id ASC',
                                                                                 $this->limit);
-                        foreach ($this->tpl['nodes_search'] as $key => $value) {
+                        foreach ((array)$this->tpl['nodes_search'] as $key => $value) {
                                 $this->tpl['nodes_search'][$key]['href'] = makelink(array("page" => "nodes", "node" => $this->tpl['nodes_search'][$key]['id']));
                         }

trunk/templates/basic/includes/main_menu.tpl

@@ -82 +82 @@
                                                                                 </tr>
                                                                                 <tr>
-                                                                                        <td>                    
+                                                                                        <td>
                                                                                                 <div>
-                                                                                                <input type="text" id="q" name="q" autocomplete="off" onfocus="hover('',this.value);" onkeyup="hover(event.keyCode,this.value);"  onblur="setTimeout('hideSearch()',500); hov=0;" />
+                                                                                                <input type="text" id="q" name="q" autocomplete="off" onkeydown="if(hov!=-1) this.value = origval;" onfocus="hover('',this.value);" onkeyup="hover(event.keyCode,this.value);"  onblur="setTimeout('hideSearch()',500); hov=0;" />
                                                                                                 </div>
                                                                                                 <div align="left" id="searchResult" name="searchResult" style="font-family:Arial; font-size:12px; background-color: white; border:#000000 dashed 1px; padding:0px; display: none; position: absolute; width: 150px;"></div>

trunk/templates/basic/includes/pages/search/search_suggest_js.tpl

@@ -57 +57 @@
                         document.getElementById('searchResult').style.display = 'block';
                         // Write the contents of this URL to the searchResult layer
-                        if (req.responseText == '')
-                        searchResult.style.display = 'none';
+                        if (origval == null) {
+                                document.getElementById('searchResult').style.display = 'none';
+                        }
                         else
-                        getObject("searchResult").innerHTML = req.responseText;
+                                getObject("searchResult").innerHTML = req.responseText;
                 }
         }
@@ -82 +83 @@
 function hover(ev,val) {
         test = document.getElementById('searchResult').getElementsByTagName('tr');
-
+        if(document.getElementById('q').value == "") origval = null;
         if(ev == 38 && hov != -1){
+                if(document.getElementById('searchResult').style.display == 'none')
+                        document.getElementById('searchResult').style.display = 'block';
                 hov--;
                 if(hov<0) {
@@ -98 +101 @@
                         }
                 }
+                document.getElementById('q').select();
         }
         else if(ev == 40) {
+                if(document.getElementById('searchResult').style.display == 'none')
+                        document.getElementById('searchResult').style.display = 'block';
                 hov++;
                 if(hov==test.length) hov=test.length-1;
@@ -112 +118 @@
                         }
                 }
+                document.getElementById('q').select();
         }
         else if(ev == 13 && hov != -1) {
                 document.getElementById('searchResult').style.display = 'none';
+        }
+        else if(ev == 27) {
+                document.getElementById('searchResult').style.display = 'none';
+                document.getElementById('q').select();
         }
         else if(ev == "mouse") {