may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popravki ip lokacija

Browse Source
This commit is contained in:
pero1203 2022-06-20 10:24:21 +02:00
parent bf027e35ef
commit e943e7cc7b
4 changed files with 81 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
View File

@ -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="displayNone">';
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" />';
}
}

29
public/css/admin_new.css
View File

@ -13302,6 +13302,35 @@ div.drop_setting_transition {
background-color: #F8F8F8;
}
/*
Status - ip lokacija
*/
.page_geoip_location .geoip_holder {
display: flex;
margin: 16px 0 0 0;
}
.page_geoip_location .geoip_holder .geoip_table_holder {
width: 100%;
}
.page_geoip_location .geoip_holder .geoip_table_holder .geoip_table {
width: 100%;
margin: 0;
}
.page_geoip_location .geoip_holder .geoip_map_holder {
margin: 0 0 0 32px;
}
.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation {
display: flex;
margin-bottom: 16px;
}
.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a {
margin-right: 16px;
color: #808080;
}
.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a:hover, .page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a.active {
color: #1E88E5;
}
/*
Branching ikone, radio, checkboxi...
*/

40
resources/sass/admin_new/pages/survey_status/geoip.scss Normal file
View File

@ -0,0 +1,40 @@
/*
Status - ip lokacija
*/
.page_geoip_location{
.geoip_holder{
display: flex;
margin: 16px 0 0 0;
.geoip_table_holder {
width: 100%;
.geoip_table {
width: 100%;
margin: 0;
}
}
.geoip_map_holder{
margin: 0 0 0 32px;
.geoip_navigation{
display: flex;
margin-bottom: 16px;
a{
margin-right: 16px;
color: $very-dark-gray2;
&:hover,
&.active{
color: $blue;
}
}
}
}
}
}

3
resources/sass/admin_new/pages/survey_status/survey_status.scss
View File

@ -1,3 +1,4 @@
@import "summary";
@import "nonresponse";
@import "status_advanced";
@import "status_advanced";
@import "geoip";