docker/sna
3
0
Fork 0
Code Issues Releases Wiki Activity

Uploaded missing updates in main view.

Browse Source
This commit is contained in:
Nermin 2018-09-18 16:36:32 +02:00
parent 9e1e5d69b6
commit 3069da030f
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sna/application/views/home/index_view.php
View File

@ -139,7 +139,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
var id_word=$("#words option:selected").val(); var id_word=$("#words option:selected").val();
console.log(id_word); //console.log(id_word);
$.ajax({ $.ajax({
type: "POST", type: "POST",
@ -151,10 +151,10 @@ Slovenski narečni atlas / Slovenian dialectal atlas
}, },
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
console.log(data); //console.log(data);
if(data.status=='ok') if(data.status=='ok')
{ {
console.log(data); //console.log(data);
//update modals //update modals
$('#modals').html(data.view_modals); $('#modals').html(data.view_modals);
@ -279,7 +279,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
} }
let name; let name;
console.log('star: ', transcription.star); //console.log('star: ', transcription.star);
if(transcription.star === '1'){ if(transcription.star === '1'){
name = transcription.short_name + '*'; name = transcription.short_name + '*';
} }
@ -313,7 +313,7 @@ Slovenski narečni atlas / Slovenian dialectal atlas
} }
}, },
error: function(e){ error: function(e){
console.log(e); //console.log(e);
alert('Prišlo je do napake pri nalaganju podatkov. Prosimo poskusite ponovno!'); alert('Prišlo je do napake pri nalaganju podatkov. Prosimo poskusite ponovno!');
} }
}); });

1
sna/application/views/home/legend_view.php
View File

@ -28,6 +28,7 @@ if(isset($legend) and $legend)
<div class="info-panel-image-borders legend"> <div class="info-panel-image-borders legend">
<div class="legend_title text-left" style="font-size:10px"> <div class="legend_title text-left" style="font-size:10px">
<strong><span>Legenda</span></strong> <strong><span>Legenda</span></strong>
<span style="font-size: 20px">* - </span>
</div> </div>
<table class="table" style="font-size:10px"> <table class="table" style="font-size:10px">
<thead> <thead>

35
sna/application/views/home/map_view.php
View File

@ -20,9 +20,13 @@ Slovenski narečni atlas / Slovenian dialectal atlas
?> ?>
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <script src="//d3js.org/d3.v4.min.js"></script>
width="920px" height="530px" viewBox="0 0 1100 720" enable-background="new 0 0 1100 720" <script src="//d3js.org/topojson.v1.min.js"></script>
<svg style="border: 2px solid; border-color: #cbcbcb; margin: auto" version="1.1" class="img-responsive" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 1100 720" enable-background="new 0 0 1100 720"
xml:space="preserve"> xml:space="preserve">
<g id="main">
<!-- width="1111.652px" height="719.964px" - originalna velikost--> <!-- width="1111.652px" height="719.964px" - originalna velikost-->
<style type="text/css"> <style type="text/css">
#test { #test {
@ -11323,10 +11327,27 @@ Slovenski narečni atlas / Slovenian dialectal atlas
<use xlink:href="#pins1" x=381 y=370></use> <use xlink:href="#pins1" x=381 y=370></use>
--> -->
</g> </g>
</g>
</svg> </svg>
<div id="legend" style="width: 180px; height: 240px; position: absolute; top: 260px; right: 0px;">
<?
$this->load->view('home/legend_view.php'); <script>
?>
</div> var svg = d3.select("svg")
.attr("width", "90%");
var zoomLayer = d3.select("#main");
var zoomed = function() {
zoomLayer.attr("transform", d3.event.transform);
}
svg.call(d3.zoom()
.scaleExtent([1, 6])
.translateExtent([[-300, -400], [1000, 800]])
.on("zoom", zoomed));
</script>