Browse Source

Merge pull request #241 from robszumski/fix-highlight

Fix highlight
Brandon Philips 12 years ago
parent
commit
5305b802b2

+ 1 - 1
mod/dashboard/app/scripts/controllers/browser.js

@@ -44,7 +44,7 @@ angular.module('etcdBrowser', ['ngRoute', 'etcd', 'timeRelative'])
     localStorage.setItem('etcdPath', $scope.etcdPath);
     $scope.enableBack = true;
     //disable back button if at root (/v1/keys/)
-    if($scope.etcdPath === '') {
+    if($scope.etcdPath === '/v1/keys') {
       $scope.enableBack = false;
     }
 

+ 12 - 0
mod/dashboard/app/styles/etcd-widgets.css

@@ -11,6 +11,10 @@ body {
 	box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	position: relative;
+	user-select: none;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
 }
 
 	a {
@@ -99,6 +103,10 @@ body {
 		.etcd-popover-error .etcd-popover-content {
 			color: #FF3C43;
 			font-weight: bold;
+			user-select: text;
+			-webkit-user-select: text;
+			-moz-user-select: text;
+			-ms-user-select: text;
 		}
 
 		.etcd-popover-notch {
@@ -194,6 +202,10 @@ body {
 				padding-bottom: 6px;
 				padding-left: 0px;
 				vertical-align: text-top;
+				user-select: text;
+				-webkit-user-select: text;
+				-moz-user-select: text;
+				-ms-user-select: text;
 			}
 
 			.etcd-body table .etcd-ttl-header {

+ 1 - 1
mod/dashboard/app/views/browser.html

@@ -23,7 +23,7 @@
         </div>
     </div>
     <div class="etcd-header solid">
-        <a class="etcd-back" ng-click="back()" ng-class="{false:'etcd-disabled'}[enable_back]">
+        <a class="etcd-back" ng-click="back()" ng-class="{false:'etcd-disabled'}[enableBack]">
             <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
             preserveAspectRatio="xMinYMin" viewBox="0 0 73.356 61" enable-background="new 0 0 73.356 61" xml:space="preserve">
             <path d="M5.27,33.226l22.428,22.428c1.562,1.562,4.095,1.562,5.657,0c1.562-1.562,1.562-4.095,0-5.657L17.77,34.413h48.514