summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2014-10-02 12:53:56 (GMT)
committerChristian Pointner <equinox@helsinki.at>2014-10-02 12:53:56 (GMT)
commit8a5a63a30caf23efc638e0f13f18183d6f34c18c (patch)
tree4dafdc1300ff6b0588661dd47d80c1990dff603f
parentf877297006322bd9e55b0e34e71698504ce0a23b (diff)
added file import modal
-rw-r--r--index.html13
-rw-r--r--js/shows.js3
2 files changed, 15 insertions, 1 deletions
diff --git a/index.html b/index.html
index b021025..3766d12 100644
--- a/index.html
+++ b/index.html
@@ -26,6 +26,7 @@
<script src="/javascript/jquery/jquery.min.js"></script>
<script src="/javascript/twitter-bootstrap/js/bootstrap.min.js"></script>
<script src="/javascript/twitter-bootstrap/js/bootstrap-alert.min.js"></script>
+ <script src="/javascript/twitter-bootstrap/js/bootstrap-modal.min.js"></script>
<script src="/js/utils.js"></script>
<script src="/js/auth.js"></script>
<script src="/js/apps.js"></script>
@@ -78,6 +79,18 @@
<div id="app-shows" class="container-fluid">
<div class="alertbox"></div>
+ <div class="modal hide fade" id="shows-upload">
+ <div class="modal-header">
+ <a class="close" data-dismiss="modal">&times;</a>
+ <h3>Datei importieren...</h3>
+ </div>
+ <div class="modal-body">
+ </div>
+ <div class="modal-footer">
+ <a href="#" class="btn" data-dismiss="modal">Abbrechen</a>
+ <a href="#" class="btn btn-primary">Importieren</a>
+ </div>
+ </div>
<div class="row-fluid">
<div class="span10">
<form class="well form-inline">
diff --git a/js/shows.js b/js/shows.js
index d12563c..5f8eecc 100644
--- a/js/shows.js
+++ b/js/shows.js
@@ -11,7 +11,8 @@ function shows_deleteCart(cart) {
}
function shows_importCart(cart) {
- alertbox.warning('app-shows', 'importing carts', 'not implemented yet!');
+ $('#shows-upload div.modal-body').text("Cart: " + cart);
+ $('#shows-upload').modal({ keyboard: true });
}
// <td>