You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/11/13 16:28:33 UTC
svn commit: r1541554 - in /incubator/sirona/trunk/server/reporting/src/main:
java/org/apache/sirona/reporting/web/SironaController.java
resources/templates/macro.vm
Author: rmannibucau
Date: Wed Nov 13 15:28:33 2013
New Revision: 1541554
URL: http://svn.apache.org/r1541554
Log:
making date buttong working back
Modified:
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java
incubator/sirona/trunk/server/reporting/src/main/resources/templates/macro.vm
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java?rev=1541554&r1=1541553&r2=1541554&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java Wed Nov 13 15:28:33 2013
@@ -162,7 +162,7 @@ public class SironaController implements
httpResponse.setHeader(CONTENT_TYPE, "application/vnd.ms-fontobject");
skipFiltering = true;
} else if (requestURI.endsWith(".woff")) {
- httpResponse.setHeader(CONTENT_TYPE, "application/x-woff");
+ httpResponse.setHeader(CONTENT_TYPE, "application/font-woff");
skipFiltering = true;
} else if (requestURI.endsWith(".ttf") || requestURI.endsWith(".itf")) {
httpResponse.setHeader(CONTENT_TYPE, "application/octet-stream");
Modified: incubator/sirona/trunk/server/reporting/src/main/resources/templates/macro.vm
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/resources/templates/macro.vm?rev=1541554&r1=1541553&r2=1541554&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/resources/templates/macro.vm (original)
+++ incubator/sirona/trunk/server/reporting/src/main/resources/templates/macro.vm Wed Nov 13 15:28:33 2013
@@ -18,7 +18,7 @@
<span id="$id" class="col-lg-6">
<label for="l$id">$label</label>
<span class="add-on">
- <i data-time-icon="icon-time" data-date-icon="icon-calendar" class="glyphicon glyphicon-calendar"></i>
+ <i data-time-icon="icon-time" data-date-icon="icon-calendar" class="glyphicon glyphicon-th"></i>
</span>
<input data-format="dd/MM/yyyy hh:mm:ss" type="text" class="form-control" id="l$id">
</span>