Martin Edenhofer 11 лет назад
Родитель
Сommit
85e253b45d

+ 8 - 1
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)

+ 12 - 1
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;