qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eal...@apache.org
Subject qpid-dispatch git commit: DISPATCH-725 Modified stand-alone console's include css and js files
Date Mon, 13 Mar 2017 15:51:00 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 615d7b65f -> 9f715fa41


DISPATCH-725 Modified stand-alone console's include css and js files


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9f715fa4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9f715fa4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9f715fa4

Branch: refs/heads/master
Commit: 9f715fa416271450736856b3c072b94238b88de5
Parents: 615d7b6
Author: Ernest Allen <eallen@redhat.com>
Authored: Mon Mar 13 11:50:51 2017 -0400
Committer: Ernest Allen <eallen@redhat.com>
Committed: Mon Mar 13 11:50:51 2017 -0400

----------------------------------------------------------------------
 console/stand-alone/index.html | 126 +++++++++++++++++++++++-------------
 1 file changed, 80 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9f715fa4/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 6f24442..f8105ca 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -22,79 +22,112 @@ under the License.
 <head>
 
     <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>Qpid Dispatch Console</title>
 
     <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
+
+    <!-- PatternFly Styles -->
+    <link rel="shortcut icon" type="image/png" href="favicon-32x32.png" sizes="32x32"
/>
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/css/patternfly.min.css"
>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/css/patternfly-additions.min.css"
>
+
+    <!-- Angular-PatternFly Styles -->
+    <link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.min.css"
/>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tipsy/1.0.2/jquery.tipsy.css"
type="text/css"/>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.css"
type="text/css"/>
     <link rel="stylesheet" href="https://cdn.rawgit.com/mar10/dynatree/master/dist/skin/ui.dynatree.css"
type="text/css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css"
type="text/css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css">
 
     <link rel="stylesheet" href="plugin/css/plugin.css" type="text/css"/>
     <link rel="stylesheet" href="plugin/css/dispatch.css" type="text/css"/>
-    <link rel="stylesheet" href="plugin/css/site-base.css" type="text/css"/>
+    <link rel="stylesheet" href="plugin/css/dispatchpf.css" type="text/css"/>
     <link rel="stylesheet" href="https://cdn.rawgit.com/mohsen1/json-formatter/master/dist/json-formatter.min.css"
type="text/css"/>
-    <link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32" />
 
 </head>
-
-<body ng-app="QDR">
-
-<div id="core" ng-controller="QDR.Core">
-    <div id="alerts">
-        <uib-alert ng-repeat="alert in alerts" type="{{alert.type}}">{{alert.msg}}</uib-alert>
+<body ng-app="QDR" ng-controller="QDR.Core">
+
+
+<nav class="navbar navbar-default navbar-pf" role="navigation">
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="/">
+            <span class="logo">Qpid Dispatch Router Console</span>
+        </a>
     </div>
-    <div id="main-nav" class="navbar navbar-fixed-top" ng-controller="QDR.MainController">
-        <div class="navbar-inner main-nav-lower">
-            <div class="container">
-                <div class="pull-left">
-                    <ul class="nav">
-                        <li ng-repeat="nav in topLevelTabs track by $index"
-                            ng-class="{active : !nav.isActive()}"
-                            ng-show="nav.isValid()">
-                            <a ng-href="{{nav.href}}" title="{{nav.title}}" data-placement="bottom"
ng-bind="nav.content">
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
+    <div class="collapse navbar-collapse navbar-collapse-1">
+        <ul class="nav navbar-nav navbar-utility">
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown">
+                    <span class="pficon pficon-user"></span>
+                    User <b class="caret"></b>
+                </a>
+                <ul class="dropdown-menu">
+                    <li>
+                        <a href="/#!/connect">Disconnect</a>
+                    </li>
+                </ul>
+            </li>
+        </ul>
+        <ul class="nav navbar-nav navbar-primary" ng-controller="QDR.NavBarController">
+            <li ng-repeat="link in breadcrumbs" title="{{link.title}}" ng-show="isValid(link)"
ng-class='{active : isActive(link.href), "pull-right" : isRight(link), haschart: hasChart(link)}'>
+                <a ng-href="{{link.href}}{{hash}}" ng-bind-html="link.name"></a>
+            </li>
+        </ul>
     </div>
+</nav>
 
-    <div id="main-body" >
-        <div id="main" class="container-fluid ng-cloak qdr">
-            <div ng-include src="'plugin/html/qdrLayout.html'"></div>
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div ng-view></div>
+            </div>
         </div>
     </div>
-</div>
 
-<!--    <script src="http://d3js.org/d3.v3.min.js"></script>
-    <script src="http://d3js.org/queue.v1.min.js"></script> -->
-    <script src='https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js'></script>
-    <script src='https://cdnjs.cloudflare.com/ajax/libs/d3-queue/3.0.3/d3-queue.min.js'></script>
+<!-- jQuery -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
+<script src="https://cdn.rawgit.com/mar10/dynatree/master/dist/jquery.dynatree.js"></script>
 
-    <script src="https://d3js.org/topojson.v0.min.js"></script>
+<!-- PatternFly Custom Componets -  Sidebar, Popovers and Datatables Customizations -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.22.1/js/patternfly.min.js"></script>
 
-    <script src="https://code.jquery.com/jquery-1.8.3.min.js"></script>
+<!-- Angular -->
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.2/angular-route.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.2/angular-resource.min.js"></script>
 
-    <script src="https://maxcdn.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap-tpls.min.js"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular-sanitize.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular-resource.min.js"></script>
+<!-- Angular-Sanitize -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.5.11/angular-sanitize.min.js"></script>
+<!-- <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
-->
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.4.0/ui-bootstrap-tpls.min.js"></script>
+<!-- Angular-PatternFly  -->
+    <script src="bower_components/angular-patternfly/dist/angular-patternfly.min.js"></script>
+
+    <script src='https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js'></script>
+    <script src='https://cdnjs.cloudflare.com/ajax/libs/d3-queue/3.0.3/d3-queue.min.js'></script>
+
+    <script src="https://d3js.org/topojson.v0.min.js"></script>
 
     <script src="https://cdn.rawgit.com/jaz303/tipsy/master/src/javascripts/jquery.tipsy.js"></script>
     <script src="https://cdn.rawgit.com/briancray/tooltipsy/master/tooltipsy.min.js"></script>
     <script src="https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js"></script>
-    <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/notify/0.4.2/notify.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 
     <script type="text/javascript" src="plugin/js/dispatchPlugin.js"></script>
     <script type="text/javascript" src="plugin/js/qdrOverview.js"></script>
@@ -110,13 +143,14 @@ under the License.
     <script type="text/javascript" src="plugin/js/qdrNewNode.js"></script>
     <script type="text/javascript" src="plugin/js/qdrSettings.js"></script>
 
+    <script type="text/javascript" src="plugin/lib/stomp.js"></script>
     <script type="text/javascript" src="plugin/lib/rhea-min.js"></script>
 
-    <script src="https://cdn.rawgit.com/mar10/dynatree/master/dist/jquery.dynatree.min.js"></script>
 
     <script type="text/javascript">
-        angular.element(document.getElementsByTagName('head')).append(angular.element('<base
href="' + window.location.pathname + '" />'));
+        //angular.element(document.getElementsByTagName('head')).append(angular.element('<base
href="' + window.location.pathname + '" />'));
   </script>
+
 </body>
 </html>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message