valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 09:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #873 from getredash/feature/print_layout

Browse Source 
Feature: print layout for dashboards
This commit is contained in:
Arik Fraimovich 2016-02-29 21:11:41 +02:00
commit 43ac5600e5
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rd_ui/app/index.html
View File

@ -132,7 +132,11 @@
</div> </div>
{% raw %} {% raw %}
<div class="container-fluid footer"> <div class="visible-print">
<hr>
Source: {{location}}
</div>
<div class="container-fluid footer hidden-print">
<hr/> <hr/>
<div class="container"> <div class="container">
<div class="row"> <div class="row">

1
rd_ui/app/scripts/controllers/controllers.js
View File

@ -163,6 +163,7 @@
} }
}); });
$scope.location = String(document.location);
$scope.version = clientConfig.version; $scope.version = clientConfig.version;
$scope.newVersionAvailable = clientConfig.newVersionAvailable && currentUser.hasPermission("admin"); $scope.newVersionAvailable = clientConfig.newVersionAvailable && currentUser.hasPermission("admin");

6
rd_ui/app/scripts/filters.js
View File

@ -69,6 +69,12 @@ angular.module('redash.filters', []).
} }
}) })
.filter('dateTime', function() {
return function(value) {
return moment(value).format(clientConfig.dateTimeFormat);
}
})
.filter('linkify', function () { .filter('linkify', function () {
return function (text) { return function (text) {
return text.replace(urlPattern, "$1<a href='$2' target='_blank'>$2</a>"); return text.replace(urlPattern, "$1<a href='$2' target='_blank'>$2</a>");

16
rd_ui/app/views/dashboard.html
View File

@ -6,7 +6,7 @@
<h2 id="dashboard_title"> <h2 id="dashboard_title">
{{dashboard.name}} {{dashboard.name}}
<span ng-if="!dashboard.is_archived"> <span ng-if="!dashboard.is_archived" class="hidden-print">
<button type="button" class="btn btn-default btn-xs" ng-class="{active: refreshEnabled}" tooltip="Enable/Disable Auto Refresh" ng-click="triggerRefresh()"><span class="glyphicon glyphicon-refresh"></span></button> <button type="button" class="btn btn-default btn-xs" ng-class="{active: refreshEnabled}" tooltip="Enable/Disable Auto Refresh" ng-click="triggerRefresh()"><span class="glyphicon glyphicon-refresh"></span></button>
<button type="button" class="btn btn-default btn-xs" ng-class="{active: isFullscreen}" tooltip="Enable/Disable Fullscreen display" ng-click="toggleFullscreen()"><span class="glyphicon glyphicon-picture"></span></button> <button type="button" class="btn btn-default btn-xs" ng-class="{active: isFullscreen}" tooltip="Enable/Disable Fullscreen display" ng-click="toggleFullscreen()"><span class="glyphicon glyphicon-picture"></span></button>
<div class="btn-group" role="group" ng-show="dashboard.canEdit()"> <div class="btn-group" role="group" ng-show="dashboard.canEdit()">
@ -29,11 +29,15 @@
<div class="panel panel-default" ng-if="type=='visualization'"> <div class="panel panel-default" ng-if="type=='visualization'">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
<p> <p class="hidden-print">
<span ng-hide="currentUser.hasPermission('view_query')">{{query.name}}</span> <span ng-hide="currentUser.hasPermission('view_query')">{{query.name}}</span>
<query-link query="query" visualization="widget.visualization" ng-show="currentUser.hasPermission('view_query')"></query-link> <query-link query="query" visualization="widget.visualization" ng-show="currentUser.hasPermission('view_query')"></query-link>
<visualization-name visualization="widget.visualization"/> <visualization-name visualization="widget.visualization"/>
</p> </p>
<p class="visible-print">
{{query.name}}
<visualization-name visualization="widget.visualization"/>
</p>
<div class="text-muted" ng-bind-html="query.description | markdown"></div> <div class="text-muted" ng-bind-html="query.description | markdown"></div>
</h3> </h3>
</div> </div>
@ -41,11 +45,15 @@
<visualization-renderer visualization="widget.visualization" query-result="queryResult"></visualization-renderer class="panel-body"> <visualization-renderer visualization="widget.visualization" query-result="queryResult"></visualization-renderer class="panel-body">
<div class="panel-footer"> <div class="panel-footer">
<span class="label label-default" <span class="label label-default hidden-print"
tooltip="(query runtime: {{queryResult.getRuntime() | durationHumanize}})" tooltip="(query runtime: {{queryResult.getRuntime() | durationHumanize}})"
tooltip-placement="bottom">Updated: <span am-time-ago="queryResult.getUpdatedAt()"></span></span> tooltip-placement="bottom">Updated: <span am-time-ago="queryResult.getUpdatedAt()"></span></span>
<span class="pull-right"> <span class="visible-print">
Updated: {{queryResult.getUpdatedAt() | dateTime}}
</span>
<span class="pull-right hidden-print">
<div class="btn-group"> <div class="btn-group">
<a class="btn btn-default btn-xs" ng-disabled="!queryResult.getData()" query-result-link target="_self" title="Download as CSV File"> <a class="btn btn-default btn-xs" ng-disabled="!queryResult.getData()" query-result-link target="_self" title="Download as CSV File">