diff --git a/pom.xml b/pom.xml index ba381eb0..4ea8cf87 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ 1.13.18 4.4.1 tomcat10x + 2.2 5.13.0 3.0.1 1.13.2 @@ -149,6 +150,11 @@ Central Portal Snapshots https://central.sonatype.com/repository/maven-snapshots/ + + gitlab-maven-releases + git.thulb.uni-jena.de + https://git.thulb.uni-jena.de/api/v4/projects/98/packages/maven + @@ -264,6 +270,11 @@ + + de.uni-jena.thulb + charts-common + ${charts.common.version} + jakarta.xml.ws jakarta.xml.ws-api @@ -329,11 +340,6 @@ font-awesome ${font-awesome.version} - - org.webjars - highcharts - 5.0.1 - org.webjars highlightjs diff --git a/ubo-common/pom.xml b/ubo-common/pom.xml index afd34f7d..ba4f85ab 100644 --- a/ubo-common/pom.xml +++ b/ubo-common/pom.xml @@ -369,6 +369,11 @@ commons-discovery runtime + + de.uni-jena.thulb + charts-common + runtime + jakarta.xml.ws jakarta.xml.ws-api @@ -465,11 +470,6 @@ font-awesome runtime - - org.webjars - highcharts - runtime - org.webjars highlightjs diff --git a/ubo-common/src/main/resources/META-INF/resources/statistics.xml b/ubo-common/src/main/resources/META-INF/resources/statistics.xml index 71dd3814..8d8add6e 100644 --- a/ubo-common/src/main/resources/META-INF/resources/statistics.xml +++ b/ubo-common/src/main/resources/META-INF/resources/statistics.xml @@ -1,11 +1,10 @@ - + Statistiken über alle verzeichneten Publikationen Statistics for all publications listed here - - + - - -
- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ubo-common/src/main/resources/xsl/statistics-oa.xsl b/ubo-common/src/main/resources/xsl/statistics-oa.xsl deleted file mode 100644 index bf6d94bf..00000000 --- a/ubo-common/src/main/resources/xsl/statistics-oa.xsl +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - -
-
-
- - ' - - - { - name: '', - data: [ - - - - - - - - - , - - ], - className:'' - } - - - - - - , - - - - - { - - , data: [ - - ], className: " - - - " } - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - , - - -
diff --git a/ubo-common/src/main/resources/xsl/statistics.xsl b/ubo-common/src/main/resources/xsl/statistics.xsl index 07f4ed85..fecef3ba 100644 --- a/ubo-common/src/main/resources/xsl/statistics.xsl +++ b/ubo-common/src/main/resources/xsl/statistics.xsl @@ -4,575 +4,54 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan" xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation" - xmlns:encoder="xalan://java.net.URLEncoder" - exclude-result-prefixes="xsl xalan i18n encoder"> + exclude-result-prefixes="xsl xalan i18n"> + - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-
-
- - - - -
-
-
- -
-
-
- - - - - - -
-
-
- - -
-
-
- - - - - Open Access? - -
-
-
- - - - - -
-
-
- - - - -
-
-
- - -
-
-
- - - - - - - solr:q=objectKind%3Aname+AND+( - - name_id_connection%3A - - +OR+ - - )&rows=0&facet.pivot=name_id_connection,name&facet.limit= - - - - - - - - - -
-
-
- - -
-
+ + - - - - - - - - - - - - - - - - - -
/ - -
- - - -
+
+
+
+

+ +

+ + + + + + + + + + + + + + + + + + +
/ + +
+ + + +
+
+
+