diff options
| -rw-r--r-- | app/assets/images/rails.png | bin | 6646 -> 0 bytes | |||
| -rw-r--r-- | app/assets/javascripts/gemeinschaft.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/gemeinschaft-generic.css.scss | 1 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 1 | ||||
| -rw-r--r-- | app/views/phones/_index_core.html.haml | 3 | ||||
| -rw-r--r-- | config/locales/views/phones/de.yml | 4 | ||||
| -rw-r--r-- | config/locales/views/phones/en.yml | 4 |
7 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png Binary files differdeleted file mode 100644 index d5edc04..0000000 --- a/app/assets/images/rails.png +++ /dev/null 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 diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 814267c..4aa0ae6 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -80,4 +80,6 @@ de: button: 'Absenden' sip_accounts: title: 'Auf dem Telefon eingetragene SIP-Konten' - connect_to_sip_account: 'Neues SIP-Konto auf das Telefon eintragen'
\ No newline at end of file + connect_to_sip_account: 'Neues SIP-Konto auf das Telefon eintragen' + tool_tips: + hot_desk: 'Mit aktivierter Hot Desk Fähigkeit können sich User der Anlage an einem Telefon ein- und ausloggen.' diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml index 15e212e..46b0bcb 100644 --- a/config/locales/views/phones/en.yml +++ b/config/locales/views/phones/en.yml @@ -80,4 +80,6 @@ en: button: 'Submit' sip_accounts: title: 'Listing of connected SIP accounts' - connect_to_sip_account: 'Connect to an existing SIP account'
\ No newline at end of file + connect_to_sip_account: 'Connect to an existing SIP account' + tool_tips: + hot_desk: 'Hot desk triggers the ability for a user to login and out of a given phone.' |
