Calendar: Make button of #datecontrol_date

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 7ae4a3a6eb1a1083626fc4d3238968ad075993c4..0d44722abb81f002ad4a8d74249dbc0786ad114b 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -845,7 +845,7 @@ $(document).ready(function(){
                dayNamesShort: dayNamesShort,
                allDayText: allDayText,
                viewDisplay: function(view) {
-                       $('#datecontrol_date').html(view.title);
+                       $('#datecontrol_date').val(view.title);
                        if (view.name != defaultView) {
                                $.post(OC.filePath('calendar', 'ajax', 'changeview.php'), {v:view.name});
                                defaultView = view.name;

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index b0cb20f2f153bafc034819c2f19a210a319de002..2246a0178e3128b52ced0de74b54fbb4572e3194 100644 (file)
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -46,7 +46,7 @@
                                        </form>
                                        <form id="datecontrol">
                                                <input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
-                                               <span class="button" id="datecontrol_date"></span>
+                                               <input type="button" value="" id="datecontrol_date"/>
                                                <input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
                                        </form>
                                </div>