karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [31/51] [partial] karaf-decanter git commit: [KARAF-3849] Add karaf kibana dashboard
Date Thu, 16 Jul 2015 07:09:13 GMT
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/terms/module.js
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/terms/module.js b/kibana/src/main/resources/app/panels/terms/module.js
index d074ef0..533d11c 100644
--- a/kibana/src/main/resources/app/panels/terms/module.js
+++ b/kibana/src/main/resources/app/panels/terms/module.js
@@ -1,4 +1,457 @@
-/*! kibana - v3.1.2 - 2014-11-07
- * Copyright (c) 2014 Rashid Khan; Licensed Apache License */
+/** @scratch /panels/5
+ *
+ * include::panels/terms.asciidoc[]
+ */
 
-define("panels/terms/module",["angular","app","lodash","jquery","kbn"],function(a,b,c,d,e){var f=a.module("kibana.panels.terms",[]);b.useModule(f),f.controller("terms",["$scope","querySrv","dashboard","filterSrv","fields",function(b,d,e,f,g){b.panelMeta={modals:[{description:"Inspect",icon:"icon-info-sign",partial:"app/partials/inspector.html",show:b.panel.spyable}],editorTabs:[{title:"Queries",src:"app/partials/querySelect.html"}],status:"Stable",description:"Displays the results of an elasticsearch facet as a pie chart, bar chart, or a table"};var h={field:"_type",exclude:[],missing:!0,other:!0,size:10,order:"count",style:{"font-size":"10pt"},donut:!1,tilt:!1,labels:!0,arrangement:"horizontal",chart:"bar",counter_pos:"above",spyable:!0,queries:{mode:"all",ids:[]},tmode:"terms",tstat:"total",valuefield:""};c.defaults(b.panel,h),b.init=function(){b.hits=0,b.$on("refresh",function(){b.get_data()}),b.get_data()},b.get_data=function(){if(0!==e.indices.length){b.panelMeta.loading=!0;var
  h,i,j,k;b.field=c.contains(g.list,b.panel.field+".raw")?b.panel.field+".raw":b.panel.field,h=b.ejs.Request().indices(e.indices),b.panel.queries.ids=d.idsByMode(b.panel.queries),k=d.getQueryObjs(b.panel.queries.ids),j=b.ejs.BoolQuery(),c.each(k,function(a){j=j.should(d.toEjsObj(a))}),"terms"===b.panel.tmode&&(h=h.facet(b.ejs.TermsFacet("terms").field(b.field).size(b.panel.size).order(b.panel.order).exclude(b.panel.exclude).facetFilter(b.ejs.QueryFilter(b.ejs.FilteredQuery(j,f.getBoolFilter(f.ids()))))).size(0)),"terms_stats"===b.panel.tmode&&(h=h.facet(b.ejs.TermStatsFacet("terms").valueField(b.panel.valuefield).keyField(b.field).size(b.panel.size).order(b.panel.order).facetFilter(b.ejs.QueryFilter(b.ejs.FilteredQuery(j,f.getBoolFilter(f.ids()))))).size(0)),b.inspector=a.toJson(JSON.parse(h.toString()),!0),i=h.doSearch(),i.then(function(a){b.panelMeta.loading=!1,"terms"===b.panel.tmode&&(b.hits=a.hits.total),b.results=a,b.$emit("render")})}},b.build_search=function(a,d){if(c.isUndef
 ined(a.meta))f.set({type:"terms",field:b.field,value:a.label,mandate:d?"mustNot":"must"});else{if("missing"!==a.meta)return;f.set({type:"exists",field:b.field,mandate:d?"must":"mustNot"})}},b.set_refresh=function(a){b.refresh=a},b.close_edit=function(){b.refresh&&b.get_data(),b.refresh=!1,b.$emit("render")},b.showMeta=function(a){return c.isUndefined(a.meta)?!0:("other"!==a.meta||b.panel.other)&&("missing"!==a.meta||b.panel.missing)?!0:!1}}]),f.directive("termsChart",["querySrv",function(a){return{restrict:"A",link:function(b,f){function g(){var a=0;b.data=[],c.each(b.results.facets.terms.terms,function(c){var d;"terms"===b.panel.tmode&&(d={label:c.term,data:[[a,c.count]],actions:!0}),"terms_stats"===b.panel.tmode&&(d={label:c.term,data:[[a,c[b.panel.tstat]]],actions:!0}),b.data.push(d),a+=1}),b.data.push({label:"Missing field",data:[[a,b.results.facets.terms.missing]],meta:"missing",color:"#aaa",opacity:0}),"terms"===b.panel.tmode&&b.data.push({label:"Other values",data:[[a+1,b.res
 ults.facets.terms.other]],meta:"other",color:"#444"})}function h(){var e;g(),f.css({height:b.panel.height||b.row.height}),e=c.clone(b.data),e=b.panel.missing?e:c.without(e,c.findWhere(e,{meta:"missing"})),e=b.panel.other?e:c.without(e,c.findWhere(e,{meta:"other"})),require(["jquery.flot.pie"],function(){try{if("bar"===b.panel.chart&&(i=d.plot(f,e,{legend:{show:!1},series:{lines:{show:!1},bars:{show:!0,fill:1,barWidth:.8,horizontal:!1},shadowSize:1},yaxis:{show:!0,min:0,color:"#c8c8c8"},xaxis:{show:!1},grid:{borderWidth:0,borderColor:"#c8c8c8",color:"#c8c8c8",hoverable:!0,clickable:!0},colors:a.colors})),"pie"===b.panel.chart){var c=function(a,b){return"<div ng-click=\"build_search(panel.field,'"+a+'\') "style="font-size:8pt;text-align:center;padding:2px;color:white;">'+a+"<br/>"+Math.round(b.percent)+"%</div>"};i=d.plot(f,e,{legend:{show:!1},series:{pie:{innerRadius:b.panel.donut?.4:0,tilt:b.panel.tilt?.45:1,radius:1,show:!0,combine:{color:"#999",label:"The Rest"},stroke:{width:0},l
 abel:{show:b.panel.labels,radius:2/3,formatter:c,threshold:.1}}},grid:{hoverable:!0,clickable:!0,color:"#c8c8c8"},colors:a.colors})}f.is(":visible")&&setTimeout(function(){b.legend=i.getData(),b.$$phase||b.$apply()})}catch(g){f.text(g)}})}var i;b.$on("render",function(){h()}),f.bind("plotclick",function(a,c,d){d&&b.build_search(b.data[d.seriesIndex])});var j=d("<div>");f.bind("plothover",function(a,c,d){if(d){var f="bar"===b.panel.chart?d.datapoint[1]:d.datapoint[1][0][1];j.html(e.query_color_dot(d.series.color,20)+" "+d.series.label+" ("+f.toFixed(0)+")").place_tt(c.pageX,c.pageY)}else j.remove()})}}}])});
\ No newline at end of file
+/** @scratch /panels/terms/0
+ *
+ * == terms
+ * Status: *Stable*
+ *
+ * A table, bar chart or pie chart based on the results of an Elasticsearch terms facet.
+ *
+ */
+define([
+  'angular',
+  'app',
+  'lodash',
+  'jquery',
+  'kbn'
+],
+function (angular, app, _, $, kbn) {
+  'use strict';
+
+  var module = angular.module('kibana.panels.terms', []);
+  app.useModule(module);
+
+  module.controller('terms', function($scope, querySrv, dashboard, filterSrv, fields) {
+    $scope.panelMeta = {
+      modals : [
+        {
+          description: "Inspect",
+          icon: "icon-info-sign",
+          partial: "app/partials/inspector.html",
+          show: $scope.panel.spyable
+        }
+      ],
+      editorTabs : [
+        {title:'Queries', src:'app/partials/querySelect.html'}
+      ],
+      status  : "Stable",
+      description : "Displays the results of an elasticsearch facet as a pie chart, bar chart, or a "+
+        "table"
+    };
+
+    // Set and populate defaults
+    var _d = {
+      /** @scratch /panels/terms/5
+       * === Parameters
+       *
+       * field:: The field on which to computer the facet
+       */
+      field   : '_type',
+      /** @scratch /panels/terms/5
+       * exclude:: terms to exclude from the results
+       */
+      exclude : [],
+      /** @scratch /panels/terms/5
+       * missing:: Set to false to disable the display of a counter showing how much results are
+       * missing the field
+       */
+      missing : true,
+      /** @scratch /panels/terms/5
+       * other:: Set to false to disable the display of a counter representing the aggregate of all
+       * values outside of the scope of your +size+ property
+       */
+      other   : true,
+      /** @scratch /panels/terms/5
+       * size:: Show this many terms
+       */
+      size    : 10,
+      /** @scratch /panels/terms/5
+       * order:: In terms mode: count, term, reverse_count or reverse_term,
+       * in terms_stats mode: term, reverse_term, count, reverse_count,
+       * total, reverse_total, min, reverse_min, max, reverse_max, mean or reverse_mean
+       */
+      order   : 'count',
+      style   : { "font-size": '10pt'},
+      /** @scratch /panels/terms/5
+       * donut:: In pie chart mode, draw a hole in the middle of the pie to make a tasty donut.
+       */
+      donut   : false,
+      /** @scratch /panels/terms/5
+       * tilt:: In pie chart mode, tilt the chart back to appear as more of an oval shape
+       */
+      tilt    : false,
+      /** @scratch /panels/terms/5
+       * lables:: In pie chart mode, draw labels in the pie slices
+       */
+      labels  : true,
+      /** @scratch /panels/terms/5
+       * arrangement:: In bar or pie mode, arrangement of the legend. horizontal or vertical
+       */
+      arrangement : 'horizontal',
+      /** @scratch /panels/terms/5
+       * chart:: table, bar or pie
+       */
+      chart       : 'bar',
+      /** @scratch /panels/terms/5
+       * counter_pos:: The location of the legend in respect to the chart, above, below, or none.
+       */
+      counter_pos : 'above',
+      /** @scratch /panels/terms/5
+       * spyable:: Set spyable to false to disable the inspect button
+       */
+      spyable     : true,
+      /** @scratch /panels/terms/5
+       *
+       * ==== Queries
+       * queries object:: This object describes the queries to use on this panel.
+       * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
+       * queries.ids::: In +selected+ mode, which query ids are selected.
+       */
+      queries     : {
+        mode        : 'all',
+        ids         : []
+      },
+      /** @scratch /panels/terms/5
+       * multiterms:: Multi terms: used to either filterSrv
+       */
+      multiterms  : [],
+      /** @scratch /panels/terms/5
+       * fmode:: Field mode: normal or script
+       */
+      fmode       : 'normal',
+      /** @scratch /panels/terms/5
+       * tmode:: Facet mode: terms or terms_stats
+       */
+      tmode       : 'terms',
+      /** @scratch /panels/terms/5
+       * tstat:: Terms_stats facet stats field
+       */
+      tstat       : 'total',
+      /** @scratch /panels/terms/5
+       * valuefield:: Terms_stats facet value field
+       */
+      valuefield  : ''
+    };
+
+    _.defaults($scope.panel,_d);
+
+    $scope.init = function () {
+      $scope.hits = 0;
+
+      $scope.$on('refresh',function(){
+        $scope.get_data();
+      });
+      $scope.get_data();
+
+    };
+
+    $scope.get_data = function() {
+      // Make sure we have everything for the request to complete
+      if(dashboard.indices.length === 0) {
+        return;
+      }
+
+      $scope.panelMeta.loading = true;
+      var request,
+        terms_facet,
+        termstats_facet,
+        results,
+        boolQuery,
+        queries;
+
+      $scope.field = _.contains(fields.list,$scope.panel.field+'.raw') ?
+        $scope.panel.field+'.raw' : $scope.panel.field;
+
+      request = $scope.ejs.Request();
+
+      $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
+      queries = querySrv.getQueryObjs($scope.panel.queries.ids);
+
+      // This could probably be changed to a BoolFilter
+      boolQuery = $scope.ejs.BoolQuery();
+      _.each(queries,function(q) {
+        boolQuery = boolQuery.should(querySrv.toEjsObj(q));
+      });
+
+      // Terms mode
+      if($scope.panel.tmode === 'terms') {
+        terms_facet = $scope.ejs.TermsFacet('terms')
+          .field($scope.field)
+          .size($scope.panel.size)
+          .order($scope.panel.order)
+          .exclude($scope.panel.exclude)
+          .facetFilter($scope.ejs.QueryFilter(
+            $scope.ejs.FilteredQuery(
+              boolQuery,
+              filterSrv.getBoolFilter(filterSrv.ids())
+            )));
+        if($scope.panel.fmode === 'script') {
+          terms_facet.scriptField($scope.panel.script)
+        }
+        request = request.facet(terms_facet).size(0);
+      }
+      if($scope.panel.tmode === 'terms_stats') {
+        termstats_facet = $scope.ejs.TermStatsFacet('terms')
+          .valueField($scope.panel.valuefield)
+          .keyField($scope.field)
+          .size($scope.panel.size)
+          .order($scope.panel.order)
+          .facetFilter($scope.ejs.QueryFilter(
+            $scope.ejs.FilteredQuery(
+              boolQuery,
+              filterSrv.getBoolFilter(filterSrv.ids())
+            )));
+        if($scope.panel.fmode === 'script') {
+          termstats_facet.scriptField($scope.panel.script)
+        }
+        request = request.facet(termstats_facet).size(0);
+      }
+
+      // Populate the inspector panel
+      $scope.inspector = request.toJSON();
+
+      results = $scope.ejs.doSearch(dashboard.indices, request);
+
+      // Populate scope when we have results
+      results.then(function(results) {
+        $scope.panelMeta.loading = false;
+        if($scope.panel.tmode === 'terms') {
+          $scope.hits = results.hits.total;
+        }
+
+        $scope.results = results;
+
+        $scope.$emit('render');
+      });
+    };
+
+    $scope.build_search = function(term,negate) {
+      if($scope.panel.fmode === 'script') {
+        filterSrv.set({type:'script',script:$scope.panel.script + ' == \"' + term.label + '\"',
+          mandate:(negate ? 'mustNot':'must')});
+      } else if(_.isUndefined(term.meta)) {
+        filterSrv.set({type:'terms',field:$scope.field,value:term.label,
+          mandate:(negate ? 'mustNot':'must')});
+      } else if(term.meta === 'missing') {
+        filterSrv.set({type:'exists',field:$scope.field,
+          mandate:(negate ? 'must':'mustNot')});
+      } else {
+        return;
+      }
+    };
+
+    var build_multi_search = function(term) {
+      if($scope.panel.fmode === 'script') {
+        return({type:'script',script:$scope.panel.script + ' == \"' + term.label + '\"',
+          mandate:'either', alias: term.label});
+      } else if(_.isUndefined(term.meta)) {
+        return({type:'terms',field:$scope.field,value:term.label, mandate:'either'});
+      } else if(term.meta === 'missing') {
+        return({type:'exists',field:$scope.field, mandate:'either'});
+      } else {
+        return;
+      }
+    };
+
+    $scope.multi_search = function() {
+      _.each($scope.panel.multiterms, function(t) {
+        var f = build_multi_search(t);
+        filterSrv.set(f, undefined, true)
+      });
+      dashboard.refresh();
+    };
+    $scope.add_multi_search = function(term) {
+      $scope.panel.multiterms.push(term);
+    };
+    $scope.delete_multi_search = function(term) {
+      _.remove($scope.panel.multiterms, term);
+    };
+    $scope.check_multi_search = function(term) {
+      return _.indexOf($scope.panel.multiterms, term) >= 0;
+    };
+
+    $scope.set_refresh = function (state) {
+      $scope.refresh = state;
+    };
+
+    $scope.close_edit = function() {
+      if($scope.refresh) {
+        $scope.get_data();
+      }
+      $scope.refresh =  false;
+      $scope.$emit('render');
+    };
+
+    $scope.showMeta = function(term) {
+      if(_.isUndefined(term.meta)) {
+        return true;
+      }
+      if(term.meta === 'other' && !$scope.panel.other) {
+        return false;
+      }
+      if(term.meta === 'missing' && !$scope.panel.missing) {
+        return false;
+      }
+      return true;
+    };
+
+  });
+
+  module.directive('termsChart', function(querySrv) {
+    return {
+      restrict: 'A',
+      link: function(scope, elem) {
+        var plot;
+
+        // Receive render events
+        scope.$on('render',function(){
+          render_panel();
+        });
+
+        function build_results() {
+          var k = 0;
+          scope.data = [];
+          _.each(scope.results.facets.terms.terms, function(v) {
+            var slice;
+            if(scope.panel.tmode === 'terms') {
+              slice = { label : v.term, data : [[k,v.count]], actions: true};
+            }
+            if(scope.panel.tmode === 'terms_stats') {
+              slice = { label : v.term, data : [[k,v[scope.panel.tstat]]], actions: true};
+            }
+            scope.data.push(slice);
+            k = k + 1;
+          });
+
+          scope.data.push({label:'Missing field',
+            data:[[k,scope.results.facets.terms.missing]],meta:"missing",color:'#aaa',opacity:0});
+
+          if(scope.panel.tmode === 'terms') {
+            scope.data.push({label:'Other values',
+              data:[[k+1,scope.results.facets.terms.other]],meta:"other",color:'#444'});
+          }
+        }
+
+        // Function for rendering panel
+        function render_panel() {
+          var chartData;
+
+          build_results();
+
+          // IE doesn't work without this
+          elem.css({height:scope.panel.height||scope.row.height});
+
+          // Make a clone we can operate on.
+          chartData = _.clone(scope.data);
+          chartData = scope.panel.missing ? chartData :
+            _.without(chartData,_.findWhere(chartData,{meta:'missing'}));
+          chartData = scope.panel.other ? chartData :
+          _.without(chartData,_.findWhere(chartData,{meta:'other'}));
+
+          // Populate element.
+          require(['jquery.flot.pie'], function(){
+            // Populate element
+            try {
+              // Add plot to scope so we can build out own legend
+              if(scope.panel.chart === 'bar') {
+                plot = $.plot(elem, chartData, {
+                  legend: { show: false },
+                  series: {
+                    lines:  { show: false, },
+                    bars:   { show: true,  fill: 1, barWidth: 0.8, horizontal: false },
+                    shadowSize: 1
+                  },
+                  yaxis: { show: true, min: 0, color: "#c8c8c8" },
+                  xaxis: { show: false },
+                  grid: {
+                    borderWidth: 0,
+                    borderColor: '#c8c8c8',
+                    color: "#c8c8c8",
+                    hoverable: true,
+                    clickable: true
+                  },
+                  colors: querySrv.colors
+                });
+              }
+              if(scope.panel.chart === 'pie') {
+                var labelFormat = function(label, series){
+                  return '<div ng-click="build_search(panel.field,\''+label+'\')'+
+                    ' "style="font-size:8pt;text-align:center;padding:2px;color:white;">'+
+                    label+'<br/>'+Math.round(series.percent)+'%</div>';
+                };
+
+                plot = $.plot(elem, chartData, {
+                  legend: { show: false },
+                  series: {
+                    pie: {
+                      innerRadius: scope.panel.donut ? 0.4 : 0,
+                      tilt: scope.panel.tilt ? 0.45 : 1,
+                      radius: 1,
+                      show: true,
+                      combine: {
+                        color: '#999',
+                        label: 'The Rest'
+                      },
+                      stroke: {
+                        width: 0
+                      },
+                      label: {
+                        show: scope.panel.labels,
+                        radius: 2/3,
+                        formatter: labelFormat,
+                        threshold: 0.1
+                      }
+                    }
+                  },
+                  //grid: { hoverable: true, clickable: true },
+                  grid:   { hoverable: true, clickable: true, color: '#c8c8c8' },
+                  colors: querySrv.colors
+                });
+              }
+
+              // Populate legend
+              if(elem.is(":visible")){
+                setTimeout(function(){
+                  scope.legend = plot.getData();
+                  if(!scope.$$phase) {
+                    scope.$apply();
+                  }
+                });
+              }
+
+            } catch(e) {
+              elem.text(e);
+            }
+          });
+        }
+
+        elem.bind("plotclick", function (event, pos, object) {
+          if(object) {
+            scope.build_search(scope.data[object.seriesIndex]);
+          }
+        });
+
+        var $tooltip = $('<div>');
+        elem.bind("plothover", function (event, pos, item) {
+          if (item) {
+            var value = scope.panel.chart === 'bar' ? item.datapoint[1] : item.datapoint[1][0][1];
+            $tooltip
+              .html(
+                kbn.query_color_dot(item.series.color, 20) + ' ' +
+                item.series.label + " (" + value.toFixed(0) +
+                (scope.panel.chart === 'pie' ? (", " + Math.round(item.datapoint[0]) + "%") : "") + ")"
+              )
+              .place_tt(pos.pageX, pos.pageY);
+          } else {
+            $tooltip.remove();
+          }
+        });
+
+      }
+    };
+  });
+
+});

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/text/editor.html
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/text/editor.html b/kibana/src/main/resources/app/panels/text/editor.html
index 68a4392..02177bc 100644
--- a/kibana/src/main/resources/app/panels/text/editor.html
+++ b/kibana/src/main/resources/app/panels/text/editor.html
@@ -1 +1,16 @@
-<div><div class="row-fluid"><div class="span4"><label class="small">Mode</label><select class="input-medium" ng-model="panel.mode" ng-options="f for f in ['html','markdown','text']"></select></div><div class="span2" ng-show="panel.mode == 'text'"><label class="small">Font Size</label><select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></div></div><label class="small">Content <span ng-show="panel.mode == 'html'">(This area uses HTML sanitized via AngularJS's <a href="http://docs.angularjs.org/api/ngSanitize.$sanitize">$sanitize</a> service)</span> <span ng-show="panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span></label><textarea ng-model="panel.content" rows="6" style="width:95%"></textarea></div>
\ No newline at end of file
+<div>
+  <div class="row-fluid">
+    <div class="span4">
+      <label class="small">Mode</label> <select class="input-medium" ng-model="panel.mode" ng-options="f for f in ['html','markdown','text']"></select>
+    </div>
+    <div class="span2" ng-show="panel.mode == 'text'">
+      <label class="small">Font Size</label> <select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
+    </div>
+  </div>
+
+  <label class=small>Content 
+    <span ng-show="panel.mode == 'html'">(This area uses HTML sanitized via AngularJS's <a href='http://docs.angularjs.org/api/ngSanitize.$sanitize'>$sanitize</a> service)</span>
+    <span ng-show="panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span>
+  </label>
+  <textarea ng-model="panel.content" rows="6" style="width:95%"></textarea>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/text/lib/showdown.js
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/text/lib/showdown.js b/kibana/src/main/resources/app/panels/text/lib/showdown.js
new file mode 100644
index 0000000..9493071
--- /dev/null
+++ b/kibana/src/main/resources/app/panels/text/lib/showdown.js
@@ -0,0 +1,1454 @@
+//
+// showdown.js -- A javascript port of Markdown.
+//
+// Copyright (c) 2007 John Fraser.
+//
+// Original Markdown Copyright (c) 2004-2005 John Gruber
+//   <http://daringfireball.net/projects/markdown/>
+//
+// Redistributable under a BSD-style open source license.
+// See license.txt for more information.
+//
+// The full source distribution is at:
+//
+//        A A L
+//        T C A
+//        T K B
+//
+//   <http://www.attacklab.net/>
+//
+
+//
+// Wherever possible, Showdown is a straight, line-by-line port
+// of the Perl version of Markdown.
+//
+// This is not a normal parser design; it's basically just a
+// series of string substitutions.  It's hard to read and
+// maintain this way,  but keeping Showdown close to the original
+// design makes it easier to port new features.
+//
+// More importantly, Showdown behaves like markdown.pl in most
+// edge cases.  So web applications can do client-side preview
+// in Javascript, and then build identical HTML on the server.
+//
+// This port needs the new RegExp functionality of ECMA 262,
+// 3rd Edition (i.e. Javascript 1.5).  Most modern web browsers
+// should do fine.  Even with the new regular expression features,
+// We do a lot of work to emulate Perl's regex functionality.
+// The tricky changes in this file mostly have the "attacklab:"
+// label.  Major or self-explanatory changes don't.
+//
+// Smart diff tools like Araxis Merge will be able to match up
+// this file with markdown.pl in a useful way.  A little tweaking
+// helps: in a copy of markdown.pl, replace "#" with "//" and
+// replace "$text" with "text".  Be sure to ignore whitespace
+// and line endings.
+//
+
+
+//
+// Showdown usage:
+//
+//   var text = "Markdown *rocks*.";
+//
+//   var converter = new Showdown.converter();
+//   var html = converter.makeHtml(text);
+//
+//   alert(html);
+//
+// Note: move the sample code to the bottom of this
+// file before uncommenting it.
+//
+
+
+//
+// Showdown namespace
+//
+var Showdown = { extensions: {} };
+
+//
+// forEach
+//
+var forEach = Showdown.forEach = function(obj, callback) {
+  if (typeof obj.forEach === 'function') {
+    obj.forEach(callback);
+  } else {
+    var i, len = obj.length;
+    for (i = 0; i < len; i++) {
+      callback(obj[i], i, obj);
+    }
+  }
+};
+
+//
+// Standard extension naming
+//
+var stdExtName = function(s) {
+  return s.replace(/[_-]||\s/g, '').toLowerCase();
+};
+
+//
+// converter
+//
+// Wraps all "globals" so that the only thing
+// exposed is makeHtml().
+//
+Showdown.converter = function(converter_options) {
+
+//
+// Globals:
+//
+
+// Global hashes, used by various utility routines
+var g_urls;
+var g_titles;
+var g_html_blocks;
+
+// Used to track when we're inside an ordered or unordered list
+// (see _ProcessListItems() for details):
+var g_list_level = 0;
+
+// Global extensions
+var g_lang_extensions = [];
+var g_output_modifiers = [];
+
+
+//
+// Automatic Extension Loading (node only):
+//
+
+if (typeof module !== 'undefind' && typeof exports !== 'undefined' && typeof require !== 'undefind') {
+  var fs = require('fs');
+
+  if (fs) {
+    // Search extensions folder
+    var extensions = fs.readdirSync((__dirname || '.')+'/extensions').filter(function(file){
+      return ~file.indexOf('.js');
+    }).map(function(file){
+      return file.replace(/\.js$/, '');
+    });
+    // Load extensions into Showdown namespace
+    Showdown.forEach(extensions, function(ext){
+      var name = stdExtName(ext);
+      Showdown.extensions[name] = require('./extensions/' + ext);
+    });
+  }
+}
+
+this.makeHtml = function(text) {
+//
+// Main function. The order in which other subs are called here is
+// essential. Link and image substitutions need to happen before
+// _EscapeSpecialCharsWithinTagAttributes(), so that any *'s or _'s in the <a>
+// and <img> tags get encoded.
+//
+
+  // Clear the global hashes. If we don't clear these, you get conflicts
+  // from other articles when generating a page which contains more than
+  // one article (e.g. an index page that shows the N most recent
+  // articles):
+  g_urls = {};
+  g_titles = {};
+  g_html_blocks = [];
+
+  // attacklab: Replace ~ with ~T
+  // This lets us use tilde as an escape char to avoid md5 hashes
+  // The choice of character is arbitray; anything that isn't
+  // magic in Markdown will work.
+  text = text.replace(/~/g,"~T");
+
+  // attacklab: Replace $ with ~D
+  // RegExp interprets $ as a special character
+  // when it's in a replacement string
+  text = text.replace(/\$/g,"~D");
+
+  // Standardize line endings
+  text = text.replace(/\r\n/g,"\n"); // DOS to Unix
+  text = text.replace(/\r/g,"\n"); // Mac to Unix
+
+  // Make sure text begins and ends with a couple of newlines:
+  text = "\n\n" + text + "\n\n";
+
+  // Convert all tabs to spaces.
+  text = _Detab(text);
+
+  // Strip any lines consisting only of spaces and tabs.
+  // This makes subsequent regexen easier to write, because we can
+  // match consecutive blank lines with /\n+/ instead of something
+  // contorted like /[ \t]*\n+/ .
+  text = text.replace(/^[ \t]+$/mg,"");
+
+  // Run language extensions
+  Showdown.forEach(g_lang_extensions, function(x){
+    text = _ExecuteExtension(x, text);
+  });
+
+  // Handle github codeblocks prior to running HashHTML so that
+  // HTML contained within the codeblock gets escaped propertly
+  text = _DoGithubCodeBlocks(text);
+
+  // Turn block-level HTML blocks into hash entries
+  text = _HashHTMLBlocks(text);
+
+  // Strip link definitions, store in hashes.
+  text = _StripLinkDefinitions(text);
+
+  text = _RunBlockGamut(text);
+
+  text = _UnescapeSpecialChars(text);
+
+  // attacklab: Restore dollar signs
+  text = text.replace(/~D/g,"$$");
+
+  // attacklab: Restore tildes
+  text = text.replace(/~T/g,"~");
+
+  // Run output modifiers
+  Showdown.forEach(g_output_modifiers, function(x){
+    text = _ExecuteExtension(x, text);
+  });
+
+  return text;
+};
+//
+// Options:
+//
+
+// Parse extensions options into separate arrays
+if (converter_options && converter_options.extensions) {
+
+  var self = this;
+
+  // Iterate over each plugin
+  Showdown.forEach(converter_options.extensions, function(plugin){
+
+    // Assume it's a bundled plugin if a string is given
+    if (typeof plugin === 'string') {
+      plugin = Showdown.extensions[stdExtName(plugin)];
+    }
+
+    if (typeof plugin === 'function') {
+      // Iterate over each extension within that plugin
+      Showdown.forEach(plugin(self), function(ext){
+        // Sort extensions by type
+        if (ext.type) {
+          if (ext.type === 'language' || ext.type === 'lang') {
+            g_lang_extensions.push(ext);
+          } else if (ext.type === 'output' || ext.type === 'html') {
+            g_output_modifiers.push(ext);
+          }
+        } else {
+          // Assume language extension
+          g_output_modifiers.push(ext);
+        }
+      });
+    } else {
+      throw "Extension '" + plugin + "' could not be loaded.  It was either not found or is not a valid extension.";
+    }
+  });
+}
+
+
+var _ExecuteExtension = function(ext, text) {
+  if (ext.regex) {
+    var re = new RegExp(ext.regex, 'g');
+    return text.replace(re, ext.replace);
+  } else if (ext.filter) {
+    return ext.filter(text);
+  }
+};
+
+var _StripLinkDefinitions = function(text) {
+//
+// Strips link definitions from text, stores the URLs and titles in
+// hash references.
+//
+
+  // Link defs are in the form: ^[id]: url "optional title"
+
+  /*
+    var text = text.replace(/
+        ^[ ]{0,3}\[(.+)\]:  // id = $1  attacklab: g_tab_width - 1
+          [ \t]*
+          \n?       // maybe *one* newline
+          [ \t]*
+        <?(\S+?)>?      // url = $2
+          [ \t]*
+          \n?       // maybe one newline
+          [ \t]*
+        (?:
+          (\n*)       // any lines skipped = $3 attacklab: lookbehind removed
+          ["(]
+          (.+?)       // title = $4
+          [")]
+          [ \t]*
+        )?          // title is optional
+        (?:\n+|$)
+        /gm,
+        function(){...});
+  */
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += "~0";
+
+  text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|(?=~0))/gm,
+    function (wholeMatch,m1,m2,m3,m4) {
+      m1 = m1.toLowerCase();
+      g_urls[m1] = _EncodeAmpsAndAngles(m2);  // Link IDs are case-insensitive
+      if (m3) {
+        // Oops, found blank lines, so it's not a title.
+        // Put back the parenthetical statement we stole.
+        return m3+m4;
+      } else if (m4) {
+        g_titles[m1] = m4.replace(/"/g,"&quot;");
+      }
+
+      // Completely remove the definition from the text
+      return "";
+    }
+  );
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/,"");
+
+  return text;
+}
+
+
+var _HashHTMLBlocks = function(text) {
+  // attacklab: Double up blank lines to reduce lookaround
+  text = text.replace(/\n/g,"\n\n");
+
+  // Hashify HTML blocks:
+  // We only want to do this for block-level HTML tags, such as headers,
+  // lists, and tables. That's because we still want to wrap <p>s around
+  // "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+  // phrase emphasis, and spans. The list of tags we're looking for is
+  // hard-coded:
+  var block_tags_a = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style|section|header|footer|nav|article|aside";
+  var block_tags_b = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside";
+
+  // First, look for nested blocks, e.g.:
+  //   <div>
+  //     <div>
+  //     tags for inner block must be indented.
+  //     </div>
+  //   </div>
+  //
+  // The outermost tags must start at the left margin for this to match, and
+  // the inner nested divs must be indented.
+  // We need to do this before the next, more liberal match, because the next
+  // match will start at the first `<div>` and stop at the first `</div>`.
+
+  // attacklab: This regex can be expensive when it fails.
+  /*
+    var text = text.replace(/
+    (           // save in $1
+      ^         // start of line  (with /m)
+      <($block_tags_a)  // start tag = $2
+      \b          // word break
+                // attacklab: hack around khtml/pcre bug...
+      [^\r]*?\n     // any number of lines, minimally matching
+      </\2>       // the matching end tag
+      [ \t]*        // trailing spaces/tabs
+      (?=\n+)       // followed by a newline
+    )           // attacklab: there are sentinel newlines at end of document
+    /gm,function(){...}};
+  */
+  text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm,hashElement);
+
+  //
+  // Now match more liberally, simply from `\n<tag>` to `</tag>\n`
+  //
+
+  /*
+    var text = text.replace(/
+    (           // save in $1
+      ^         // start of line  (with /m)
+      <($block_tags_b)  // start tag = $2
+      \b          // word break
+                // attacklab: hack around khtml/pcre bug...
+      [^\r]*?       // any number of lines, minimally matching
+      </\2>       // the matching end tag
+      [ \t]*        // trailing spaces/tabs
+      (?=\n+)       // followed by a newline
+    )           // attacklab: there are sentinel newlines at end of document
+    /gm,function(){...}};
+  */
+  text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,hashElement);
+
+  // Special case just for <hr />. It was easier to make a special case than
+  // to make the other regex more complicated.
+
+  /*
+    text = text.replace(/
+    (           // save in $1
+      \n\n        // Starting after a blank line
+      [ ]{0,3}
+      (<(hr)        // start tag = $2
+      \b          // word break
+      ([^<>])*?     //
+      \/?>)       // the matching end tag
+      [ \t]*
+      (?=\n{2,})      // followed by a blank line
+    )
+    /g,hashElement);
+  */
+  text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,hashElement);
+
+  // Special case for standalone HTML comments:
+
+  /*
+    text = text.replace(/
+    (           // save in $1
+      \n\n        // Starting after a blank line
+      [ ]{0,3}      // attacklab: g_tab_width - 1
+      <!
+      (--[^\r]*?--\s*)+
+      >
+      [ \t]*
+      (?=\n{2,})      // followed by a blank line
+    )
+    /g,hashElement);
+  */
+  text = text.replace(/(\n\n[ ]{0,3}<!(--[^\r]*?--\s*)+>[ \t]*(?=\n{2,}))/g,hashElement);
+
+  // PHP and ASP-style processor instructions (<?...?> and <%...%>)
+
+  /*
+    text = text.replace(/
+    (?:
+      \n\n        // Starting after a blank line
+    )
+    (           // save in $1
+      [ ]{0,3}      // attacklab: g_tab_width - 1
+      (?:
+        <([?%])     // $2
+        [^\r]*?
+        \2>
+      )
+      [ \t]*
+      (?=\n{2,})      // followed by a blank line
+    )
+    /g,hashElement);
+  */
+  text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,hashElement);
+
+  // attacklab: Undo double lines (see comment at top of this function)
+  text = text.replace(/\n\n/g,"\n");
+  return text;
+}
+
+var hashElement = function(wholeMatch,m1) {
+  var blockText = m1;
+
+  // Undo double lines
+  blockText = blockText.replace(/\n\n/g,"\n");
+  blockText = blockText.replace(/^\n/,"");
+
+  // strip trailing blank lines
+  blockText = blockText.replace(/\n+$/g,"");
+
+  // Replace the element text with a marker ("~KxK" where x is its key)
+  blockText = "\n\n~K" + (g_html_blocks.push(blockText)-1) + "K\n\n";
+
+  return blockText;
+};
+
+var _RunBlockGamut = function(text) {
+//
+// These are all the transformations that form block-level
+// tags like paragraphs, headers, and list items.
+//
+  text = _DoHeaders(text);
+
+  // Do Horizontal Rules:
+  var key = hashBlock("<hr />");
+  text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm,key);
+  text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm,key);
+  text = text.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm,key);
+
+  text = _DoLists(text);
+  text = _DoCodeBlocks(text);
+  text = _DoBlockQuotes(text);
+
+  // We already ran _HashHTMLBlocks() before, in Markdown(), but that
+  // was to escape raw HTML in the original Markdown source. This time,
+  // we're escaping the markup we've just created, so that we don't wrap
+  // <p> tags around block-level tags.
+  text = _HashHTMLBlocks(text);
+  text = _FormParagraphs(text);
+
+  return text;
+};
+
+
+var _RunSpanGamut = function(text) {
+//
+// These are all the transformations that occur *within* block-level
+// tags like paragraphs, headers, and list items.
+//
+
+  text = _DoCodeSpans(text);
+  text = _EscapeSpecialCharsWithinTagAttributes(text);
+  text = _EncodeBackslashEscapes(text);
+
+  // Process anchor and image tags. Images must come first,
+  // because ![foo][f] looks like an anchor.
+  text = _DoImages(text);
+  text = _DoAnchors(text);
+
+  // Make links out of things like `<http://example.com/>`
+  // Must come after _DoAnchors(), because you can use < and >
+  // delimiters in inline links like [this](<url>).
+  text = _DoAutoLinks(text);
+  text = _EncodeAmpsAndAngles(text);
+  text = _DoItalicsAndBold(text);
+
+  // Do hard breaks:
+  text = text.replace(/  +\n/g," <br />\n");
+
+  return text;
+}
+
+var _EscapeSpecialCharsWithinTagAttributes = function(text) {
+//
+// Within tags -- meaning between < and > -- encode [\ ` * _] so they
+// don't conflict with their use in Markdown for code, italics and strong.
+//
+
+  // Build a regex to find HTML tags and comments.  See Friedl's
+  // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
+  var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|<!(--.*?--\s*)+>)/gi;
+
+  text = text.replace(regex, function(wholeMatch) {
+    var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g,"$1`");
+    tag = escapeCharacters(tag,"\\`*_");
+    return tag;
+  });
+
+  return text;
+}
+
+var _DoAnchors = function(text) {
+//
+// Turn Markdown link shortcuts into XHTML <a> tags.
+//
+  //
+  // First, handle reference-style links: [link text] [id]
+  //
+
+  /*
+    text = text.replace(/
+    (             // wrap whole match in $1
+      \[
+      (
+        (?:
+          \[[^\]]*\]    // allow brackets nested one level
+          |
+          [^\[]     // or anything else
+        )*
+      )
+      \]
+
+      [ ]?          // one optional space
+      (?:\n[ ]*)?       // one optional newline followed by spaces
+
+      \[
+      (.*?)         // id = $3
+      \]
+    )()()()()         // pad remaining backreferences
+    /g,_DoAnchors_callback);
+  */
+  text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,writeAnchorTag);
+
+  //
+  // Next, inline-style links: [link text](url "optional title")
+  //
+
+  /*
+    text = text.replace(/
+      (           // wrap whole match in $1
+        \[
+        (
+          (?:
+            \[[^\]]*\]  // allow brackets nested one level
+          |
+          [^\[\]]     // or anything else
+        )
+      )
+      \]
+      \(            // literal paren
+      [ \t]*
+      ()            // no id, so leave $3 empty
+      <?(.*?)>?       // href = $4
+      [ \t]*
+      (           // $5
+        (['"])        // quote char = $6
+        (.*?)       // Title = $7
+        \6          // matching quote
+        [ \t]*        // ignore any spaces/tabs between closing quote and )
+      )?            // title is optional
+      \)
+    )
+    /g,writeAnchorTag);
+  */
+  text = text.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeAnchorTag);
+
+  //
+  // Last, handle reference-style shortcuts: [link text]
+  // These must come last in case you've also got [link test][1]
+  // or [link test](/foo)
+  //
+
+  /*
+    text = text.replace(/
+    (             // wrap whole match in $1
+      \[
+      ([^\[\]]+)        // link text = $2; can't contain '[' or ']'
+      \]
+    )()()()()()         // pad rest of backreferences
+    /g, writeAnchorTag);
+  */
+  text = text.replace(/(\[([^\[\]]+)\])()()()()()/g, writeAnchorTag);
+
+  return text;
+}
+
+var writeAnchorTag = function(wholeMatch,m1,m2,m3,m4,m5,m6,m7) {
+  if (m7 == undefined) m7 = "";
+  var whole_match = m1;
+  var link_text   = m2;
+  var link_id  = m3.toLowerCase();
+  var url   = m4;
+  var title = m7;
+
+  if (url == "") {
+    if (link_id == "") {
+      // lower-case and turn embedded newlines into spaces
+      link_id = link_text.toLowerCase().replace(/ ?\n/g," ");
+    }
+    url = "#"+link_id;
+
+    if (g_urls[link_id] != undefined) {
+      url = g_urls[link_id];
+      if (g_titles[link_id] != undefined) {
+        title = g_titles[link_id];
+      }
+    }
+    else {
+      if (whole_match.search(/\(\s*\)$/m)>-1) {
+        // Special case for explicit empty url
+        url = "";
+      } else {
+        return whole_match;
+      }
+    }
+  }
+
+  url = escapeCharacters(url,"*_");
+  var result = "<a href=\"" + url + "\"";
+
+  if (title != "") {
+    title = title.replace(/"/g,"&quot;");
+    title = escapeCharacters(title,"*_");
+    result +=  " title=\"" + title + "\"";
+  }
+
+  result += ">" + link_text + "</a>";
+
+  return result;
+}
+
+
+var _DoImages = function(text) {
+//
+// Turn Markdown image shortcuts into <img> tags.
+//
+
+  //
+  // First, handle reference-style labeled images: ![alt text][id]
+  //
+
+  /*
+    text = text.replace(/
+    (           // wrap whole match in $1
+      !\[
+      (.*?)       // alt text = $2
+      \]
+
+      [ ]?        // one optional space
+      (?:\n[ ]*)?     // one optional newline followed by spaces
+
+      \[
+      (.*?)       // id = $3
+      \]
+    )()()()()       // pad rest of backreferences
+    /g,writeImageTag);
+  */
+  text = text.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,writeImageTag);
+
+  //
+  // Next, handle inline images:  ![alt text](url "optional title")
+  // Don't forget: encode * and _
+
+  /*
+    text = text.replace(/
+    (           // wrap whole match in $1
+      !\[
+      (.*?)       // alt text = $2
+      \]
+      \s?         // One optional whitespace character
+      \(          // literal paren
+      [ \t]*
+      ()          // no id, so leave $3 empty
+      <?(\S+?)>?      // src url = $4
+      [ \t]*
+      (         // $5
+        (['"])      // quote char = $6
+        (.*?)     // title = $7
+        \6        // matching quote
+        [ \t]*
+      )?          // title is optional
+    \)
+    )
+    /g,writeImageTag);
+  */
+  text = text.replace(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,writeImageTag);
+
+  return text;
+}
+
+var writeImageTag = function(wholeMatch,m1,m2,m3,m4,m5,m6,m7) {
+  var whole_match = m1;
+  var alt_text   = m2;
+  var link_id  = m3.toLowerCase();
+  var url   = m4;
+  var title = m7;
+
+  if (!title) title = "";
+
+  if (url == "") {
+    if (link_id == "") {
+      // lower-case and turn embedded newlines into spaces
+      link_id = alt_text.toLowerCase().replace(/ ?\n/g," ");
+    }
+    url = "#"+link_id;
+
+    if (g_urls[link_id] != undefined) {
+      url = g_urls[link_id];
+      if (g_titles[link_id] != undefined) {
+        title = g_titles[link_id];
+      }
+    }
+    else {
+      return whole_match;
+    }
+  }
+
+  alt_text = alt_text.replace(/"/g,"&quot;");
+  url = escapeCharacters(url,"*_");
+  var result = "<img src=\"" + url + "\" alt=\"" + alt_text + "\"";
+
+  // attacklab: Markdown.pl adds empty title attributes to images.
+  // Replicate this bug.
+
+  //if (title != "") {
+    title = title.replace(/"/g,"&quot;");
+    title = escapeCharacters(title,"*_");
+    result +=  " title=\"" + title + "\"";
+  //}
+
+  result += " />";
+
+  return result;
+}
+
+
+var _DoHeaders = function(text) {
+
+  // Setext-style headers:
+  //  Header 1
+  //  ========
+  //
+  //  Header 2
+  //  --------
+  //
+  text = text.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm,
+    function(wholeMatch,m1){return hashBlock('<h1 id="' + headerId(m1) + '">' + _RunSpanGamut(m1) + "</h1>");});
+
+  text = text.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm,
+    function(matchFound,m1){return hashBlock('<h2 id="' + headerId(m1) + '">' + _RunSpanGamut(m1) + "</h2>");});
+
+  // atx-style headers:
+  //  # Header 1
+  //  ## Header 2
+  //  ## Header 2 with closing hashes ##
+  //  ...
+  //  ###### Header 6
+  //
+
+  /*
+    text = text.replace(/
+      ^(\#{1,6})        // $1 = string of #'s
+      [ \t]*
+      (.+?)         // $2 = Header text
+      [ \t]*
+      \#*           // optional closing #'s (not counted)
+      \n+
+    /gm, function() {...});
+  */
+
+  text = text.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,
+    function(wholeMatch,m1,m2) {
+      var h_level = m1.length;
+      return hashBlock("<h" + h_level + ' id="' + headerId(m2) + '">' + _RunSpanGamut(m2) + "</h" + h_level + ">");
+    });
+
+  function headerId(m) {
+    return m.replace(/[^\w]/g, '').toLowerCase();
+  }
+  return text;
+}
+
+// This declaration keeps Dojo compressor from outputting garbage:
+var _ProcessListItems;
+
+var _DoLists = function(text) {
+//
+// Form HTML ordered (numbered) and unordered (bulleted) lists.
+//
+
+  // attacklab: add sentinel to hack around khtml/safari bug:
+  // http://bugs.webkit.org/show_bug.cgi?id=11231
+  text += "~0";
+
+  // Re-usable pattern to match any entirel ul or ol list:
+
+  /*
+    var whole_list = /
+    (                 // $1 = whole list
+      (               // $2
+        [ ]{0,3}          // attacklab: g_tab_width - 1
+        ([*+-]|\d+[.])        // $3 = first list item marker
+        [ \t]+
+      )
+      [^\r]+?
+      (               // $4
+        ~0              // sentinel for workaround; should be $
+      |
+        \n{2,}
+        (?=\S)
+        (?!             // Negative lookahead for another list item marker
+          [ \t]*
+          (?:[*+-]|\d+[.])[ \t]+
+        )
+      )
+    )/g
+  */
+  var whole_list = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
+
+  if (g_list_level) {
+    text = text.replace(whole_list,function(wholeMatch,m1,m2) {
+      var list = m1;
+      var list_type = (m2.search(/[*+-]/g)>-1) ? "ul" : "ol";
+
+      // Turn double returns into triple returns, so that we can make a
+      // paragraph for the last item in a list, if necessary:
+      list = list.replace(/\n{2,}/g,"\n\n\n");;
+      var result = _ProcessListItems(list);
+
+      // Trim any trailing whitespace, to put the closing `</$list_type>`
+      // up on the preceding line, to get it past the current stupid
+      // HTML block parser. This is a hack to work around the terrible
+      // hack that is the HTML block parser.
+      result = result.replace(/\s+$/,"");
+      result = "<"+list_type+">" + result + "</"+list_type+">\n";
+      return result;
+    });
+  } else {
+    whole_list = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g;
+    text = text.replace(whole_list,function(wholeMatch,m1,m2,m3) {
+      var runup = m1;
+      var list = m2;
+
+      var list_type = (m3.search(/[*+-]/g)>-1) ? "ul" : "ol";
+      // Turn double returns into triple returns, so that we can make a
+      // paragraph for the last item in a list, if necessary:
+      var list = list.replace(/\n{2,}/g,"\n\n\n");;
+      var result = _ProcessListItems(list);
+      result = runup + "<"+list_type+">\n" + result + "</"+list_type+">\n";
+      return result;
+    });
+  }
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/,"");
+
+  return text;
+}
+
+_ProcessListItems = function(list_str) {
+//
+//  Process the contents of a single ordered or unordered list, splitting it
+//  into individual list items.
+//
+  // The $g_list_level global keeps track of when we're inside a list.
+  // Each time we enter a list, we increment it; when we leave a list,
+  // we decrement. If it's zero, we're not in a list anymore.
+  //
+  // We do this because when we're not inside a list, we want to treat
+  // something like this:
+  //
+  //    I recommend upgrading to version
+  //    8. Oops, now this line is treated
+  //    as a sub-list.
+  //
+  // As a single paragraph, despite the fact that the second line starts
+  // with a digit-period-space sequence.
+  //
+  // Whereas when we're inside a list (or sub-list), that line will be
+  // treated as the start of a sub-list. What a kludge, huh? This is
+  // an aspect of Markdown's syntax that's hard to parse perfectly
+  // without resorting to mind-reading. Perhaps the solution is to
+  // change the syntax rules such that sub-lists must start with a
+  // starting cardinal number; e.g. "1." or "a.".
+
+  g_list_level++;
+
+  // trim trailing blank lines:
+  list_str = list_str.replace(/\n{2,}$/,"\n");
+
+  // attacklab: add sentinel to emulate \z
+  list_str += "~0";
+
+  /*
+    list_str = list_str.replace(/
+      (\n)?             // leading line = $1
+      (^[ \t]*)           // leading whitespace = $2
+      ([*+-]|\d+[.]) [ \t]+     // list marker = $3
+      ([^\r]+?            // list item text   = $4
+      (\n{1,2}))
+      (?= \n* (~0 | \2 ([*+-]|\d+[.]) [ \t]+))
+    /gm, function(){...});
+  */
+  list_str = list_str.replace(/(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
+    function(wholeMatch,m1,m2,m3,m4){
+      var item = m4;
+      var leading_line = m1;
+      var leading_space = m2;
+
+      if (leading_line || (item.search(/\n{2,}/)>-1)) {
+        item = _RunBlockGamut(_Outdent(item));
+      }
+      else {
+        // Recursion for sub-lists:
+        item = _DoLists(_Outdent(item));
+        item = item.replace(/\n$/,""); // chomp(item)
+        item = _RunSpanGamut(item);
+      }
+
+      return  "<li>" + item + "</li>\n";
+    }
+  );
+
+  // attacklab: strip sentinel
+  list_str = list_str.replace(/~0/g,"");
+
+  g_list_level--;
+  return list_str;
+}
+
+
+var _DoCodeBlocks = function(text) {
+//
+//  Process Markdown `<pre><code>` blocks.
+//
+
+  /*
+    text = text.replace(text,
+      /(?:\n\n|^)
+      (               // $1 = the code block -- one or more lines, starting with a space/tab
+        (?:
+          (?:[ ]{4}|\t)     // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
+          .*\n+
+        )+
+      )
+      (\n*[ ]{0,3}[^ \t\n]|(?=~0))  // attacklab: g_tab_width
+    /g,function(){...});
+  */
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += "~0";
+
+  text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
+    function(wholeMatch,m1,m2) {
+      var codeblock = m1;
+      var nextChar = m2;
+
+      codeblock = _EncodeCode( _Outdent(codeblock));
+      codeblock = _Detab(codeblock);
+      codeblock = codeblock.replace(/^\n+/g,""); // trim leading newlines
+      codeblock = codeblock.replace(/\n+$/g,""); // trim trailing whitespace
+
+      codeblock = "<pre><code>" + codeblock + "\n</code></pre>";
+
+      return hashBlock(codeblock) + nextChar;
+    }
+  );
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/,"");
+
+  return text;
+};
+
+var _DoGithubCodeBlocks = function(text) {
+//
+//  Process Github-style code blocks
+//  Example:
+//  ```ruby
+//  def hello_world(x)
+//    puts "Hello, #{x}"
+//  end
+//  ```
+//
+
+
+  // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
+  text += "~0";
+
+  text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g,
+    function(wholeMatch,m1,m2) {
+      var language = m1;
+      var codeblock = m2;
+
+      codeblock = _EncodeCode(codeblock);
+      codeblock = _Detab(codeblock);
+      codeblock = codeblock.replace(/^\n+/g,""); // trim leading newlines
+      codeblock = codeblock.replace(/\n+$/g,""); // trim trailing whitespace
+
+      codeblock = "<pre><code" + (language ? " class=\"" + language + '"' : "") + ">" + codeblock + "\n</code></pre>";
+
+      return hashBlock(codeblock);
+    }
+  );
+
+  // attacklab: strip sentinel
+  text = text.replace(/~0/,"");
+
+  return text;
+}
+
+var hashBlock = function(text) {
+  text = text.replace(/(^\n+|\n+$)/g,"");
+  return "\n\n~K" + (g_html_blocks.push(text)-1) + "K\n\n";
+}
+
+var _DoCodeSpans = function(text) {
+//
+//   *  Backtick quotes are used for <code></code> spans.
+//
+//   *  You can use multiple backticks as the delimiters if you want to
+//   include literal backticks in the code span. So, this input:
+//
+//     Just type ``foo `bar` baz`` at the prompt.
+//
+//     Will translate to:
+//
+//     <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+//
+//  There's no arbitrary limit to the number of backticks you
+//  can use as delimters. If you need three consecutive backticks
+//  in your code, use four for delimiters, etc.
+//
+//  *  You can use spaces to get literal backticks at the edges:
+//
+//     ... type `` `bar` `` ...
+//
+//     Turns to:
+//
+//     ... type <code>`bar`</code> ...
+//
+
+  /*
+    text = text.replace(/
+      (^|[^\\])         // Character before opening ` can't be a backslash
+      (`+)            // $2 = Opening run of `
+      (             // $3 = The code block
+        [^\r]*?
+        [^`]          // attacklab: work around lack of lookbehind
+      )
+      \2              // Matching closer
+      (?!`)
+    /gm, function(){...});
+  */
+
+  text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
+    function(wholeMatch,m1,m2,m3,m4) {
+      var c = m3;
+      c = c.replace(/^([ \t]*)/g,""); // leading whitespace
+      c = c.replace(/[ \t]*$/g,""); // trailing whitespace
+      c = _EncodeCode(c);
+      return m1+"<code>"+c+"</code>";
+    });
+
+  return text;
+}
+
+var _EncodeCode = function(text) {
+//
+// Encode/escape certain characters inside Markdown code runs.
+// The point is that in code, these characters are literals,
+// and lose their special Markdown meanings.
+//
+  // Encode all ampersands; HTML entities are not
+  // entities within a Markdown code span.
+  text = text.replace(/&/g,"&amp;");
+
+  // Do the angle bracket song and dance:
+  text = text.replace(/</g,"&lt;");
+  text = text.replace(/>/g,"&gt;");
+
+  // Now, escape characters that are magic in Markdown:
+  text = escapeCharacters(text,"\*_{}[]\\",false);
+
+// jj the line above breaks this:
+//---
+
+//* Item
+
+//   1. Subitem
+
+//            special char: *
+//---
+
+  return text;
+}
+
+
+var _DoItalicsAndBold = function(text) {
+
+  // <strong> must go first:
+  text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,
+    "<strong>$2</strong>");
+
+  text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,
+    "<em>$2</em>");
+
+  return text;
+}
+
+
+var _DoBlockQuotes = function(text) {
+
+  /*
+    text = text.replace(/
+    (               // Wrap whole match in $1
+      (
+        ^[ \t]*>[ \t]?      // '>' at the start of a line
+        .+\n          // rest of the first line
+        (.+\n)*         // subsequent consecutive lines
+        \n*           // blanks
+      )+
+    )
+    /gm, function(){...});
+  */
+
+  text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,
+    function(wholeMatch,m1) {
+      var bq = m1;
+
+      // attacklab: hack around Konqueror 3.5.4 bug:
+      // "----------bug".replace(/^-/g,"") == "bug"
+
+      bq = bq.replace(/^[ \t]*>[ \t]?/gm,"~0"); // trim one level of quoting
+
+      // attacklab: clean up hack
+      bq = bq.replace(/~0/g,"");
+
+      bq = bq.replace(/^[ \t]+$/gm,"");   // trim whitespace-only lines
+      bq = _RunBlockGamut(bq);        // recurse
+
+      bq = bq.replace(/(^|\n)/g,"$1  ");
+      // These leading spaces screw with <pre> content, so we need to fix that:
+      bq = bq.replace(
+          /(\s*<pre>[^\r]+?<\/pre>)/gm,
+        function(wholeMatch,m1) {
+          var pre = m1;
+          // attacklab: hack around Konqueror 3.5.4 bug:
+          pre = pre.replace(/^  /mg,"~0");
+          pre = pre.replace(/~0/g,"");
+          return pre;
+        });
+
+      return hashBlock("<blockquote>\n" + bq + "\n</blockquote>");
+    });
+  return text;
+}
+
+
+var _FormParagraphs = function(text) {
+//
+//  Params:
+//    $text - string to process with html <p> tags
+//
+
+  // Strip leading and trailing lines:
+  text = text.replace(/^\n+/g,"");
+  text = text.replace(/\n+$/g,"");
+
+  var grafs = text.split(/\n{2,}/g);
+  var grafsOut = [];
+
+  //
+  // Wrap <p> tags.
+  //
+  var end = grafs.length;
+  for (var i=0; i<end; i++) {
+    var str = grafs[i];
+
+    // if this is an HTML marker, copy it
+    if (str.search(/~K(\d+)K/g) >= 0) {
+      grafsOut.push(str);
+    }
+    else if (str.search(/\S/) >= 0) {
+      str = _RunSpanGamut(str);
+      str = str.replace(/^([ \t]*)/g,"<p>");
+      str += "</p>"
+      grafsOut.push(str);
+    }
+
+  }
+
+  //
+  // Unhashify HTML blocks
+  //
+  end = grafsOut.length;
+  for (var i=0; i<end; i++) {
+    // if this is a marker for an html block...
+    while (grafsOut[i].search(/~K(\d+)K/) >= 0) {
+      var blockText = g_html_blocks[RegExp.$1];
+      blockText = blockText.replace(/\$/g,"$$$$"); // Escape any dollar signs
+      grafsOut[i] = grafsOut[i].replace(/~K\d+K/,blockText);
+    }
+  }
+
+  return grafsOut.join("\n\n");
+}
+
+
+var _EncodeAmpsAndAngles = function(text) {
+// Smart processing for ampersands and angle brackets that need to be encoded.
+
+  // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+  //   http://bumppo.net/projects/amputator/
+  text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g,"&amp;");
+
+  // Encode naked <'s
+  text = text.replace(/<(?![a-z\/?\$!])/gi,"&lt;");
+
+  return text;
+}
+
+
+var _EncodeBackslashEscapes = function(text) {
+//
+//   Parameter:  String.
+//   Returns: The string, with after processing the following backslash
+//         escape sequences.
+//
+
+  // attacklab: The polite way to do this is with the new
+  // escapeCharacters() function:
+  //
+  //  text = escapeCharacters(text,"\\",true);
+  //  text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
+  //
+  // ...but we're sidestepping its use of the (slow) RegExp constructor
+  // as an optimization for Firefox.  This function gets called a LOT.
+
+  text = text.replace(/\\(\\)/g,escapeCharacters_callback);
+  text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g,escapeCharacters_callback);
+  return text;
+}
+
+
+var _DoAutoLinks = function(text) {
+
+  text = text.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi,"<a href=\"$1\">$1</a>");
+
+  // Email addresses: <address@domain.foo>
+
+  /*
+    text = text.replace(/
+      <
+      (?:mailto:)?
+      (
+        [-.\w]+
+        \@
+        [-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
+      )
+      >
+    /gi, _DoAutoLinks_callback());
+  */
+  text = text.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,
+    function(wholeMatch,m1) {
+      return _EncodeEmailAddress( _UnescapeSpecialChars(m1) );
+    }
+  );
+
+  return text;
+}
+
+
+var _EncodeEmailAddress = function(addr) {
+//
+//  Input: an email address, e.g. "foo@example.com"
+//
+//  Output: the email address as a mailto link, with each character
+//  of the address encoded as either a decimal or hex entity, in
+//  the hopes of foiling most address harvesting spam bots. E.g.:
+//
+//  <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+//     x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+//     &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+//
+//  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+//  mailing list: <http://tinyurl.com/yu7ue>
+//
+
+  var encode = [
+    function(ch){return "&#"+ch.charCodeAt(0)+";";},
+    function(ch){return "&#x"+ch.charCodeAt(0).toString(16)+";";},
+    function(ch){return ch;}
+  ];
+
+  addr = "mailto:" + addr;
+
+  addr = addr.replace(/./g, function(ch) {
+    if (ch == "@") {
+        // this *must* be encoded. I insist.
+      ch = encode[Math.floor(Math.random()*2)](ch);
+    } else if (ch !=":") {
+      // leave ':' alone (to spot mailto: later)
+      var r = Math.random();
+      // roughly 10% raw, 45% hex, 45% dec
+      ch =  (
+          r > .9  ? encode[2](ch)   :
+          r > .45 ? encode[1](ch)   :
+                encode[0](ch)
+        );
+    }
+    return ch;
+  });
+
+  addr = "<a href=\"" + addr + "\">" + addr + "</a>";
+  addr = addr.replace(/">.+:/g,"\">"); // strip the mailto: from the visible part
+
+  return addr;
+}
+
+
+var _UnescapeSpecialChars = function(text) {
+//
+// Swap back in all the special characters we've hidden.
+//
+  text = text.replace(/~E(\d+)E/g,
+    function(wholeMatch,m1) {
+      var charCodeToReplace = parseInt(m1);
+      return String.fromCharCode(charCodeToReplace);
+    }
+  );
+  return text;
+}
+
+
+var _Outdent = function(text) {
+//
+// Remove one level of line-leading tabs or spaces
+//
+
+  // attacklab: hack around Konqueror 3.5.4 bug:
+  // "----------bug".replace(/^-/g,"") == "bug"
+
+  text = text.replace(/^(\t|[ ]{1,4})/gm,"~0"); // attacklab: g_tab_width
+
+  // attacklab: clean up hack
+  text = text.replace(/~0/g,"")
+
+  return text;
+}
+
+var _Detab = function(text) {
+// attacklab: Detab's completely rewritten for speed.
+// In perl we could fix it by anchoring the regexp with \G.
+// In javascript we're less fortunate.
+
+  // expand first n-1 tabs
+  text = text.replace(/\t(?=\t)/g,"    "); // attacklab: g_tab_width
+
+  // replace the nth with two sentinels
+  text = text.replace(/\t/g,"~A~B");
+
+  // use the sentinel to anchor our regex so it doesn't explode
+  text = text.replace(/~B(.+?)~A/g,
+    function(wholeMatch,m1,m2) {
+      var leadingText = m1;
+      var numSpaces = 4 - leadingText.length % 4;  // attacklab: g_tab_width
+
+      // there *must* be a better way to do this:
+      for (var i=0; i<numSpaces; i++) leadingText+=" ";
+
+      return leadingText;
+    }
+  );
+
+  // clean up sentinels
+  text = text.replace(/~A/g,"    ");  // attacklab: g_tab_width
+  text = text.replace(/~B/g,"");
+
+  return text;
+}
+
+
+//
+//  attacklab: Utility functions
+//
+
+
+var escapeCharacters = function(text, charsToEscape, afterBackslash) {
+  // First we have to escape the escape characters so that
+  // we can build a character class out of them
+  var regexString = "([" + charsToEscape.replace(/([\[\]\\])/g,"\\$1") + "])";
+
+  if (afterBackslash) {
+    regexString = "\\\\" + regexString;
+  }
+
+  var regex = new RegExp(regexString,"g");
+  text = text.replace(regex,escapeCharacters_callback);
+
+  return text;
+}
+
+
+var escapeCharacters_callback = function(wholeMatch,m1) {
+  var charCodeToEscape = m1.charCodeAt(0);
+  return "~E"+charCodeToEscape+"E";
+}
+
+} // end of Showdown.converter
+
+
+// export
+if (typeof module !== 'undefined') module.exports = Showdown;
+
+// stolen from AMD branch of underscore
+// AMD define happens at the end for compatibility with AMD loaders
+// that don't enforce next-turn semantics on modules.
+if (typeof define === 'function' && define.amd) {
+    define(function() {
+        return Showdown;
+    });
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/text/module.html
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/text/module.html b/kibana/src/main/resources/app/panels/text/module.html
index 61a725f..3b7269c 100644
--- a/kibana/src/main/resources/app/panels/text/module.html
+++ b/kibana/src/main/resources/app/panels/text/module.html
@@ -1 +1,10 @@
-<div ng-controller="text" ng-init="init()"><markdown ng-show="ready && panel.mode == 'markdown'">{{panel.content}}</markdown><p ng-show="panel.mode == 'text'" ng-style="panel.style" ng-bind-html="panel.content | striphtml | newlines"></p><p ng-show="panel.mode == 'html'" ng-bind-html="panel.content"></p></div>
\ No newline at end of file
+<div ng-controller='text' ng-init="init()">
+  <!--<p ng-style="panel.style" ng-bind-html-unsafe="panel.content | striphtml | newlines"></p>-->
+  <markdown ng-show="ready && panel.mode == 'markdown'">
+    {{panel.content}}
+  </markdown>
+  <p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html="panel.content | striphtml | newlines">
+  </p>
+  <p ng-show="panel.mode == 'html'" ng-bind-html="panel.content">
+  </p>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/text/module.js
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/text/module.js b/kibana/src/main/resources/app/panels/text/module.js
index 66e1fd9..5be6382 100644
--- a/kibana/src/main/resources/app/panels/text/module.js
+++ b/kibana/src/main/resources/app/panels/text/module.js
@@ -1,4 +1,99 @@
-/*! kibana - v3.1.2 - 2014-11-07
- * Copyright (c) 2014 Rashid Khan; Licensed Apache License */
+/** @scratch /panels/5
+ *
+ * include::panels/text.asciidoc[]
+ */
 
-var Showdown={extensions:{}},forEach=Showdown.forEach=function(a,b){if("function"==typeof a.forEach)a.forEach(b);else{var c,d=a.length;for(c=0;d>c;c++)b(a[c],c,a)}},stdExtName=function(a){return a.replace(/[_-]||\s/g,"").toLowerCase()};Showdown.converter=function(a){var b,c,d,e=0,f=[],g=[];if("undefind"!=typeof module&&"undefined"!=typeof exports&&"undefind"!=typeof require){var h=require("fs");if(h){var i=h.readdirSync((__dirname||".")+"/extensions").filter(function(a){return~a.indexOf(".js")}).map(function(a){return a.replace(/\.js$/,"")});Showdown.forEach(i,function(a){var b=stdExtName(a);Showdown.extensions[b]=require("./extensions/"+a)})}}if(this.makeHtml=function(a){return b={},c={},d=[],a=a.replace(/~/g,"~T"),a=a.replace(/\$/g,"~D"),a=a.replace(/\r\n/g,"\n"),a=a.replace(/\r/g,"\n"),a="\n\n"+a+"\n\n",a=M(a),a=a.replace(/^[ \t]+$/gm,""),Showdown.forEach(f,function(b){a=l(b,a)}),a=z(a),a=n(a),a=m(a),a=p(a),a=K(a),a=a.replace(/~D/g,"$$"),a=a.replace(/~T/g,"~"),Showdown.forEach(g,
 function(b){a=l(b,a)}),a},a&&a.extensions){var j=this;Showdown.forEach(a.extensions,function(a){if("string"==typeof a&&(a=Showdown.extensions[stdExtName(a)]),"function"!=typeof a)throw"Extension '"+a+"' could not be loaded.  It was either not found or is not a valid extension.";Showdown.forEach(a(j),function(a){a.type?"language"===a.type||"lang"===a.type?f.push(a):("output"===a.type||"html"===a.type)&&g.push(a):g.push(a)})})}var k,l=function(a,b){if(a.regex){var c=new RegExp(a.regex,"g");return b.replace(c,a.replace)}return a.filter?a.filter(b):void 0},m=function(a){return a+="~0",a=a.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|(?=~0))/gm,function(a,d,e,f,g){return d=d.toLowerCase(),b[d]=G(e),f?f+g:(g&&(c[d]=g.replace(/"/g,"&quot;")),"")}),a=a.replace(/~0/,"")},n=function(a){a=a.replace(/\n/g,"\n\n");return a=a.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?
 \n<\/\2>[ \t]*(?=\n+))/gm,o),a=a.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,o),a=a.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,o),a=a.replace(/(\n\n[ ]{0,3}<!(--[^\r]*?--\s*)+>[ \t]*(?=\n{2,}))/g,o),a=a.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,o),a=a.replace(/\n\n/g,"\n")},o=function(a,b){var c=b;return c=c.replace(/\n\n/g,"\n"),c=c.replace(/^\n/,""),c=c.replace(/\n+$/g,""),c="\n\n~K"+(d.push(c)-1)+"K\n\n"},p=function(a){a=w(a);var b=A("<hr />");return a=a.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm,b),a=a.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm,b),a=a.replace(/^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$/gm,b),a=x(a),a=y(a),a=E(a),a=n(a),a=F(a)},q=function(a){return a=B(a),a=r(a),a=H(a),a=u(a),a=s(a),a=I(a),a=G(a),a=D(a),a=a.replace(/  +\n/g," <br />\n")},r=function(a){var b=/(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])
 *>|<!(--.*?--\s*)+>)/gi;return a=a.replace(b,function(a){var b=a.replace(/(.)<\/?code>(?=.)/g,"$1`");return b=N(b,"\\`*_")})},s=function(a){return a=a.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,t),a=a.replace(/(\[((?:\[[^\]]*\]|[^\[\]])*)\]\([ \t]*()<?(.*?(?:\(.*?\).*?)?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,t),a=a.replace(/(\[([^\[\]]+)\])()()()()()/g,t)},t=function(a,d,e,f,g,h,i,j){void 0==j&&(j="");var k=d,l=e,m=f.toLowerCase(),n=g,o=j;if(""==n)if(""==m&&(m=l.toLowerCase().replace(/ ?\n/g," ")),n="#"+m,void 0!=b[m])n=b[m],void 0!=c[m]&&(o=c[m]);else{if(!(k.search(/\(\s*\)$/m)>-1))return k;n=""}n=N(n,"*_");var p='<a href="'+n+'"';return""!=o&&(o=o.replace(/"/g,"&quot;"),o=N(o,"*_"),p+=' title="'+o+'"'),p+=">"+l+"</a>"},u=function(a){return a=a.replace(/(!\[(.*?)\][ ]?(?:\n[ ]*)?\[(.*?)\])()()()()/g,v),a=a.replace(/(!\[(.*?)\]\s?\([ \t]*()<?(\S+?)>?[ \t]*((['"])(.*?)\6[ \t]*)?\))/g,v)},v=function(a,d,e,f,g,h,i,j){var k=d,l=e,m=f.toLowerCase(),n=g,o=j;i
 f(o||(o=""),""==n){if(""==m&&(m=l.toLowerCase().replace(/ ?\n/g," ")),n="#"+m,void 0==b[m])return k;n=b[m],void 0!=c[m]&&(o=c[m])}l=l.replace(/"/g,"&quot;"),n=N(n,"*_");var p='<img src="'+n+'" alt="'+l+'"';return o=o.replace(/"/g,"&quot;"),o=N(o,"*_"),p+=' title="'+o+'"',p+=" />"},w=function(a){function b(a){return a.replace(/[^\w]/g,"").toLowerCase()}return a=a.replace(/^(.+)[ \t]*\n=+[ \t]*\n+/gm,function(a,c){return A('<h1 id="'+b(c)+'">'+q(c)+"</h1>")}),a=a.replace(/^(.+)[ \t]*\n-+[ \t]*\n+/gm,function(a,c){return A('<h2 id="'+b(c)+'">'+q(c)+"</h2>")}),a=a.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,function(a,c,d){var e=c.length;return A("<h"+e+' id="'+b(d)+'">'+q(d)+"</h"+e+">")})},x=function(a){a+="~0";var b=/^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;return e?a=a.replace(b,function(a,b,c){var d=b,e=c.search(/[*+-]/g)>-1?"ul":"ol";d=d.replace(/\n{2,}/g,"\n\n\n");var f=k(d);return f=f.replace(/\s+$/,""),f="<"+e+">"+f+"</"+e+"
 >\n"}):(b=/(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g,a=a.replace(b,function(a,b,c,d){var e=b,f=c,g=d.search(/[*+-]/g)>-1?"ul":"ol",f=f.replace(/\n{2,}/g,"\n\n\n"),h=k(f);return h=e+"<"+g+">\n"+h+"</"+g+">\n"})),a=a.replace(/~0/,"")};k=function(a){return e++,a=a.replace(/\n{2,}$/,"\n"),a+="~0",a=a.replace(/(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,function(a,b,c,d,e){var f=e,g=b;return g||f.search(/\n{2,}/)>-1?f=p(L(f)):(f=x(L(f)),f=f.replace(/\n$/,""),f=q(f)),"<li>"+f+"</li>\n"}),a=a.replace(/~0/g,""),e--,a};var y=function(a){return a+="~0",a=a.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,function(a,b,c){var d=b,e=c;return d=C(L(d)),d=M(d),d=d.replace(/^\n+/g,""),d=d.replace(/\n+$/g,""),d="<pre><code>"+d+"\n</code></pre>",A(d)+e}),a=a.replace(/~0/,"")},z=function(a){return a+="~0",a=a.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g,function(a,b,c){var
  d=b,e=c;return e=C(e),e=M(e),e=e.replace(/^\n+/g,""),e=e.replace(/\n+$/g,""),e="<pre><code"+(d?' class="'+d+'"':"")+">"+e+"\n</code></pre>",A(e)}),a=a.replace(/~0/,"")},A=function(a){return a=a.replace(/(^\n+|\n+$)/g,""),"\n\n~K"+(d.push(a)-1)+"K\n\n"},B=function(a){return a=a.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,function(a,b,c,d){var e=d;return e=e.replace(/^([ \t]*)/g,""),e=e.replace(/[ \t]*$/g,""),e=C(e),b+"<code>"+e+"</code>"})},C=function(a){return a=a.replace(/&/g,"&amp;"),a=a.replace(/</g,"&lt;"),a=a.replace(/>/g,"&gt;"),a=N(a,"*_{}[]\\",!1)},D=function(a){return a=a.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,"<strong>$2</strong>"),a=a.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,"<em>$2</em>")},E=function(a){return a=a.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,function(a,b){var c=b;return c=c.replace(/^[ \t]*>[ \t]?/gm,"~0"),c=c.replace(/~0/g,""),c=c.replace(/^[ \t]+$/gm,""),c=p(c),c=c.replace(/(^|\n)/g,"$1  "),c=c.replace(/(\s*<pre>[^\r]+?<\/pre>)/gm,function(a,b){v
 ar c=b;return c=c.replace(/^  /gm,"~0"),c=c.replace(/~0/g,"")}),A("<blockquote>\n"+c+"\n</blockquote>")})},F=function(a){a=a.replace(/^\n+/g,""),a=a.replace(/\n+$/g,"");for(var b=a.split(/\n{2,}/g),c=[],e=b.length,f=0;e>f;f++){var g=b[f];g.search(/~K(\d+)K/g)>=0?c.push(g):g.search(/\S/)>=0&&(g=q(g),g=g.replace(/^([ \t]*)/g,"<p>"),g+="</p>",c.push(g))}e=c.length;for(var f=0;e>f;f++)for(;c[f].search(/~K(\d+)K/)>=0;){var h=d[RegExp.$1];h=h.replace(/\$/g,"$$$$"),c[f]=c[f].replace(/~K\d+K/,h)}return c.join("\n\n")},G=function(a){return a=a.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g,"&amp;"),a=a.replace(/<(?![a-z\/?\$!])/gi,"&lt;")},H=function(a){return a=a.replace(/\\(\\)/g,O),a=a.replace(/\\([`*_{}\[\]()>#+-.!])/g,O)},I=function(a){return a=a.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi,'<a href="$1">$1</a>'),a=a.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,function(a,b){return J(K(b))})},J=function(a){var b=[function(a){return"&#"+a.charCodeAt(0)+";"},functio
 n(a){return"&#x"+a.charCodeAt(0).toString(16)+";"},function(a){return a}];return a="mailto:"+a,a=a.replace(/./g,function(a){if("@"==a)a=b[Math.floor(2*Math.random())](a);else if(":"!=a){var c=Math.random();a=c>.9?b[2](a):c>.45?b[1](a):b[0](a)}return a}),a='<a href="'+a+'">'+a+"</a>",a=a.replace(/">.+:/g,'">')},K=function(a){return a=a.replace(/~E(\d+)E/g,function(a,b){var c=parseInt(b);return String.fromCharCode(c)})},L=function(a){return a=a.replace(/^(\t|[ ]{1,4})/gm,"~0"),a=a.replace(/~0/g,"")},M=function(a){return a=a.replace(/\t(?=\t)/g,"    "),a=a.replace(/\t/g,"~A~B"),a=a.replace(/~B(.+?)~A/g,function(a,b){for(var c=b,d=4-c.length%4,e=0;d>e;e++)c+=" ";return c}),a=a.replace(/~A/g,"    "),a=a.replace(/~B/g,"")},N=function(a,b,c){var d="(["+b.replace(/([\[\]\\])/g,"\\$1")+"])";c&&(d="\\\\"+d);var e=new RegExp(d,"g");return a=a.replace(e,O)},O=function(a,b){var c=b.charCodeAt(0);return"~E"+c+"E"}},"undefined"!=typeof module&&(module.exports=Showdown),"function"==typeof define&&d
 efine.amd&&define("panels/text/lib/showdown",[],function(){return Showdown}),define("panels/text/module",["angular","app","lodash","require"],function(a,b,c,d){var e=a.module("kibana.panels.text",[]);b.useModule(e),e.controller("text",["$scope",function(a){a.panelMeta={status:"Stable",description:"A static text panel that can use plain text, markdown, or (sanitized) HTML"};var b={mode:"markdown",content:"",style:{}};c.defaults(a.panel,b),a.init=function(){a.ready=!1}}]),e.directive("markdown",function(){return{restrict:"E",link:function(a,b){function c(){d(["./lib/showdown"],function(c){a.ready=!0;var d=new c.converter,e=a.panel.content.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;"),f=d.makeHtml(e);b.html(f),a.$$phase||a.$apply()})}a.$on("render",function(){c()}),c()}}}),e.filter("newlines",function(){return function(a){return a.replace(/\n/g,"<br/>")}}),e.filter("striphtml",function(){return function(a){return a.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/<
 /g,"&lt;")}})});
\ No newline at end of file
+/** @scratch /panels/text/0
+ * == text
+ * Status: *Stable*
+ *
+ * The text panel is used for displaying static text formated as markdown, sanitized html or as plain
+ * text.
+ *
+ */
+define([
+  'angular',
+  'app',
+  'lodash',
+  'require'
+],
+function (angular, app, _, require) {
+  'use strict';
+
+  var module = angular.module('kibana.panels.text', []);
+  app.useModule(module);
+
+  module.controller('text', function($scope) {
+    $scope.panelMeta = {
+      status  : "Stable",
+      description : "A static text panel that can use plain text, markdown, or (sanitized) HTML"
+    };
+
+    // Set and populate defaults
+    var _d = {
+      /** @scratch /panels/text/5
+       *
+       * === Parameters
+       *
+       * mode:: `html', `markdown' or `text'
+       */
+      mode    : "markdown", // 'html','markdown','text'
+      /** @scratch /panels/text/5
+       * content:: The content of your panel, written in the mark up specified in +mode+
+       */
+      content : "",
+      style: {},
+    };
+    _.defaults($scope.panel,_d);
+
+    $scope.init = function() {
+      $scope.ready = false;
+    };
+
+  });
+
+  module.directive('markdown', function() {
+    return {
+      restrict: 'E',
+      link: function(scope, element) {
+        scope.$on('render', function() {
+          render_panel();
+        });
+
+        function render_panel() {
+          require(['./lib/showdown'], function (Showdown) {
+            scope.ready = true;
+            var converter = new Showdown.converter();
+            var text = scope.panel.content.replace(/&/g, '&amp;')
+              .replace(/>/g, '&gt;')
+              .replace(/</g, '&lt;');
+            var htmlText = converter.makeHtml(text);
+            element.html(htmlText);
+            // For whatever reason, this fixes chrome. I don't like it, I think
+            // it makes things slow?
+            if(!scope.$$phase) {
+              scope.$apply();
+            }
+          });
+        }
+
+        render_panel();
+      }
+    };
+  });
+
+  module.filter('newlines', function(){
+    return function (input) {
+      return input.replace(/\n/g, '<br/>');
+    };
+  });
+
+  module.filter('striphtml', function () {
+    return function(text) {
+      return text
+        .replace(/&/g, '&amp;')
+        .replace(/>/g, '&gt;')
+        .replace(/</g, '&lt;');
+    };
+  });
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/timepicker/custom.html
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/timepicker/custom.html b/kibana/src/main/resources/app/panels/timepicker/custom.html
index 4117e9f..474d1ce 100644
--- a/kibana/src/main/resources/app/panels/timepicker/custom.html
+++ b/kibana/src/main/resources/app/panels/timepicker/custom.html
@@ -1,4 +1,6 @@
-<div class="modal-body"><style>.timepicker-to-column {
+  <div class="modal-body">
+    <style>
+      .timepicker-to-column {
         margin-top: 10px;
       }
 
@@ -28,4 +30,49 @@
       }
       div.timepicker-now {
         float: right;
-      }</style><div class="timepicker form-horizontal"><form name="input"><div class="timepicker-from-column"><label class="small">From</label><div class="fake-input timepicker-input"><input class="timepicker-date" type="text" ng-change="validate(temptime)" ng-model="temptime.from.date" data-date-format="yyyy-mm-dd" required="" bs-datepicker="">@<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.hour" required="" ng-pattern="patterns.hour" onclick="this.select()">:<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.minute" required="" ng-pattern="patterns.minute" onclick="this.select()">:<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.second" required="" ng-pattern="patterns.second" onclick="this.select()">.<input class="timepicker-ms" type="text" maxlength="3" ng-change="validate(temptime)" ng-model="te
 mptime.from.millisecond" required="" ng-pattern="patterns.millisecond" onclick="this.select()"></div></div><div class="timepicker-to-column"><label class="small">To (<a class="link" ng-class="{'strong':panel.now}" ng-click="setNow();panel.now=true">now</a>)</label><div class="fake-input timepicker-input"><div ng-hide="panel.now"><input class="timepicker-date" type="text" ng-change="validate(temptime)" ng-model="temptime.to.date" data-date-format="yyyy-mm-dd" required="" bs-datepicker="">@<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.hour" required="" ng-pattern="patterns.hour" onclick="this.select()">:<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.minute" required="" ng-pattern="patterns.minute" onclick="this.select()">:<input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.second" required="" ng-pattern="p
 atterns.second" onclick="this.select()">.<input class="timepicker-ms" type="text" maxlength="3" ng-change="validate(temptime)" ng-model="temptime.to.millisecond" required="" ng-pattern="patterns.millisecond" onclick="this.select()"></div><span type="text" ng-show="panel.now" ng-disabled="panel.now">&nbsp <i class="pointer icon-remove-sign" ng-click="setNow();panel.now=false"></i> Right Now<input type="text" name="dummy" style="visibility:hidden"></span></div></div></form><div class="clearfix"></div></div></div><div class="modal-footer"><form name="input" style="margin-bottom:0"><span class="" ng-hide="input.$valid">Invalid date or range</span> <button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!input.$valid" class="btn btn-success">Apply</button> <button ng-click="dismiss();" class="btn btn-danger">Cancel</button></form></div>
\ No newline at end of file
+      }
+    </style>
+
+    <div class="timepicker form-horizontal">
+        <form name="input">
+
+        <div class="timepicker-from-column">
+          <label class="small">From</label>
+          <div class="fake-input timepicker-input">
+            <input class="timepicker-date" type="text" ng-change="validate(temptime)" ng-model="temptime.from.date" data-date-format="yyyy-mm-dd" required bs-datepicker />@
+            <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.hour" required ng-pattern="patterns.hour" onClick="this.select();"/>:
+            <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.minute" required ng-pattern="patterns.minute" onClick="this.select();"/>:
+            <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.from.second" required ng-pattern="patterns.second" onClick="this.select();"/>.
+            <input class="timepicker-ms" type="text" maxlength="3" ng-change="validate(temptime)" ng-model="temptime.from.millisecond" required ng-pattern="patterns.millisecond"  onClick="this.select();"/>
+          </div>
+        </div>
+
+        <div class="timepicker-to-column">
+
+          <label class="small">To (<a class="link" ng-class="{'strong':panel.now}" ng-click="setNow();panel.now=true">now</a>)</label>
+
+          <div class="fake-input timepicker-input">
+            <div ng-hide="panel.now">
+              <input class="timepicker-date" type="text" ng-change="validate(temptime)" ng-model="temptime.to.date" data-date-format="yyyy-mm-dd" required bs-datepicker />@
+              <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.hour" required ng-pattern="patterns.hour" onClick="this.select();"/>:
+              <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.minute" required ng-pattern="patterns.minute" onClick="this.select();"/>:
+              <input class="timepicker-hms" type="text" maxlength="2" ng-change="validate(temptime)" ng-model="temptime.to.second" required ng-pattern="patterns.second" onClick="this.select();"/>.
+              <input class="timepicker-ms" type="text" maxlength="3" ng-change="validate(temptime)" ng-model="temptime.to.millisecond" required ng-pattern="patterns.millisecond" onClick="this.select();"/>
+            </div>
+            <span type="text" ng-show="panel.now" ng-disabled="panel.now">&nbsp <i class="pointer icon-remove-sign" ng-click="setNow();panel.now=false"></i> Right Now <input type="text" name="dummy" style="visibility:hidden" /></span>
+          </div>
+        </div>
+
+        </form>
+        <div class="clearfix"></div>
+    </div>
+  </div>
+
+  <div class="modal-footer">
+    <form name="input" style="margin-bottom:0">
+    <span class="" ng-hide="input.$valid">Invalid date or range</span>
+    <button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!input.$valid" class="btn btn-success">Apply</button>
+    <button ng-click="dismiss();" class="btn btn-danger">Cancel</button>
+
+    </form>
+  </div>

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a24aae9b/kibana/src/main/resources/app/panels/timepicker/editor.html
----------------------------------------------------------------------
diff --git a/kibana/src/main/resources/app/panels/timepicker/editor.html b/kibana/src/main/resources/app/panels/timepicker/editor.html
index 71f4b2e..2fb64e8 100644
--- a/kibana/src/main/resources/app/panels/timepicker/editor.html
+++ b/kibana/src/main/resources/app/panels/timepicker/editor.html
@@ -1 +1,16 @@
-<div class="editor-row"><div class="section"><div class="editor-option"><label class="small">Relative time options <small>comma separated</small></label><input type="text" array-join="" class="input-large" ng-model="panel.time_options"></div><div class="editor-option"><label class="small">Auto-refresh options <small>comma separated</small></label><input type="text" array-join="" class="input-large" ng-model="panel.refresh_intervals"></div><div class="editor-option"><label class="small">Time Field</label><input type="text" class="input-small" ng-model="panel.timefield"></div></div></div>
\ No newline at end of file
+  <div class="editor-row">
+    <div class="section">
+      <div class="editor-option">
+        <label class="small">Relative time options <small>comma separated</small></label>
+        <input type="text" array-join class="input-large" ng-model="panel.time_options">
+      </div>
+      <div class="editor-option">
+        <label class="small">Auto-refresh options <small>comma separated</small></label>
+        <input type="text" array-join class="input-large" ng-model="panel.refresh_intervals">
+      </div>
+      <div class="editor-option">
+        <label class="small">Time Field</label>
+        <input type="text" class="input-small" ng-model="panel.timefield">
+      </div>
+    </div>
+  </div>


Mime
View raw message