getName() + ".year", getName() +
+ * Computes a date object from multiple parameters in the request. This method searches for
+ * parameters named getName() + ".year", getName() +
* ".month" and getName() + ".day". It sets the
- * fields HOUR, MINUTE and
- * SECOND to 0, since they are by default the current
- * time.
- * */
+ * fields HOUR, MINUTE and SECOND to 0, since they are by
+ * default the current time.
+ *
+ */
@Override
public Object transformValue(HttpServletRequest request)
throws IllegalArgumentException {
Calendar c = null;
- Object outVal = null;
- try {
+ Object outVal = null;
+ try {
- c = getCalendar(request);
- c.clear();
- //don't accept lenient dates like June 44
- c.setLenient(false);
+ c = getCalendar(request);
+ c.clear();
+ //don't accept lenient dates like June 44
+ c.setLenient(false);
- String year = Globalization.decodeParameter(request, getName()+".year");
- String month = Globalization.decodeParameter(request, getName()+".month");
- String day = Globalization.decodeParameter(request, getName()+".day");
+ String year = Globalization.decodeParameter(request, getName() + ".year");
+ String month = Globalization.decodeParameter(request, getName() + ".month");
+ String day = Globalization.decodeParameter(request, getName() + ".day");
- if ( year == null && month == null && day == null ) {
- return transformSingleValue(request);
- }
- if (day == null || day.length() == 0) {
- return null;
- }
- if ( year != null ) {
- c.set(Calendar.YEAR, Integer.parseInt(year));
- }
- if ( month != null ) {
- c.set(Calendar.MONTH, Integer.parseInt(month));
- }
- if ( day != null ) {
- c.set(Calendar.DATE, Integer.parseInt(day));
- }
- outVal = c.getTime();
- } catch ( IllegalArgumentException e) {
- throw new IllegalArgumentException("Invalid Day of Month");
- }
- return outVal;
+ if (year == null && month == null && day == null) {
+ return transformSingleValue(request);
+ }
+ if (day == null || day.length() == 0) {
+ return null;
+ }
+ if (year != null) {
+ c.set(Calendar.YEAR, Integer.parseInt(year));
+ }
+ if (month != null) {
+ c.set(Calendar.MONTH, Integer.parseInt(month));
+ }
+ if (day != null) {
+ c.set(Calendar.DATE, Integer.parseInt(day));
+ }
+ outVal = c.getTime();
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException("Invalid Day of Month");
+ }
+ return outVal;
}
public Object unmarshal(String encoded) {
@@ -104,7 +102,7 @@ public class DateParameter extends ParameterModel {
return new Date(Long.parseLong(encoded));
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Cannot unmarshal date '"
- + encoded +"': " + e.getMessage());
+ + encoded + "': " + e.getMessage());
}
}
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
index 6114934cf..5d848184b 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
@@ -53,6 +53,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ dynamic
+
+
+
+
+ ![]()
+ /ccm/cms-service/stream/image/?image_id=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ dynamic
+
+
+
+
+
+ dynamic
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ /ccm/cms-service/stream/image/?image_id=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /redirect/?oid=
+
+
+
+
+
+ dynamic
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /redirect/?oid=
+
+
+
+
+
+ dynamic
+
+
+
+
+
+ dynamic
+
+
+
+
+
+
+
+ dynamic
+
+
+
+
+
+
+
+
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/HistoricDate.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/HistoricDate.xml
new file mode 100644
index 000000000..9a2ae3022
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/HistoricDate.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ Deutsch
+ 0.8
+
+ mehr »
+ weiter lesen
+
+ ca.
+ v. Chr.
+
+
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
index a9ee4e6fc..13911f247 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml
@@ -94,11 +94,12 @@
Publikationsdatum
Referierter Artikel
Weitere Informationen
- Ausgabe
+ Ausgabe
Jahrgang
Jahr
Beiträge
Referierter Artikel
+ Erste Veröffentlichung
Zusammenfassung
Artikel
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/footerMenu.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/footerMenu.xml
index 348353a22..607da3402 100755
--- a/ccm-sci-bundle/web/themes/mandalay/lang/de/footerMenu.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/footerMenu.xml
@@ -31,4 +31,5 @@
Webmaster
Impressum
Bildnachweis
+ ScientificCMS
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/HistoricDate.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/HistoricDate.xml
new file mode 100644
index 000000000..591f367b3
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/HistoricDate.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ English
+ 0.8
+
+ more »
+ read more
+
+ approx.
+ BC
+
+
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
index 4711172c7..eb1ede074 100644
--- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml
@@ -96,6 +96,7 @@
Year
Articles
Reviewed article
+ First published
Abstract
Articles
diff --git a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
index a273bae62..49b470064 100755
--- a/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/layout/navigation.xml
@@ -143,35 +143,35 @@
-
+
-
-
-
+
+
-