Merge amsl.technology into OntoWiki

.gitignore

@@ -37,3 +37,6 @@ build/
 # vagrant stuff
 Vagrantfile
 .vagrant
+
+# export folder
+dumps/

.gitmodules

@@ -1,6 +1,48 @@
 [submodule "libraries/RDFauthor"]
 	path = libraries/RDFauthor
-	url = git://github.com/AKSW/RDFauthor.git
+	url = https://github.com/amsl-project/RDFauthor.git
 [submodule "libraries/Erfurt"]
 	path = libraries/Erfurt
-	url = git://github.com/AKSW/Erfurt.git
+	url = https://github.com/amsl-project/Erfurt.git
+[submodule "extensions/contextinfo"]
+	path = extensions/contextinfo
+	url = https://github.com/AKSW/contextinfo.ontowiki.git
+[submodule "extensions/imagehelper"]
+	path = extensions/imagehelper
+	url = https://github.com/amsl-project/imagehelper.ontowiki.git
+[submodule "extensions/issnimporter"]
+	path = extensions/issnimporter
+	url = https://github.com/amsl-project/issnimporter.ontowiki.git
+[submodule "extensions/fulltextsearch"]
+	path = extensions/fulltextsearch
+	url = https://github.com/amsl-project/fulltextsearch.ontowiki.git
+[submodule "extensions/listexporter"]
+	path = extensions/listexporter
+	url = https://github.com/amsl-project/listexporter.ontowiki.git
+[submodule "extensions/counterimporter"]
+	path = extensions/counterimporter
+	url = https://github.com/amsl-project/counterimporter.ontowiki.git
+[submodule "extensions/jsloader"]
+	path = extensions/jsloader
+	url = https://github.com/amsl-project/jsloader.ontowiki.git
+[submodule "extensions/statements"]
+	path = extensions/statements
+	url = https://github.com/amsl-project/statements.ontowiki.git
+[submodule "extensions/files"]
+	path = extensions/files
+	url = https://github.com/amsl-project/files.ontowiki.git
+[submodule "extensions/linkandcreate"]
+	path = extensions/linkandcreate
+	url = https://github.com/amsl-project/linkandcreate.ontowiki.git
+[submodule "sample-data"]
+	path = sample-data
+	url = https://github.com/amsl-project/sample-data.git
+[submodule "extensions/jobcenter"]
+	path = extensions/jobcenter
+	url = https://github.com/amsl-project/jobcenter.ontowiki.git
+[submodule "extensions/template"]
+	path = extensions/template
+	url = https://github.com/amsl-project/template.ontowiki.git
+[submodule "extensions/deadlinehelper"]
+	path = extensions/deadlinehelper
+	url = https://github.com/amsl-project/deadlinehelper.ontowiki.git

.htaccess

@@ -3,7 +3,12 @@
 # WARNING: If you do not use the htaccess at all or your htaccess is
 # ignored, then your config.ini can be loaded over the web !!!
 <Files "*.ini">
-    Deny from all
+    <IfModule mod_access.c>
+        Deny from all
+    </IfModule>
+    <IfModule mod_authz_host.c>
+        Require all denied
+    </IfModule>
 </Files>
 
 # OntoWiki does not requires Apache's rewrite engine to work. However,

Makefile

@@ -34,7 +34,7 @@ help:
 	@echo "     pull ....................... 'git pull' for all repos"
 	@echo "     fetch ...................... 'git fetch' for all repos"
 	@echo "     fetch-all .................. 'git fetch --all', i.e. fetch all repos on all remotes"
-	@echo "     add-upstream ............... Adds standard AKSW git repo as remote/upstream"
+	@echo "     add-upstream ............... Adds standard amsl-project git repo as remote/upstream"
 	@echo "     status ..................... 'git status' for all repos"
 	@echo "     branch-check ............... 'git rev-parse' for all repos"
 	@echo "     clean ...................... Deletes all log and cache files"
@@ -108,14 +108,14 @@ libraries: zend submodules-developer
 
 submodules: # read-only
 	git submodule init
-	git config submodule.libraries/Erfurt.url "https://github.com/AKSW/Erfurt.git"
-	git config submodule.libraries/RDFauthor.url "https://github.com/AKSW/RDFauthor.git"
+	git config submodule.libraries/Erfurt.url "https://github.com/amsl-project/Erfurt.git"
+	git config submodule.libraries/RDFauthor.url "https://github.com/amsl-project/RDFauthor.git"
 	git submodule update
 
 submodules-developer: # read-write
 	git submodule init
-	git config submodule.libraries/Erfurt.url "[email protected]:AKSW/Erfurt.git"
-	git config submodule.libraries/RDFauthor.url "[email protected]:AKSW/RDFauthor.git"
+	git config submodule.libraries/Erfurt.url "[email protected]:amsl-project/Erfurt.git"
+	git config submodule.libraries/RDFauthor.url "[email protected]:amsl-project/RDFauthor.git"
 	git submodule update
 
 # developer targets
@@ -135,7 +135,7 @@ fetch-all:
 	git submodule foreach git fetch --all
 
 add-upstream:
-	git remote add upstream git://github.com/AKSW/OntoWiki.git
+	git remote add upstream git://github.com/amsl-project/OntoWiki.git
 
 info:
 	@git --no-pager log -1 --oneline --decorate
@@ -172,7 +172,7 @@ zend2:
 rdfauthor:
 	rm -rf libraries/RDFauthor
 	@echo 'Cloning RDFauthor into libraries/RDFauthor ...'
-	git clone [email protected]:AKSW/RDFauthor.git libraries/RDFauthor
+	git clone [email protected]:amsl-project/RDFauthor.git libraries/RDFauthor
 
 # test stuff
 
@@ -229,7 +229,7 @@ install-test-environment:
 erfurt@:
 	rm -rf libraries/Erfurt
 	@echo 'Cloning Erfurt into libraries/Erfurt ...'
-	git clone [email protected]:AKSW/Erfurt.git libraries/Erfurt
+	git clone [email protected]:amsl-project/Erfurt.git libraries/Erfurt
 
 odbctest:
 	@application/scripts/odbctest.php
@@ -319,3 +319,24 @@ endif
 
 list-events:
 	@grep -R "new Erfurt_Event" * 2> /dev/null | sed "s/.*new Erfurt_Event('//;s/');.*//" | sort -u
+
+make amsl-update:
+	git fetch --all
+	git checkout origin/develop
+	git submodule init
+	git submodule sync
+	git submodule update
+
+data-init:
+	sh -c "$(PWD)/application/scripts/clean.sh $(PWD)"
+	sh -c "$(PWD)/application/scripts/init.sh $(PWD)"
+	sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)"
+
+clean-virtuoso:
+	sh -c "$(PWD)/application/scripts/clean.sh $(PWD)"
+
+amsl-vocab:
+	sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)"
+
+export-virtuoso:
+	sh -c "$(PWD)/application/scripts/export.sh $(PWD)"

application/classes/OntoWiki/Controller/ActionHelper/List.php

@@ -127,13 +127,20 @@ public function addList(
             $other = new stdClass();
         }
 
+        $config = $this->_owApp->config;
+        $listHeading = '';
+        if (($config->lists) && $config->lists->showHeading === "true") {
+            $listHeading = $list->getTitle();
+        }
+
         $renderedList = $view->partial(
             'partials/list.phtml',
             array(
                  'listName'     => $listName,
                  'instances'    => $list,
                  'mainTemplate' => $mainTemplate,
-                 'other'        => $other
+                 'other'        => $other,
+                 'heading'      => $listHeading
             )
         );
 

application/classes/OntoWiki/Controller/Base.php

@@ -126,7 +126,10 @@ public function init()
             var themeUrlBase = "' . $this->_config->themeUrlBase . '";
             var _OWSESSION = "' . _OWSESSION . '";
             var RDFAUTHOR_BASE = "' . $this->_config->staticUrlBase . 'libraries/RDFauthor/";
-            var RDFAUTHOR_VIEW_MODE = "' . $viewMode . '";' . PHP_EOL;
+            var RDFAUTHOR_LANGUAGE = "' . $this->_config->languages->locale . '";
+            var RDFAUTHOR_VIEW_MODE = "' . $viewMode . '";
+            var RDFAUTHOR_DATATYPES_FIX = {};'
+            . PHP_EOL;
 
         if (defined('_OWDEBUG')) {
             $this->view->jsonVars .= '            var RDFAUTHOR_DEBUG = 1;';