aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-27 20:59:37 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-27 20:59:37 -0700
commitcbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1 (patch)
tree9a3abe254656f5970abb5557a4b3df37a55dc407
parent3269d4632f180887d5eca96fcfaa03370bbae2a3 (diff)
parent52ccbd6b64d46aa7f2dfbf73599889efeaf66a08 (diff)
downloadvolse-hubzilla-cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1.tar.gz
volse-hubzilla-cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1.tar.bz2
volse-hubzilla-cbb6d37b6ca7e5d9e476fd3e7bea3ba56d3271e1.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rwxr-xr-xview/tpl/events-js.tpl11
1 files changed, 5 insertions, 6 deletions
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 7ecf2e753..c91419783 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -2,8 +2,9 @@
<div class="generic-content-wrapper-styled">
<h2>{{$title}}</h2>
-
-<button class="btn btn-xs btn-success btn-xs pull-right" title="{{$usage}}" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+<div class="pull-right">
+<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>&nbsp;<button class="btn btn-xs" onclick="exportDate(); return false;" >{{$export.1}}</button>&nbsp;<button class="btn btn-xs btn-success" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+</div>
<div id="event-upload-form" style="display:none;">
<div class="section-content-tools-wrapper">
@@ -16,9 +17,6 @@
</div>
</div>
-<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div>
-<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div>
-
<script>
function exportDate() {
var moment = $('#events-calendar').fullCalendar('getDate');
@@ -26,6 +24,7 @@ function exportDate() {
window.location.href=sT;
}
</script>
-
+<div class="clear"></div>
+<br />
<div id="events-calendar"></div>
</div>