diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-04 13:02:09 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-04 13:02:09 +0100 |
commit | 049b3e62c2ad3e0affac17214baa38afb994b6ba (patch) | |
tree | 39a04e944e45fe5dca90853b47a60ff776c092b4 /app/assets | |
parent | 4594ac1559c6ecd534834b41b31d61c281d3401d (diff) | |
parent | 66a53a49705c269d73f9d51bb0d4a51283049c71 (diff) |
Merge branch 'sort_softkeys' into develop
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/softkey.js.coffee | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/softkeys.css.scss | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/javascripts/softkey.js.coffee b/app/assets/javascripts/softkey.js.coffee new file mode 100644 index 0000000..19103f0 --- /dev/null +++ b/app/assets/javascripts/softkey.js.coffee @@ -0,0 +1,6 @@ +jQuery -> + $("table tbody").sortable + axis: 'y' + handle: '.handle' + update: -> + $.post('/softkeys/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 999afb5..128a391 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,4 +13,5 @@ *= require bootstrap/bootstrap-responsive *= require gemeinschaft-generic *= require call_routes + *= require softkeys */ diff --git a/app/assets/stylesheets/softkeys.css.scss b/app/assets/stylesheets/softkeys.css.scss new file mode 100644 index 0000000..425c6f1 --- /dev/null +++ b/app/assets/stylesheets/softkeys.css.scss @@ -0,0 +1,5 @@ +#softkeys .handle { + font-size: 12px; + color: #777; + cursor: move; +}
\ No newline at end of file |