Skip to content

Commit bff4ebd

Browse files
arikfrarikfr
authored
Merge pull request #1485 from getredash/v1fixes
Close #1453: more minimal notification of draft status for query/dashboard
2 parents e0a010f + 7a94bed commit bff4ebd

File tree

3 files changed

+51
-50
lines changed

3 files changed

+51
-50
lines changed

‎client/app/assets/css/redash.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ to add those CSS styles here. */
312312
}
313313

314314
.rd-form-control {
315-
width: 100%;
315+
width: 90%;
316316
}
317317

318318
pivot-table-renderer > table, grid-renderer > div, visualization-renderer > div {

‎client/app/pages/dashboards/dashboard.html‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,59 @@
11
<div class="container">
2-
<page-header title="{{$ctrl.dashboard.name}}">
3-
<span ng-if="!$ctrl.dashboard.is_archived && !public" class="hidden-print">
4-
<div class="btn-group" uib-dropdown>
5-
<button id="split-button" type="button"
6-
ng-class="{'btn-default': $ctrl.refreshRate === null,'btn-primary':$ctrl.refreshRate !== null}"
7-
class="btn" ng-click="$ctrl.loadDashboard(true)">
8-
{{$ctrl.refreshRate === null ? 'Refresh' : $ctrl.refreshRate.name}}
9-
</button>
10-
<button type="button" class="btn" uib-dropdown-toggle
11-
ng-class="{'btn-default': $ctrl.refreshRate === null,'btn-primary':$ctrl.refreshRate !== null}">
12-
<span class="caret"></span>
13-
<span class="sr-only">Split button!</span>
14-
</button>
15-
<ul class="dropdown-menu" ng-model="$ctrl.refreshRate" uib-dropdown-menu role="menu" aria-labelledby="split-button">
16-
<li role="menuitem" ng-repeat="refreshRate in $ctrl.refreshRates">
17-
<a href="#" ng-click="$ctrl.setRefreshRate(refreshRate)">{{refreshRate.name}}</a>
18-
</li>
19-
<li role="menuitem" ng-if="$ctrl.refreshRate !== null">
20-
<a href="#" ng-click="$ctrl.setRefreshRate(null)">Stop auto refresh</a>
21-
</li>
22-
</ul>
23-
</div>
24-
<button type="button" class="btn btn-sm" ng-class="{'btn-default': !$ctrl.isFullscreen, 'btn-primary': $ctrl.isFullscreen}" tooltip="Enable/Disable Fullscreen display" ng-click="$ctrl.toggleFullscreen()">
25-
<span class="zmdi zmdi-fullscreen"></span>
26-
</button>
27-
<button type="button" class="btn btn-sm" ng-class="{'btn-default': !$ctrl.dashboard.publicAccessEnabled, 'btn-primary': $ctrl.dashboard.publicAccessEnabled}" tooltip="Enable/Disable Share URL" ng-click="$ctrl.openShareForm()" ng-if="$ctrl.dashboard.canEdit() || $ctrl.dashboard.publicAccessEnabled">
28-
<span class="zmdi zmdi-share"></span>
29-
</button>
30-
</span>
31-
<div class="btn-group hidden-print" role="group" ng-show="$ctrl.dashboard.canEdit()" uib-dropdown>
32-
<button class="btn btn-default btn-sm dropdown-toggle" uib-dropdown-toggle>
33-
<span class="zmdi zmdi-more"></span>
34-
</button>
35-
<ul class="dropdown-menu pull-right" uib-dropdown-menu>
36-
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.editDashboard()">Edit Dashboard</a></li>
37-
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.addWidget()">Add Widget</a></li>
38-
<li ng-if="$ctrl.showPermissionsControl"><a ng-click="$ctrl.showManagePermissionsModal()">Manage Permissions</a></li>
39-
<li ng-if="!$ctrl.dashboard.is_draft"><a ng-click="$ctrl.togglePublished()">Unpublish Dashboard</a></li>
40-
<li ng-if="$ctrl.dashboard.is_draft"><a ng-click="$ctrl.togglePublished()">Publish Dashboard</a></li>
41-
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.archiveDashboard()">Archive Dashboard</a></li>
42-
</ul>
2+
<div class="row bg-white p-10 p-l-15 p-r-15 m-b-10">
3+
<div class="col-sm-9">
4+
<h3>{{$ctrl.dashboard.name}} <span class="label label-warning" ng-if="$ctrl.dashboard.is_draft">Draft</span></h3>
435
</div>
44-
</page-header>
6+
<div class="col-sm-3 text-right">
7+
<h3>
8+
<span ng-if="!$ctrl.dashboard.is_archived && !public" class="hidden-print">
9+
<div class="btn-group" uib-dropdown>
10+
<button id="split-button" type="button"
11+
ng-class="{'btn-default': $ctrl.refreshRate === null,'btn-primary':$ctrl.refreshRate !== null}"
12+
class="btn" ng-click="$ctrl.loadDashboard(true)">
13+
{{$ctrl.refreshRate === null ? 'Refresh' : $ctrl.refreshRate.name}}
14+
</button>
15+
<button type="button" class="btn" uib-dropdown-toggle
16+
ng-class="{'btn-default': $ctrl.refreshRate === null,'btn-primary':$ctrl.refreshRate !== null}">
17+
<span class="caret"></span>
18+
<span class="sr-only">Split button!</span>
19+
</button>
20+
<ul class="dropdown-menu" ng-model="$ctrl.refreshRate" uib-dropdown-menu role="menu" aria-labelledby="split-button">
21+
<li role="menuitem" ng-repeat="refreshRate in $ctrl.refreshRates">
22+
<a href="#" ng-click="$ctrl.setRefreshRate(refreshRate)">{{refreshRate.name}}</a>
23+
</li>
24+
<li role="menuitem" ng-if="$ctrl.refreshRate !== null">
25+
<a href="#" ng-click="$ctrl.setRefreshRate(null)">Stop auto refresh</a>
26+
</li>
27+
</ul>
28+
</div>
29+
<button type="button" class="btn btn-sm" ng-class="{'btn-default': !$ctrl.isFullscreen, 'btn-primary': $ctrl.isFullscreen}" tooltip="Enable/Disable Fullscreen display" ng-click="$ctrl.toggleFullscreen()">
30+
<span class="zmdi zmdi-fullscreen"></span>
31+
</button>
32+
<button type="button" class="btn btn-sm" ng-class="{'btn-default': !$ctrl.dashboard.publicAccessEnabled, 'btn-primary': $ctrl.dashboard.publicAccessEnabled}" tooltip="Enable/Disable Share URL" ng-click="$ctrl.openShareForm()" ng-if="$ctrl.dashboard.canEdit() || $ctrl.dashboard.publicAccessEnabled">
33+
<span class="zmdi zmdi-share"></span>
34+
</button>
35+
</span>
36+
<div class="btn-group hidden-print" role="group" ng-show="$ctrl.dashboard.canEdit()" uib-dropdown>
37+
<button class="btn btn-default btn-sm dropdown-toggle" uib-dropdown-toggle>
38+
<span class="zmdi zmdi-more"></span>
39+
</button>
40+
<ul class="dropdown-menu pull-right" uib-dropdown-menu>
41+
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.editDashboard()">Edit Dashboard</a></li>
42+
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.addWidget()">Add Widget</a></li>
43+
<li ng-if="$ctrl.showPermissionsControl"><a ng-click="$ctrl.showManagePermissionsModal()">Manage Permissions</a></li>
44+
<li ng-if="!$ctrl.dashboard.is_draft"><a ng-click="$ctrl.togglePublished()">Unpublish Dashboard</a></li>
45+
<li ng-if="$ctrl.dashboard.is_draft"><a ng-click="$ctrl.togglePublished()">Publish Dashboard</a></li>
46+
<li ng-if="!$ctrl.dashboard.is_archived"><a ng-click="$ctrl.archiveDashboard()">Archive Dashboard</a></li>
47+
</ul>
48+
</div>
49+
</h3>
50+
</div>
51+
</div>
4552

4653
<div class="col-lg-12 p-5 m-b-10 bg-orange c-white" ng-if="$ctrl.dashboard.is_archived">
4754
This dashboard is archived and won't appear in the dashboards list or search results.
4855
</div>
4956

50-
<div class="col-lg-12 p-5 m-b-10 bg-orange c-white" ng-if="$ctrl.dashboard.is_draft">
51-
This dashboard is a draft.
52-
</div>
53-
5457
<div class="m-b-5">
5558
<filters ng-if="$ctrl.dashboard.dashboard_filters_enabled"></filters>
5659
</div>

‎client/app/pages/queries/query.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<div class="col-sm-9">
2222
<h3>
2323
<edit-in-place editable="canEdit" done="saveName" ignore-blanks="true" value="query.name"></edit-in-place>
24+
<span class="label label-warning" ng-if="query.is_draft">Draft</span>
2425
</h3>
2526
<p>
2627
<em>
@@ -77,9 +78,6 @@ <h3>
7778
<div class="col-lg-12 p-5 bg-orange c-white" ng-if="query.is_archived">
7879
This query is archived and can't be used in dashboards, and won't appear in search results.
7980
</div>
80-
<div class="col-lg-12 p-5 bg-orange c-white" ng-if="query.is_draft">
81-
This query is a draft.
82-
</div>
8381
</div>
8482

8583
<!-- editor -->

0 commit comments

Comments
 (0)