Преглед изворни кода

[frontend] Show app icons in header

* added ICON setting to app settings files
* added tooltips to the icon header links
Ben Bishop пре 13 година
родитељ
комит
79fc358beb

+ 1 - 0
apps/beeswax/src/beeswax/settings.py

@@ -16,3 +16,4 @@
 DJANGO_APPS = [ "beeswax" ]
 NICE_NAME = "Beeswax (Hive UI)"
 REQUIRES_HADOOP = True
+ICON = "/beeswax/static/art/beeswax-logo.png"

+ 1 - 0
apps/filebrowser/src/filebrowser/settings.py

@@ -18,3 +18,4 @@
 DJANGO_APPS = ['filebrowser']
 NICE_NAME = "File Browser"
 REQUIRES_HADOOP = False
+ICON = "/filebrowser/static/art/icon.png"

+ 1 - 0
apps/help/src/help/settings.py

@@ -16,3 +16,4 @@
 DJANGO_APPS = ['help']
 NICE_NAME = "Help"
 REQUIRES_HADOOP = False
+ICON = "/help/static/art/help.png"

+ 1 - 0
apps/jobbrowser/src/jobbrowser/settings.py

@@ -21,3 +21,4 @@
 DJANGO_APPS = ['jobbrowser']
 NICE_NAME = "Job Browser"
 REQUIRES_HADOOP = True
+ICON = "/jobbrowser/static/art/icon_large.png"

+ 2 - 0
apps/jobsub/src/jobsub/settings.py

@@ -20,3 +20,5 @@ REQUIRES_HADOOP = True
 MIDDLEWARE_CLASSES=[
   "jobsub.middleware.SubmissionErrorRecastMiddleware"
 ]
+
+ICON = "/jobsub/static/art/icon.png"

+ 2 - 0
apps/shell/src/shell/settings.py

@@ -22,3 +22,5 @@ PERMISSION_ACTIONS = (
   ("launch_flume", "Launch the Flume Shell"),
   ("launch_hbase", "Launch the HBase Shell"),
 )
+
+ICON = "/shell/static/art/shell.png"

+ 5 - 0
desktop/core/src/desktop/appmanager.py

@@ -114,6 +114,11 @@ class DesktopModuleInfo(object):
     else:
       self.nice_name = self.name
 
+    if hasattr(self.settings, "ICON"):
+        self.icon_path = self.settings.ICON
+    else:
+        self.icon_path = ""
+
     if self.config_key is not None:
       self.display_name = self.config_key
 

+ 21 - 2
desktop/core/src/desktop/templates/common_header.html

@@ -39,6 +39,17 @@ limitations under the License.
 		body {
 			padding-top: {{padding}};
 		}
+        .tooltip.fade.bottom{
+            border-style: none;
+            background-color: transparent;
+        }
+        .tooltip{
+            margin-left: -10px;
+            margin-top: -10px;
+        }
+        .tooltip-inner{
+            margin-top: -10px;
+        }
 	</style>
 
 	<script src="/static/ext/js/jquery/jquery-1.7.1.min.js"></script>
@@ -50,6 +61,7 @@ limitations under the License.
 	<script src="/static/ext/js/jquery/plugins/jquery.simpleplaceholder.js"></script>
 	<script src="/static/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js"></script>
 	<script src="/static/ext/js/bootstrap.min.js"></script>
+    <script src="/static/ext/js/bootstrap-tooltip.js"></script>
 	<script src="/static/ext/js/fileuploader.js"></script>
 
 	<script type="text/javascript" charset="utf-8">
@@ -65,18 +77,25 @@ limitations under the License.
 			});
 			$("#checkConfig").load("/debug/check_config_ajax");
 		});
+
+        function showTooltip(appDisplayName){
+            $('#' + appDisplayName + "Icon").tooltip({title:appDisplayName, placement:'bottom'})
+            $('#' + appDisplayName + "Icon").tooltip('show')
+        }
+
+
 	</script>
 </head>
 <body>
 
-	<div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
 		<div class="navbar-inner">
 			<div class="container-fluid">
 				<a class="brand" href="#">Hue</a>
 				<div class="nav-collapse">
 					<ul class="nav">
                         {% for app in apps %}
-                        <li {% is_selected section app.display_name %}><a href="/{{app.display_name}}">{{app.nice_name}}</a></li>
+                        <li id="{{app.display_name}}Icon" {% is_selected section app.display_name %}><a href="/{{app.display_name}}">{%if app.icon_path%}<img  width="25" height="25"  onmouseover="showTooltip('{{app.display_name}}')"  src="{{app.icon_path}}"/>{%else%}{{app.nice_name}}{%endif%} </a></li>
                         {% endfor %}
 						<li class="divider-vertical"></li>
 						<li id="checkConfig"></li>

+ 270 - 0
desktop/core/static/ext/js/bootstrap-tooltip.js

@@ -0,0 +1,270 @@
+/* ===========================================================
+ * bootstrap-tooltip.js v2.0.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+!function( $ ) {
+
+  "use strict"
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function ( element, options ) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function ( type, element, options ) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger != 'manual') {
+        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function ( options ) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) {
+        self.show()
+      } else {
+        self.hoverState = 'in'
+        setTimeout(function() {
+          if (self.hoverState == 'in') {
+            self.show()
+          }
+        }, self.options.delay.show)
+      }
+    }
+
+  , leave: function ( e ) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.hide) {
+        self.hide()
+      } else {
+        self.hoverState = 'out'
+        setTimeout(function() {
+          if (self.hoverState == 'out') {
+            self.hide()
+          }
+        }, self.options.delay.hide)
+      }
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+      $tip.find('.tooltip-inner').html(this.getTitle())
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      title = title.toString().replace(/(^\s*|\s*$)/, "")
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , delay: 0
+  , selector: false
+  , placement: 'top'
+  , trigger: 'hover'
+  , title: ''
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  }
+
+}( window.jQuery );