1 files changed, 10 insertions, 26 deletions

diff --git a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
index a8942f7..4d4ac81 100644
--- a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
+++ b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
@@ -47,10 +47,12 @@ class SurveyGeoIP{
         echo '<p class="bold">'.$lang['srv_geoip_warning'].'</p>';

 

 

-		echo '<div>';

-        echo '<div class="floatLeft">';

+		echo '<div class="geoip_holder">';

+

         

 		// Izpis tabele frekvenc

+        echo '<div class="geoip_table_holder">';

+

 		echo '<table class="geoip_table">';

 		

 		// Prva vrstica

@@ -109,7 +111,7 @@ class SurveyGeoIP{
         // Google maps on right of table

         if(count($this->countriesLocationsData)>0){

 

-            echo '<div class="floatLeft" style="margin: 15px 0px 0px 50px;">';

+            echo '<div class="geoip_map_holder">';

 

             if(count($this->countriesLocationsData) > 1)

                 $this->displayNavigationMaps();

@@ -122,6 +124,8 @@ class SurveyGeoIP{
             

             echo '<script type="text/javascript">passMapDataRaw('.json_encode($cities).');googleMapsAPIProcedura(initializeMapGeneralForIPs);</script>';

         }

+        

+

         echo '</div>';

 	}

 	

@@ -248,29 +252,9 @@ class SurveyGeoIP{
         $countries = mb_convert_encoding($this->countriesLocationsData, "UTF-8", "ISO-8859-1");

         $cities = mb_convert_encoding($this->data['all']['all']['cities'], "UTF-8", "ISO-8859-1");

 

-        echo '<div class="secondNavigation">';

-        echo '<ul class="secondNavigation">';

-

-        echo'<li>';

-        echo '<a class="no-img active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>';

-        echo '<span class="label">' . $lang['srv_geoip_map_cities'] . '</span>';

-        echo '</a>';

-        echo'</li>';

-

-        #space

-        echo'<li class="space">';

-        echo'</li>';

-

-        echo'<li>';

-        echo '<a class="no-img" id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>';

-        echo '<span class="label">' . $lang['srv_geoip_map_countries'] . '</span>';

-        echo '</a>';

-        echo'</li>';

-

-        echo'</ul>';

+        echo '<div class="geoip_navigation">';

+        echo '  <a class="active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>'.$lang['srv_geoip_map_cities'].'</a>';

+        echo '  <a id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>'.$lang['srv_geoip_map_countries'].'</a>';

         echo '</div>';

-

-        echo '<br class="clr" />';

-        echo '<br class="clr" />';

     }

 }
\ No newline at end of file