From 85e253b45db568aecdacadd31b685559d6822abf Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 19 Sep 2013 23:26:57 +0200 Subject: [PATCH] Improved drox widget. --- .../_application_controller_generic.js.coffee | 9 ++++++++- app/assets/stylesheets/zzz.css | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee index 3753e951f..7053ade60 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee @@ -200,9 +200,16 @@ class DestroyConfirm extends App.ControllerModal @item.destroy() class App.ControllerDrox extends App.Controller - constructor: -> + constructor: (params) -> super + if params.data && params.data.text + @inline(params.data) + + inline: (data) -> + @html App.view('generic/drox')(data) + @el.find('.drox-body').text(data.text) + template: (data) -> drox = $( App.view('generic/drox')(data) ) content = App.view(data.file)(data.params) diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index 65b414c0e..0c07bb405 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -191,12 +191,15 @@ table th, table td { width: 280px; } .content-two .main { - width: 800px; + width: 900px; margin-left: 284px; } .content-two .meta { +/* width: 140px; display: table-cell; +*/ + display: none; } } @@ -853,6 +856,14 @@ footer { margin-top: -18px; } +.nav.nav-pills li .glyphicon { + display: none; +} +.nav.nav-pills li:hover .glyphicon, .nav li:focus .glyphicon { + display: inline-block; + text-decoration: none; +} + .customer-info { width: 100%; padding-top: 7px;