Bugfixes

css/dariah.geobro.css

@@ -25,12 +25,6 @@ select, button, input {
     display: block;
     overflow-y: scroll;
 }
-.dropdownSelection {
-    width: 250px;
-}
-.dropdownMenu {
-    width: 250px;
-}
 #navbar {
     z-index: 10100;
 }

edit/js/dariah.workflow.conf.js

@@ -40,8 +40,8 @@ export const requiredColumnsGeolocation = ["Address", "Longitude", "Latitude", "
 export const requiredColumnsGeobrowser = ["Address", "TimeStamp", "TimeSpan:begin", "TimeSpan:end", "Longitude", "Latitude"];
 // columns with date format
 export const dateColumns = ["TimeStamp", "TimeSpan:begin", "TimeSpan:end"];
-// Mimetypes which pass check to get parsed into table.
-export const allowedMimeTypes = ["text/csv", "text/comma-separated-values", "application/vnd.dariahde.geobrowser.csv", "application/vnd.google-earth.kml+xml", "text/xml"]
+// Mimetypes which pass check to get parsed into table. Excel is important to support CSVs exported from Excel!
+export const allowedMimeTypes = ["text/csv", "text/comma-separated-values", "application/vnd.ms-excel", "application/vnd.dariahde.geobrowser.csv", "application/vnd.google-earth.kml+xml", "text/xml"]
 // CSV mimetype used for storing datasheets.
 export const csvStorageMimetype = 'application/vnd.dariahde.geobrowser.csv';
 

edit/js/dariah.workflow.js

@@ -511,24 +511,14 @@ export function openGeoBrowser(newWindow, coordValidation) {
     else {
         var val3 = checkCoordinates();
     }
-    // TODO Maybe jump to error message div directly here?
     if (! (val1 && val2 && val3) ) {
         return;
     }
-    // Check-for-beta-in-URL-workaround.
-    // TODO Handle in config or use current URL path!
-    var beta = "";
-    if (window.location.pathname.includes("beta")) {
-        beta = "/beta";
-    }
-    var url = host + beta + '?csv1=';
+    var geoBrowserPath = window.location.pathname.replace("/edit","");
+    var url = host + geoBrowserPath + '?csv1=';
     if (isOldStorageID(getDSID())) {
-        // TODO Do we really need to URIencode here?
-        //url += encodeURIComponent(oldStorageURL + dsid);
         url += oldStorageURL + getDSID();
     } else {
-        // TODO Do we need to URIencode here?
-        //url += encodeURIComponent(storageURL + dsid);
         url += storageURL + getDSID();
     }
 	if (newWindow) {

edit/js/dariah.workflow.table.js

@@ -226,7 +226,7 @@ export function checkColumnHeadersGeobrowser() {
 function findOrAlertCreatableColumn(arr, columnName) {
 	var id = $.inArray(columnName, arr[0]);
 	if (id < 0) {
-		var buttonId = "add"+columnName+"Button";
+		var buttonId = "add"+columnName.replace(":","_")+"Button";
 		var message = '<p>Column name <strong>“' + columnName + '“</strong> is missing. ' +
 			'You can either set an existing and matching cell header with this name, or you could create the missing column by clicking the ' +
 			'<button id='+buttonId+' class="btn btn-primary btn-small">Create this column</button> button. ' +

embed/index.html

@@ -52,7 +52,7 @@
 			var mapDiv = document.getElementById("mapContainerDiv");
 			var map = new WidgetWrapper();
 			var mapWidget = new MapWidget(map,mapDiv,{
-			mapTitle: "Publication place"
+			mapTitle: "Locations"
 			});
 			var timeDiv = document.getElementById("plotContainerDiv");
 			var time = new WidgetWrapper();

index.html

@@ -46,7 +46,7 @@
 					</ul>
 				</li>
                 <li>
-				    <a id="loggedin" title="Login or logout here – as you wish! You need to be logged in for loading non-public data from DARIAH-DE Storage that you are owner of."></a>
+				    <a id="loggedin" href="#" title="Login or logout here – as you wish! You need to be logged in for loading non-public data from DARIAH-DE Storage that you are owner of."></a>
 				</li>
 			</ul>
 			<ul class="nav">
@@ -114,9 +114,10 @@
 							<h2>Load overlay</h2>
 						</fieldset>
 					</div>
-					<div class="span4" title="Here you can find single references to the displayed datasets and an overall magnetic link to the current Geo-Browser view including all online datasets.">
+					<div class="span4" title="Here you can find single references to the displayed datasets. For online datasets, you will receive an overall magnetic link to the current Geo-Browser view.">
 						<fieldset style="position:relative;">
 							<h2>Dataset information</h2>
+							<p id = "noDataLoaded" style='margin-bottom:5px;'>(No data loaded)</p>
 							<div id="storytellingContainerDiv"></div>
 						</fieldset>
 					</div>
@@ -128,7 +129,6 @@
 					<br/>
 					<div id="tableContainerDiv" style="position:relative;"></div>
 				</div>
-                <!--<script src="./js/dariah.geobro.js"></script>-->
 			</div>
 			</div>
 			</div>
@@ -149,9 +149,6 @@
 				Your web browser must have JavaScript enabled in order for this application to display correctly.
 			</div>
 		</noscript>
-        <!-- javascript
-		================================================== -->
-		<!-- placed at the end of the document so the pages load faster -->
 		<script src="https://res.de.dariah.eu/dhrep/js/bootstrap.js"></script>
 		<script src="https://res.de.dariah.eu/globalmenu/globalmenu.js"></script>
     </body>

js/dariah.geobro.js

@@ -3,6 +3,8 @@
  */
 import {readToken, removeToken, setToken} from "./sessionStorageWrapper";
 import {getAuthInfo} from "../edit/js/dariah.storage";
+import {pdpURL} from "./dariah.geobro.conf";
+import {host} from "../edit/js/dariah.workflow.conf";
 init();
 
 /*
@@ -13,7 +15,7 @@ function init() {
     var mapDiv = document.getElementById("mapContainerDiv");
     var map = new WidgetWrapper();
     var mapWidget = new MapWidget(map,mapDiv,{
-        mapTitle: "Publication place"
+        mapTitle: "Locations"
     });
     var timeDiv = document.getElementById("plotContainerDiv");
     var time = new WidgetWrapper();
@@ -55,10 +57,10 @@ function checkLoginLogoutMenuGB() {
 
     if (readToken() != null) {
         getAuthInfo();
-        $('#loggedin').attr('href', 'javascript:logoutGB()');
+        $('#loggedin').off('click').on('click', function(){logoutGB();});
     } else {
         $('#loggedin').append('<i class="icon-signin icon-white"></i> Login');
-        $('#loggedin').attr('href', 'javascript:loginGB()');
+        $('#loggedin').off('click').on('click', function(){loginGB()});
     }
 }
 
@@ -68,7 +70,7 @@ function checkLoginLogoutMenuGB() {
  * NOTE Keep appended csv and kml params for GB!
  */
 function loginGB() {
-    window.location = pdpURL + window.location.protocol + "//" + window.location.hostname + window.location.pathname + window.location.search;
+    window.location = pdpURL + host + window.location.pathname + window.location.search;
 }
 
 /**

package-lock.json

 {
   "name": "dariahde-datasheet-editor",
-  "version": "3.6.10",
+  "version": "3.6.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "dariahde-datasheet-editor",
-      "version": "3.6.10",
+      "version": "3.6.13",
       "dependencies": {
         "clipboard": "^2.0.8",
         "handsontable": "^9.0.2",

package.json

 {
   "name": "dariahde-datasheet-editor",
-  "version": "3.6.10",
+  "version": "3.6.13",
   "private": true,
   "scripts": {
     "build:beta": "webpack --config webpack.config.dev.js",
     "build:release": "webpack --config webpack.config.prod.js",
-    "start": "webpack-dev-server --mode=development --config webpack.config.dev.js --open"
+    "start": "cd PLATIN && rake all && cd .. && webpack-dev-server --mode=development --config webpack.config.dev.js --open"
   },
   "devDependencies": {
     "copy-webpack-plugin": "^9.0.1",