Ejegg has submitted this change and it was merged.
Change subject: Remove buttons for all widgets
......................................................................
Remove buttons for all widgets
Fixed to have unique modal id's
There is an issue with the modal backdrop so that is handled in the
reloading of the board until we figure out what to do about modals.
There is another issue with the fact that reloading the board triggers
the loading modal for x by y momentarily, which is ugly and bad.
Change-Id: I2087180c803b6934f7add6e2d2e5b0a3d3cf6a86
---
M src/components/app-content/app-content.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/x-by-y/x-by-y.html
6 files changed, 69 insertions(+), 5 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index db61aed..36b52d3 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -74,13 +74,14 @@
self.removeWidgetFromBoard = function( event, data ){
var removingBoard = self.displayedBoard().id;
+ console.log('data: ', data);
$.ajax({
method: 'DELETE',
url: '/board/' + removingBoard + '/widgets/' +
event.instanceID,
success: function( ) {
$.get( 'board/' + removingBoard, function( moredata ){
- console.log(moredata);
self.displayedBoard( moredata );
+ $('.modal-backdrop').remove();
});
}
});
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index 56091db..be07c74 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -1,7 +1,10 @@
<div class="col-md-6 lastWidget">
<div class="panel panel-purple">
<div class="panel-heading">
- <p data-bind="text:title"></p>
+ <p class="pull-left" data-bind="text:title"></p>
+ <div class="btn-group btn-group-xs pull-right">
+ <button type="button" class="btn btn-sm
btn-default dropdown-toggle" data-toggle="modal" data-bind="attr: {
'data-target': '#remove'+instanceID }"><i class="fa fa-times"></i></button>
+ </div>
</div>
<div class="panel-body">
<p data-bind="visible: !hasData()">No data available.
This widget requires a widget like Totals Earned to provide data.</p>
@@ -10,4 +13,18 @@
</div>
</div>
</div>
+</div>
+
+<div class="modal fade" data-bind="attr: { id: 'remove'+instanceID } ">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h2>Remove this widget from the board?</h2>
+ </div>
+ <div class="modal-body">
+ <button class="btn btn-lg btn-success
pull-right" data-dismiss="modal" data-bind="click:
$parents[2].removeWidgetFromBoard"> OK</button>
+ <button class="btn btn-lg btn-danger
pull-right" data-dismiss="modal"> Cancel</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div>
</div>
\ No newline at end of file
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
index b74b42f..950b808 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
@@ -1,7 +1,10 @@
<div class="col-md-6 firstWidget">
<div class="panel panel-purple">
<div class="panel-heading">
- <p data-bind="text: title"></p>
+ <p class="pull-left" data-bind="text: title"></p>
+ <div class="btn-group btn-group-xs pull-right">
+ <button type="button" class="btn btn-sm
btn-default dropdown-toggle" data-toggle="modal" data-bind="attr: {
'data-target': '#remove'+instanceID }"><i class="fa fa-times"></i></button>
+ </div>
</div>
<div class="panel-body">
<p data-bind="visible: !hasData()">No data available.
This widget requires a widget like Totals Earned to provide data.</p>
@@ -12,4 +15,18 @@
</div>
</div>
</div>
+</div>
+
+<div class="modal fade" data-bind="attr: { id: 'remove'+instanceID } ">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h2>Remove this widget from the board?</h2>
+ </div>
+ <div class="modal-body">
+ <button class="btn btn-lg btn-success
pull-right" data-dismiss="modal" data-bind="click:
$parents[2].removeWidgetFromBoard"> OK</button>
+ <button class="btn btn-lg btn-danger
pull-right" data-dismiss="modal"> Cancel</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div>
</div>
\ No newline at end of file
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index ccd42ec..ce71883 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -8,6 +8,7 @@
<button type="button" class="btn btn-default"
data-toggle="modal" data-target="#modifyModal" data-bind="click:
renderPercentRangeChart"><i class="fa fa-edit"></i></button>
<button type="button" class="btn btn-danger"
data-bind="visible: !chartSaved() && optionStateChanged, click:
saveWidgetConfig"><i class="fa fa-save"></i></button>
<button type="button" class="btn btn-success"
data-bind="visible: chartSaved && !optionStateChanged()"><i class="fa
fa-save"></i> Saved</button>
+ <button type="button" class="btn btn-default dropdown-toggle"
data-toggle="modal" data-bind="attr: { 'data-target': '#remove'+instanceID
}"><i class="fa fa-times"></i></button>
</div>
</div>
<div class="panel-body">
@@ -132,3 +133,17 @@
</div>
</div>
</div>
+
+<div class="modal fade" data-bind="attr: { id: 'remove'+instanceID } ">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h2>Remove this widget from the board?</h2>
+ </div>
+ <div class="modal-body">
+ <button class="btn btn-lg btn-success pull-right"
data-dismiss="modal" data-bind="click: $parents[2].removeWidgetFromBoard">
OK</button>
+ <button class="btn btn-lg btn-danger pull-right"
data-dismiss="modal"> Cancel</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div>
+</div>
diff --git
a/src/components/widgets/totals-earned-chart/totals-earned-chart.html
b/src/components/widgets/totals-earned-chart/totals-earned-chart.html
index d7a3a52..5e763a9 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.html
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.html
@@ -10,6 +10,7 @@
<button type="button" class="btn btn-default"
data-bind="click: reloadData"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-danger"
data-bind="visible: !chartSaved(), click: saveWidgetConfig"><i class="fa
fa-save"></i></button>
<button type="button" class="btn btn-success"
data-bind="visible: chartSaved"><i class="fa fa-save"></i> Saved</button>
+ <button type="button" class="btn btn-sm btn-default
dropdown-toggle" data-toggle="modal" data-bind="attr: { 'data-target':
'#remove'+instanceID }"><i class="fa fa-times"></i></button>
</div>
</div>
</div>
@@ -110,3 +111,16 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
+<div class="modal fade" data-bind="attr: { id: 'remove'+instanceID } ">
+ <div class="modal-dialog modal-sm">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h2>Remove this widget from the board?</h2>
+ </div>
+ <div class="modal-body">
+ <button class="btn btn-lg btn-success pull-right"
data-dismiss="modal" data-bind="click: $parents[2].removeWidgetFromBoard">
OK</button>
+ <button class="btn btn-lg btn-danger pull-right"
data-dismiss="modal"> Cancel</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/components/widgets/x-by-y/x-by-y.html
b/src/components/widgets/x-by-y/x-by-y.html
index 2af5887..fa3b62a 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -15,7 +15,7 @@
<ul class="dropdown-menu" role="menu"
aria-labelledby="savedCharts" id="savedChartsMenu" data-bind="foreach:
presetTitles, style: { width: '300px'}">
<li data-bind="text: $data"></li>
</ul> -->
- <button type="button" class="btn btn-default
dropdown-toggle" data-toggle="modal" data-target="#removeModal"><i class="fa
fa-times"></i></button>
+ <button type="button" class="btn btn-sm
btn-default dropdown-toggle" data-toggle="modal" data-bind="attr: {
'data-target': '#remove'+instanceID }"><i class="fa fa-times"></i></button>
</div>
</div>
@@ -161,7 +161,7 @@
</div>
</div>
-<div class="modal fade" id="removeModal">
+<div class="modal fade" data-bind="attr: { id: 'remove'+instanceID } ">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
--
To view, visit https://gerrit.wikimedia.org/r/198402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2087180c803b6934f7add6e2d2e5b0a3d3cf6a86
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
