Changeset 193

Timestamp:

03/05/2009 12:49:51 AM (3 years ago)

Author:

cirrus

Message:

Added code needed for MacOSX widget (will be added later).
Removed unused variables in gmap javascript.

Location:

trunk

Files:

• includes/pages/search/search_suggest.php (modified) (1 diff)
• templates/basic/includes/pages/gmap/gmap_js.tpl (modified) (2 diffs)
• templates/basic/includes/pages/search/search_suggest.tpl (modified) (3 diffs)

trunk/includes/pages/search/search_suggest.php

@@ -32 +32 @@
                 global $db, $vars;
                 $q = get('q');
+                $widget = get('widget');
+                if(isset($widget) && $widget =="true") {
+                        $this->tpl['widget'] = "1";
+                        $this->tpl['url'] = $vars['site']['url'];
+                        $this->limit = 5;
+                } else {
+                        $this->tpl['widget'] = "0";
+                }
                 $i = 0;
 

trunk/templates/basic/includes/pages/gmap/gmap_js.tpl

@@ -262 +262 @@
 
 function makeMarkers(nodes, icon_image, icon_zoom) {
-        var markers_t = Array();
         var bounds = map.getBounds();
         for (var i = 0; i < nodes.length; i++) {
@@ -306 +305 @@
                         }
                         var marker = createMarker(point, html, icon);
-                        markers_t.push(marker);
                         markers[node_id] = true;
                         map.addOverlay(marker);

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

@@ -23 +23 @@
 {if $ip_search}
         {section name=ip loop=$ip_search}
-        <tr onclick="window.location.href='{$ip_search[ip].href}'" onmouseover="hover('mouse',this)" style="width: 100%">
+        <tr {if $widget=="0"}onclick="window.location.href='{$ip_search[ip].href}'" onmouseover="hover('mouse',this)"{else}onclick="open_url('{$url}{$ip_search[ip].href}');" onmouseover="this.style.background='orange';" onmouseout="this.style.background='transparent';" style="cursor: pointer;"{/if} style="width: 100%">
                 <td>{$ip_search[ip].ip_start}</td>
                 <td align="right">(#{$ip_search[ip].id})</td>
@@ -34 +34 @@
 {elseif $dns_search}
         {section name=zone loop=$dns_search}
-        <tr onclick="window.location.href='{$dns_search[zone].href}'" onmouseover="hover('mouse',this)" style="width: 100%">
+        <tr {if $widget=="0"}onclick="window.location.href='{$dns_search[zone].href}'" onmouseover="hover('mouse',this)"{else}onclick="open_url('{$url}{$dns_search[zone].href}');" onmouseover="this.style.background='orange';" onmouseout="this.style.background='transparent';" style="cursor: pointer;"{/if} style="width: 100%">
                 <td>{$dns_search[zone].name}</td>
                 <td align="right">(#{$dns_search[zone].id})</td>
@@ -45 +45 @@
 {else}
         {section name=node loop=$nodes_search}
-        <tr onclick="window.location.href='{$nodes_search[node].href}'" onmouseover="hover('mouse',this)" style="width: 100%">
+        <tr {if $widget=="0"}onclick="window.location.href='{$nodes_search[node].href}'" onmouseover="hover('mouse',this)"{else}onclick="open_url('{$url}{$nodes_search[node].href}');" onmouseover="this.style.background='orange';" onmouseout="this.style.background='transparent';" style="cursor: pointer;"{/if} style="width: 100%">
                 <td>{$nodes_search[node].name}</td>
                 <td align="right">(#{$nodes_search[node].id})</td>