Merge branch 'master' of http://dev.restore.ovi.cnr.it:3000/TEAMOVI/Mockup

Luogo.html

@@ -112,13 +112,13 @@
 								<div class="col-12 mb-3">
 									<ul class="nav nav-tabs">
 										<li class="nav-item">
-											<button type="button" id="btn_info" class="nav-link" onClick="open_info();">Info</button>
+											<button type="button" id="btn_info" class="nav-link" data-toggle="tab" onClick="open_info();">Info</button>
 										</li>
 										<li class="nav-item">
-											<button type="button" id="btn_toponimi" class="nav-link" onClick="open_toponimi();">Toponimi associati</button>
+											<button type="button" id="btn_toponimi" class="nav-link" data-toggle="tab" onClick="open_toponimi();">Toponimi associati</button>
 										</li>
 										<li class="nav-item">
-											<button type="button" id="btn_riferimenti" class="nav-link" onClick="open_riferimenti();">Riferimenti</button>
+											<button type="button" id="btn_riferimenti" class="nav-link" data-toggle="tab" onClick="open_riferimenti();">Riferimenti</button>
 										</li>
 									</ul>
 								</div>

css/landing-page.css

@@ -459,28 +459,6 @@ table a:hover {
     display: block;
 }
 
-.modal {
-    display: none; /* Hidden by default */
-    position: fixed; /* Stay in place */
-    z-index: 2000; /* Sit on top */
-    padding-top: 100px; /* Location of the box */
-    left: 0;
-    top: 0;
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    overflow: auto; /* Enable scroll if needed */
-    background-color: rgb(0, 0, 0); /* Fallback color */
-    background-color: rgba(0, 0, 0, 0.5); /* Black w/ opacity */
-}
-
-/* Modal Content */
-.modal-content {
-    background-color: #fefefe;
-    margin: auto;
-    padding: 20px;
-    width: 80%;
-}
-
 #info_link {
     width: 100%;
 }
@@ -493,24 +471,6 @@ table a:hover {
     width: 100%;
 }
 
-/* The Close Button */
-.close {
-    color: #aaaaaa;
-    float: none;
-    font-size: 35px;
-    font-weight: bold;
-    text-align: right;
-    margin-top: -13px;
-    margin-bottom: 13px;
-}
-
-.close:hover,
-.close:focus {
-    color: #000;
-    text-decoration: none;
-    cursor: pointer;
-}
-
 .tab {
     display: none; /* Hidden by default */
     position: fixed; /* Stay in place */
@@ -558,23 +518,6 @@ table a:hover {
     cursor: pointer;
 }
 
-#myInput {
-    width: 80%;
-    margin-left: auto;
-    margin-right: auto;
-    background-color: #e9e9e9;
-    padding: 20px;
-    border-radius: 10px;
-    margin-bottom: 20px;
-}
-
-#copy_btn {
-    width: 100%;
-    max-width: 200px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
 #wb_intro {
     max-width: 900px;
     margin: 0 auto;

css/lettera.css

@@ -424,55 +424,6 @@ header.masthead {
   color: #fff;
 }
 
-.modal {
-  display: none; /* Hidden by default */
-  position: fixed; /* Stay in place */
-  z-index: 1; /* Sit on top */
-  padding-top: 100px; /* Location of the box */
-  left: 0;
-  top: 0;
-  width: 100%; /* Full width */
-  height: 100%; /* Full height */
-  overflow: auto; /* Enable scroll if needed */
-  background-color: rgb(0,0,0); /* Fallback color */
-  background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-}
-
-/* Modal Content */
-.modal-content {
-  background-color: #fefefe;
-  margin: auto;
-  padding: 20px;
-  border: 1px solid #888;
-  width: 80%;
-}
-
-#myInput {
-  width: 80%;
-    margin-left: auto;
-    margin-right: auto;
-    background-color: #e9e9e9;
-    padding: 20px;
-    text-align: justify;
-    border-radius: 10px;
-    margin-bottom: 20px;
-}
-
-/* The Close Button */
-.close {
-  color: #aaaaaa;
-  float: right;
-  font-size: 28px;
-  font-weight: bold;
-}
-
-.close:hover,
-.close:focus {
-  color: #000;
-  text-decoration: none;
-  cursor: pointer;
-}
-
 /* The Back Button */
 .back {
   color: #000;
@@ -489,9 +440,3 @@ header.masthead {
   text-decoration: none;
   cursor: pointer;
 }
-
-#copy_btn {
-  width:20%;
-  margin-left:auto;
-  margin-right:auto;
-}

css/place_people.css

@@ -159,6 +159,7 @@ header.masthead {
 .btn-text {
   font-size: 8px;
   text-transform: uppercase;
+  margin-bottom: 0;
 }
 
 .img-logo {

index.html

@@ -97,7 +97,7 @@
     <!-- Icons Grid -->
     <section class="section features-icons bg-white text-center">
       <div class="container">
-        <div class="row sm:mb-5">
+        <div class="row mb-sm-5">
           <div onclick="location.href='ricerca.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
@@ -106,7 +106,7 @@
               <h3 class="title">Interfaccia di Ricerca</h3>
             </div>
           </div>
-          <div class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/indice.png" />
@@ -114,7 +114,7 @@
               <h3 class="title">Indici</h3>
             </div>
           </div>
-          <div class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/percorsi.png" />
@@ -123,8 +123,8 @@
             </div>
           </div>
         </div>
-        <div class="row sm:mb-5">
-          <div onclick="location.href='http://restore.ovi.cnr.it/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+        <div class="row mb-sm-5">
+          <div onclick="location.href='http://restore.ovi.cnr.it/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/progetto.png" />
@@ -132,7 +132,7 @@
               <h3 class="title">Progetto</h3>
             </div>
           </div>
-          <div onclick="location.href='standard.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div onclick="location.href='standard.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/standard.png" />
@@ -140,7 +140,7 @@
               <h3 class="title">Standard</h3>
             </div>
           </div>
-          <div onclick="location.href='sparql.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div onclick="location.href='sparql.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/sparql.png" />
@@ -150,7 +150,7 @@
           </div>
         </div>
         <div class="row">
-          <div onclick="location.href='download.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div onclick="location.href='download.html';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/database.png" />
@@ -158,7 +158,7 @@
               <h3 class="title">Scarica i dataset</h3>
             </div>
           </div>
-          <div onclick="location.href='http://ckan.restore.ovi.cnr.it/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div onclick="location.href='http://ckan.restore.ovi.cnr.it/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/ckan.png" />
@@ -166,7 +166,7 @@
               <h3 class="title">Visualizza risorse</h3>
             </div>
           </div>
-          <div onclick="location.href='http://dev.restore.ovi.cnr.it/lodlive/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 sm:mb-0">
+          <div onclick="location.href='http://dev.restore.ovi.cnr.it/lodlive/';" style="cursor: pointer;" class="col-sm-4 index-btn mb-3 mb-sm-0">
             <div class="features-icons-item">
               <div class="features-icons-icon d-flex">
                 <img class="ico-img" src="img/rdf.png" />

js/lettera.js

@@ -181,8 +181,8 @@ function schedaASPO(info){
 function schedaEdizione(info){
 	$("#myModal").empty();
 	$("#myModal").css("display", "block");
-	$('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" + 
-		info + "</div><button id='copy_btn' class='btn btn-primary btn-lg' onclick='myFunction()'>Copia</button>");
+	$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
+		info + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 		
 }

js/map.js

@@ -892,7 +892,7 @@ $(document).on("click", ".hyp", function (ev) {
   var link = this.id;
   $("#myModal").empty();
   $("#myModal").css("display", "block");
-  $('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" +
+  $('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" +
     link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
   
@@ -934,7 +934,7 @@ $(document).on("click", ".cit", function (ev) {
   //$('#myModal').text("");
   $("#myModal").empty();
   $("#myModal").css("display", "block");
-  $('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" + 
+  $('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
     author + " " + year + ", accesso effettuato: " + today + ", &lt;" + link + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 });

js/method.js

@@ -179,7 +179,7 @@ $(document).ready(function () {
 		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
-		$('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" +
+		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" +
 			link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 		
@@ -229,7 +229,7 @@ $(document).ready(function () {
 		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
-		$('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" + 
+		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
 			author + " " + year + ", accesso effettuato: " + today + ", &lt;" + link + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 		

js/people.js

@@ -830,7 +830,7 @@ $(document).on("click", ".hyp", function (ev) {
   var link = this.id;
   $("#myModal").empty();
   $("#myModal").css("display", "block");
-  $('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" +
+  $('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" +
     link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 });
@@ -879,7 +879,7 @@ $(document).on("click", ".cit", function (ev) {
   //$('#myModal').text("");
   $("#myModal").empty();
   $("#myModal").css("display", "block");
-  $('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" + 
+  $('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
     author + " " + year + ", accesso effettuato: " + today + ", &lt;" + link + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 });

js/search.js

@@ -517,7 +517,7 @@ $(document).ready(function () {
 		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
-		$('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" +
+		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" +
 			link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 		
@@ -607,7 +607,7 @@ $(document).ready(function () {
 		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
-		$('#myModal').append("<div class='modal-content'><span class='close'>&times;</span><div id='myInput'>" + 
+		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
 			author + " " + year + ", accesso effettuato: " + today + ", &lt;" + link + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
 
 		

lettera.html

@@ -95,10 +95,10 @@
 
 								<ul class="nav nav-tabs" id="choice_buttons">
 									<li class="nav-item infoChoice">
-										<button type="button" class="nav-link active" onClick="show_OVI()">OVI</button>
+										<button type="button" class="nav-link active" data-toggle="tab" onClick="show_OVI()">OVI</button>
 									</li>
 									<li class="nav-item infoChoice">
-										<button type="button" class="nav-link" onClick="show_ASPO()">ASPO</button>
+										<button type="button" class="nav-link" data-toggle="tab" onClick="show_ASPO()">ASPO</button>
 									</li>
 								</ul>
 				

scss/_buttons.scss

@@ -18,4 +18,14 @@
 
 a.btn-icon {
     color: #000;
+}
+
+.btn-icon {
+    display: inline-block;
+    text-align: center;
+    &:hover {
+        .btn-text {
+            text-decoration: underline;
+        }
+    }
 }

scss/_global.scss

@@ -123,6 +123,14 @@ a {
     padding: 5px 13px;
 }
 
+.headInfo {
+    margin-bottom: 20px;
+    h2 {
+        font-size: 25px;
+        font-weight: 400;
+    }
+}
+
 #map_buttons a {
     color: #30383f;
     font-size: 15px;
@@ -157,4 +165,4 @@ a {
             color: black;
         }
     }
-}
+}

scss/_modals.scss

@@ -0,0 +1,52 @@
+.modal {
+    display: none;
+    position: fixed;
+    z-index: 2000;
+    padding-top: 100px;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgb(0, 0, 0);
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.modal-content {
+    background-color: #fefefe;
+    margin: auto;
+    padding: 20px;
+    width: 80%;
+    #myInput {
+        width: 80%;
+        margin-left: auto;
+        margin-right: auto;
+        background-color: #e9e9e9;
+        padding: 20px;
+        border-radius: 10px;
+        margin-bottom: 20px;
+    }
+    .modal-close {
+        text-align: right;
+        margin-top: -13px;
+        margin-bottom: 13px;
+    }
+    .close {
+        color: #aaaaaa;
+        float: none;
+        font-size: 35px;
+        font-weight: bold;
+        &:hover,
+        &:focus {
+            color: #000;
+            text-decoration: none;
+            cursor: pointer;
+        }
+    }
+    .btn {
+        width: 100%;
+        max-width: 200px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+}

scss/styles.scss

@@ -13,3 +13,4 @@
 @import "testimonials.scss";
 @import "call-to-action.scss";
 @import "footer.scss";
+@import "modals.scss";

standard.html

@@ -152,10 +152,10 @@
                                 <div class="col" id="mappingChoiceSection">
                                     <ul class="nav nav-tabs" id="mapping_buttons">
                                         <li class="nav-item mappingChoice">
-                                            <button type="button" class="nav-link active" onClick="show_ASPO();">EAD to CIDOC</button>
+                                            <button type="button" class="nav-link active" data-toggle="tab" onClick="show_ASPO();">EAD to CIDOC</button>
                                         </li>
                                         <li class="nav-item mappingChoice">
-                                            <button type="button" class="nav-link" onClick="show_MPP();">ICCD to CIDOC</button>
+                                            <button type="button" class="nav-link" data-toggle="tab" onClick="show_MPP();">ICCD to CIDOC</button>
                                         </li>
                                     </ul>
                                     <div id="mappingTables">