getredash#121: source button to play nice with hashes

hailocab · Mar 11, 2014 · e8e2aab · e8e2aab
1 parent 8d1b523
commit e8e2aab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
@@ -13,6 +13,9 @@
 
     $scope.isSourceVisible = route.locals.viewSource;
 
+    $scope.sourceHref = $scope.isSourceVisible ?
+      $location.url().replace('src', '') : $location.path() + '/src#' + $location.hash();
+
     $scope.queryExecuting = false;
 
     $scope.newVisualization = undefined;
@@ -223,11 +226,6 @@
       $scope.dirty = (newHash !== pristineHash);
     });
 
-    $scope.toggleSource = function() {
-      var url = $location.url();
-      $location.path($scope.isSourceVisible ? url.replace('src', '') : url + '/src');
-    };
-
     $scope.executeQuery = function() {
       $scope.queryResult = $scope.query.getQueryResult(0);
       $scope.lockButton(true);

diff --git a/rd_ui/app/views/queryview.html b/rd_ui/app/views/queryview.html
@@ -6,7 +6,7 @@ <h2>
                 <edit-in-place editable="isOwner" done="saveQuery" ignore-blanks='true' value="query.name"></edit-in-place>
 
                 <span class="pull-right">
-                    <button ng-click="toggleSource()" class="btn btn-default" ng-class="{active: isSourceVisible}">Source</button>
+                    <a ng-href="{{sourceHref}}" ng-click="toggleSource()" class="btn btn-default" ng-class="{active: isSourceVisible}">Source</a>
                 </span>
             </h2>
             <em>
@@ -52,7 +52,7 @@ <h2>
                         <button class="btn btn-success btn-xs" ng-show="canEdit" ng-click="saveQuery()">
                             <span class="glyphicon glyphicon-floppy-disk"> </span> Save<span ng-show="dirty">&#42;</span>
                         </button>
-                        <button class="btn btn-default btn-xs rd-hidden-xs" ng-show="!canEdit" ng-click="duplicateQuery()">
+                        <button class="btn btn-success btn-xs rd-hidden-xs" ng-show="!canEdit" ng-click="duplicateQuery()">
                             <span class="glyphicon glyphicon-share-alt"></span> Fork
                         </button>
                     </span>
@@ -71,7 +71,7 @@ <h2>
     <div class="row">
         <div class="col-lg-3 rd-hidden-xs">
             <p>
-                <span class="glyphicon glyphicon-refresh"></span>
+                <span class="glyphicon glyphicon-time"></span>
                 <span class="text-muted">Last update </span>
                 <strong am-time-ago="queryResult.query_result.retrieved_at"></strong>
             </p>
@@ -80,7 +80,7 @@ <h2>
                 <span class="text-muted">Created By </span><strong>{{query.user.name}}</strong>
             </p>
             <p>
-                <span class="glyphicon glyphicon-time"></span>
+                <span class="glyphicon glyphicon-play"></span>
                 <span class="text-muted">Runtime </span>
                 <strong ng-show="!queryExecuting">{{queryResult.getRuntime() | durationHumanize}}</strong>
                 <span ng-show="queryExecuting">Running&hellip;</span>
@@ -89,11 +89,14 @@ <h2>
                 <span class="glyphicon glyphicon-align-justify"></span>
                 <span class="text-muted">Rows </span><strong>{{queryResult.getData().length}}</strong>
             </p>
-
             <p>
+                <span class="glyphicon glyphicon-refresh"></span>
+                <span class="text-muted">Refresh Interval</span>
                 <select ng-disabled="!isOwner" ng-model="query.ttl" ng-change="saveQuery()" ng-options="c.value as c.name for c in refreshOptions"></select>
             </p>
 
+            <hr>
+
             <p>
                 <a class="btn btn-primary btn-sm" ng-disabled="queryExecuting || !queryResult.getData()" ng-href="{{dataUri}}" download="{{dataFilename}}" target="_self">
                     <span class="glyphicon glyphicon-cloud-download"></span>