summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-02-04 13:11:10 +0100
committerspag <spag@golwen.net>2013-02-04 13:11:10 +0100
commit48e32b241d422a676b3e977dd1af3688f7ebe63d (patch)
treeeb658714cdfd4f46fb805e770c3a0bc975014ee6 /app/assets
parent242470bdb4fa67780e7467c6889b7869dff05d1c (diff)
parent049b3e62c2ad3e0affac17214baa38afb994b6ba (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/softkey.js.coffee6
-rw-r--r--app/assets/stylesheets/application.css1
-rw-r--r--app/assets/stylesheets/softkeys.css.scss5
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