Merge remote-tracking branch 'upstream/develop' into es

geonetwork · Mar 2, 2017 · ec758a2 · ec758a2
2 parents ce7c5f2 + abd3f9c
commit ec758a2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js
@@ -332,7 +332,6 @@
       try {
         var tokens = location.href.split('/');
         $scope.service = tokens[6].split('?')[0];
-        console.log($scope.service);
       } catch(e) {
         // console.log("Failed to extract current service from URL.");
       }

diff --git a/web-ui/src/main/resources/catalog/views/api/README.md b/web-ui/src/main/resources/catalog/views/api/README.md
@@ -0,0 +1,32 @@
+This folder contains a simple HTML page using the API mode.
+
+
+Configure a custom host to load the API:
+
+* In apache config add a new virtual host
+
+```
+<VirtualHost gnapi:80>
+    ServerName gnapi
+    DocumentRoot /data/dev/geonetwork/web-ui/src/main/resources/catalog/views/api/
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    <Directory /data/dev/geonetwork/web-ui/src/main/resources/catalog/>
+      Options Indexes FollowSymLinks
+      AllowOverride None
+      Require all granted
+    </Directory>
+</VirtualHost>
+
+```
+
+
+* In ```/etc/hosts``` add the new host
+
+```
+127.0.0.1 gnapi
+```
+
+Load ```http://gnapi```.