diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-02 11:44:11 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-02 11:44:11 +0100 |
| commit | b8c39c59cf7e698d5653cc49fa746506a9c41e24 (patch) | |
| tree | b5f782af7817270fc610f7756082608d00685e19 /app/assets | |
| parent | aad8a03991fe616f84fa18ed1db81831220f8d64 (diff) | |
| parent | ba5b2737365592cc511a526a3b14be46c3a75467 (diff) | |
Merge branch 'sortable' into develop
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/call_route.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/call_routes.css.scss | 5 |
4 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9097d83..c6f4107 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,5 +11,6 @@ // GO AFTER THE REQUIRES BELOW. // //= require jquery +//= require jquery-ui //= require jquery_ujs //= require_tree . diff --git a/app/assets/javascripts/call_route.js.coffee b/app/assets/javascripts/call_route.js.coffee new file mode 100644 index 0000000..f41d65b --- /dev/null +++ b/app/assets/javascripts/call_route.js.coffee @@ -0,0 +1,6 @@ +jQuery -> + $("table tbody").sortable + axis: 'y' + handle: '.handle' + update: -> + $.post('call_routes/sort', $(this).sortable('serialize'))
\ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 9093f8e..999afb5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,5 @@ *= require bootstrap/bootstrap *= require bootstrap/bootstrap-responsive *= require gemeinschaft-generic + *= require call_routes */ diff --git a/app/assets/stylesheets/call_routes.css.scss b/app/assets/stylesheets/call_routes.css.scss new file mode 100644 index 0000000..7face3b --- /dev/null +++ b/app/assets/stylesheets/call_routes.css.scss @@ -0,0 +1,5 @@ +#call_routes .handle { + font-size: 12px; + color: #777; + cursor: move; +}
\ No newline at end of file |