From ca8989616c7f2edb5b8b4fb04c7a58feef24ad49 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 23 Jan 2013 12:52:23 +0100
Subject: Add tooltips.

---
 app/assets/images/rails.png                          | Bin 6646 -> 0 bytes
 app/assets/javascripts/gemeinschaft.js.coffee        |   4 ++++
 app/assets/stylesheets/gemeinschaft-generic.css.scss |   1 +
 app/views/layouts/application.html.haml              |   1 +
 app/views/phones/_index_core.html.haml               |   3 ++-
 5 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 app/assets/images/rails.png
 create mode 100644 app/assets/javascripts/gemeinschaft.js.coffee

(limited to 'app')

diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
Binary files a/app/assets/images/rails.png and /dev/null differ
diff --git a/app/assets/javascripts/gemeinschaft.js.coffee b/app/assets/javascripts/gemeinschaft.js.coffee
new file mode 100644
index 0000000..c9404a8
--- /dev/null
+++ b/app/assets/javascripts/gemeinschaft.js.coffee
@@ -0,0 +1,4 @@
+jQuery ->
+  $("a[rel=popover]").popover()
+  $(".tooltip").tooltip()
+  $("a[rel=tooltip]").tooltip()
\ No newline at end of file
diff --git a/app/assets/stylesheets/gemeinschaft-generic.css.scss b/app/assets/stylesheets/gemeinschaft-generic.css.scss
index 296b242..e594d67 100644
--- a/app/assets/stylesheets/gemeinschaft-generic.css.scss
+++ b/app/assets/stylesheets/gemeinschaft-generic.css.scss
@@ -11,3 +11,4 @@ body {
     padding-top: 0px;
   }
 }
+
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 74331af..9fdcb8a 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,6 +14,7 @@
     / HTML5 shim, for IE6-8 support of HTML5 elements
     /[if lt IE 9]
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+
   %body
     .container
       .row
diff --git a/app/views/phones/_index_core.html.haml b/app/views/phones/_index_core.html.haml
index fa1c679..af57792 100644
--- a/app/views/phones/_index_core.html.haml
+++ b/app/views/phones/_index_core.html.haml
@@ -21,6 +21,7 @@
         %td= phone.phone_model
         %td
           %span.hidden-phone
-            = phone.hot_deskable
+            %a{:href => '#', :rel => "tooltip", :title => t('phones.tool_tips.hot_desk'), :'data-trigger' => 'hover'}
+              = phone.hot_deskable
         %td= phone.ip_address
         =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone.phoneable, :child => phone}
\ No newline at end of file
-- 
cgit v1.2.3