Skip to content

Commit b132774

Browse files
committed
Add dashboard settings for shared dashboard
1 parent f599b5a commit b132774

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

python/nav/web/sass/nav/custom.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,12 @@
156156
.widget-action {
157157
border-bottom: none;
158158
}
159-
.popover-content {
159+
.settings-popover {
160160
width: 800px;
161161
}
162+
.shared-settings-popover {
163+
width: 600px;
164+
}
162165
.row {
163166
margin-bottom: 1em;
164167
&:last-child {

python/nav/web/templates/webfront/_dashboard_settings_form.html

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
>
88
<i class="fa fa-gear fa-lg"></i>
99
</div>
10-
<div class="popover-content large">
10+
<div class="popover-content large {% if can_edit %}settings-popover{% else %}shared-settings-popover{% endif %}">
11+
{% if can_edit %}
1112
<form id="form-rename-dashboard"
1213
method="post"
1314
data-dashboard="{{ dashboard.pk }}"
@@ -17,10 +18,13 @@
1718
value="{{ dashboard.name }}">
1819
<input type="submit" class="small button" value="Rename dashboard">
1920
</form>
21+
{% else %}
22+
<p aria-label="Dashboard name">{{ dashboard.name }}</p>
23+
{% endif %}
2024

2125
<div class="row">
2226

23-
<div class="column medium-4">
27+
<div class="column medium-6">
2428
<div id="default-dashboard-container"
2529
data-is-default-dashboard="{{ dashboard.is_default|yesno:'1,0' }}">
2630
<div class="alert-box">This is the default dashboard</div>
@@ -32,8 +36,7 @@
3236
</form>
3337
</div>
3438
</div>
35-
36-
<div class="column medium-4">
39+
<div class="column medium-6">
3740
<a href="{% url 'export-dashboard' dashboard.pk %}" class="small button expand">Export dashboard
3841
</a><br/>
3942
<div class="nav-tooltip">
@@ -44,7 +47,8 @@
4447
</div>
4548
</div>
4649

47-
<div class="column medium-4">
50+
{% if can_edit %}
51+
<div class="column medium-6">
4852
{% if request.account.account_dashboards.count > 1 and not dashboard.is_default %}
4953
<form id="form-delete-dashboard" method="post" action="{% url 'delete-dashboard' dashboard.pk %}">
5054
{% csrf_token %}
@@ -53,8 +57,9 @@
5357
{% endif %}
5458

5559
</div>
56-
60+
{% endif %}
5761
</div>
62+
{% if can_edit %}
5863
<div class="row">
5964
<div class="column medium-4">
6065
<h5>Columns</h5>
@@ -72,6 +77,7 @@ <h5>Sharing</h5>
7277
</div>
7378
<div class="column medium-4"></div>
7479
</div>
80+
{% endif %}
7581
<div id="dashboard-settings-feedback">
7682
</div>
7783
</div>

python/nav/web/templates/webfront/index.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,7 @@
6464
title="Use compact layout for dashboard">
6565
<i class="fa fa-compress"></i>
6666
</div>
67-
68-
{% if can_edit %}
69-
{% include 'webfront/_dashboard_settings_form.html' %}
70-
{% else %}
71-
<div class="nav-tooltip export-action">
72-
<a
73-
class="widget-action"
74-
href="{% url 'export-dashboard' dashboard.pk %}"
75-
aria-describedby="#export-action-tooltip"
76-
>
77-
<i class="fa fa-download" title="Export dashboard"></i>
78-
</a>
79-
<div id="export-action-tooltip" role="tooltip">
80-
Download this dashboard's definition into a file that can later be imported by pressing the + next to the tab list
81-
</div>
82-
</div>
83-
{% endif %}
84-
67+
{% include 'webfront/_dashboard_settings_form.html' %}
8568
</div>
8669

8770
{# Buttons for selecting dashboards #}

0 commit comments

Comments
 (0)