Merge remote-tracking branch 'upstream/master'

1 files changed, 15 insertions, 3 deletions

diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 9812291bf..c91419783 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -2,9 +2,20 @@
 <div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
+<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="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>
+<div id="event-upload-form" style="display:none;">
+    <div class="section-content-tools-wrapper">
+        <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+            <div class="form-group">
+                <input id="event-upload-choose" type="file" name="userfile" />
+            </div>
+            <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+		</form>
+    </div>
+</div>
 
 <script>
 function exportDate() {
@@ -13,6 +24,7 @@ function exportDate() {
     window.location.href=sT;
 }
 </script>
-
+<div class="clear"></div>
+<br />
 <div id="events-calendar"></div>
 </div>