diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-07-31 15:45:13 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-31 15:45:13 -0700 |
commit | c1a953f96043c63c47bff7f5294005aba077e571 (patch) | |
tree | 6d55f13bff3cb2a89ed8f55f0d2730cf3ff47f6c /view/tpl | |
parent | 1d218784d180deb0946cb5dd4100ed0ebd489346 (diff) | |
parent | 5e985ef34f06964a7d8ac6ab20a8481c4b3ddca7 (diff) | |
download | volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.gz volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.bz2 volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
Diffstat (limited to 'view/tpl')
-rwxr-xr-x | view/tpl/events-js.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c91419783..bb6ca63a4 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -3,7 +3,7 @@ <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> <button class="btn btn-xs" onclick="exportDate(); return false;" >{{$export.1}}</button> <button class="btn btn-xs btn-success" onclick="openClose('event-upload-form');"><i class="icon-upload"></i> {{$upload}}</button> +<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button> <button class="btn btn-xs" onclick="exportDate(); return false;" ><i class="icon-download"></i> {{$export.1}}</button> <button class="btn btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i> {{$upload}}</button> </div> <div id="event-upload-form" style="display:none;"> |