[MediaWiki-commits] [Gerrit] WIP forms refactor styles - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205912
Change subject: WIP forms refactor styles
..
WIP forms refactor styles
Change-Id: I16da0683c2c8ab222bc160aa4d7b0165d2ef3888
---
M DonationInterface.php
M gateway_common/GatewayPage.php
M gateway_forms/Form.php
M gateway_forms/Mustache.php
M gateway_forms/mustache/index.html.mustache
5 files changed, 106 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/12/205912/1
diff --git a/DonationInterface.php b/DonationInterface.php
index f50e006..07bd249 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -940,7 +940,21 @@
$wgResourceModules['jquery.payment'] = array(
'scripts' = 'jquery.payment/jquery.payment.js',
-) + $wgResourceTemplate;;
+) + $wgResourceTemplate;
+
+//Forms
+$wgResourceModules['ext.donationinterface.mustache.styles'] = array (
+ 'styles' = array('/forms.css', '/bootstrap.css'),
+ 'localBasePath' = $donationinterface_dir . 'gateway_forms/mustache',
+ 'remoteExtPath' = 'DonationInterface/gateway_forms/mustache',
+ 'position' = 'top',
+);
+
+$wgResourceModules['ext.donationinterface.mustache.scripts'] = array (
+ 'scripts' = '/forms.js',
+ 'localBasePath' = $donationinterface_dir . 'gateway_forms/mustache',
+ 'remoteExtPath' = 'DonationInterface/gateway_forms/mustache'
+);
// load any rapidhtml related resources
require_once( $donationinterface_dir .
'gateway_forms/rapidhtml/RapidHtmlResources.php' );
diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 908ce65..950e193 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -120,6 +120,7 @@
if ( $form_class class_exists( $form_class ) ){
$form_obj = new $form_class( $this-adapter );
$form = $form_obj-getForm();
+ $wgOut-addModules( $form_obj-getResources() );
$wgOut-addHTML( $form );
} else {
diff --git a/gateway_forms/Form.php b/gateway_forms/Form.php
index 297d291..54fc958 100644
--- a/gateway_forms/Form.php
+++ b/gateway_forms/Form.php
@@ -142,4 +142,10 @@
protected function getEscapedValue( $key ) {
return $this-gateway-getData_Unstaged_Escaped( $key );
}
+
+
+ public function getResources() {
+
+ return array();
+ }
}
diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index d0fcbcf..1ee1718 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -57,4 +57,8 @@
return $html;
}
+
+ public function getResources() {
+ return array( 'ext.donationinterface.mustache.styles',
'ext.donationinterface.mustache.scripts' );
+ }
}
diff --git a/gateway_forms/mustache/index.html.mustache
b/gateway_forms/mustache/index.html.mustache
index 4aeb47f..de00408 100644
--- a/gateway_forms/mustache/index.html.mustache
+++ b/gateway_forms/mustache/index.html.mustache
@@ -1,3 +1,81 @@
-You said you wanted to donate in {{ currency_code }},
+div class=container
+ div class=row-fluid
+ div class=col-md-6 id=appeal valign=top
+ {{LanguageSwitch|2011FR/@appeal/text|@language}}
+ pthis is the appeal/p
+ /div
-FOO
+
+
+ div class=col-md-6
+
+ div class=row-fluid
+ div id=donate valign=top
+ div id=formContainer
+ form name=payment
method=post
+ div
id='payment_gateway-personal-info'
+ table
id=payment-table-donor
+ tbody
+
tr
+
td
+
div id=step1header
+
h3 class=amount_header{{ donate_interface-amount-legend }}
+
span id=selected-amount{{ amount }} {{
currency_code }}/span
+
/h3
+
/div
+
/td
+
[MediaWiki-commits] [Gerrit] Fix doc strings on some JS functions - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix doc strings on some JS functions
..
Fix doc strings on some JS functions
Change-Id: I5a7ce986d6182debfd1c53e76db6f3a7cdd4bfad
---
M persistence.js
M routes/data.js
2 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/persistence.js b/persistence.js
index fda60f5..680ffa0 100644
--- a/persistence.js
+++ b/persistence.js
@@ -39,7 +39,7 @@
/**
* Ensures a user exists in the user table and saves the user's local
db id
* in session. Creates a default board if none exists.
-* @param Object user should have displayName, provider, and id set by
oauth
+* @param {object} user should have displayName, provider, and id set
by oauth
* @return Promise that fulfills on completion or rejects with error
*/
loginUser: function( user ) {
@@ -74,7 +74,7 @@
},
/**
* Saves a widget configuration
-* @param Object instance should have ownerId, widgetId, displayName,
+* @param {object} instance should have ownerId, widgetId, displayName,
* isShared, and configuration set. If id is not set, this function
creates
* a new instance and sets the id.
* @return Promise that fulfills on completion or rejects with error
@@ -99,8 +99,8 @@
});
},
/**
-* @param number boardId ID of board to fetch
-* @param number userId local ID of user
+* @param {Number} instanceId ID of widget instance to fetch
+* @param {Number} userId local ID of user
* @returns Promise that resolves with a JSON representation of all
* board widgets or rejects with error
*/
@@ -128,7 +128,7 @@
},
/**
* List all widget instances available to a user
-* @param number userId local ID of user
+* @param {number} userId local ID of user
* @returns Promise that resolves with a JSON representation of all
* widget instances owned by or shared with the user, or rejects with
error
*/
@@ -160,7 +160,7 @@
},
/**
* Saves a board
-* @param Object instance should have ownerId, displayName, description,
+* @param {object} board should have ownerId, displayName, description,
* isShared, and widgets (an ordered array of widget instance ids) set.
* If id is not set, this function creates a new board and sets the id.
* @return Promise that fulfills on completion or rejects with error
@@ -201,8 +201,8 @@
});
},
/**
-* @param number boardId ID of board to fetch
-* @param number userId local ID of user
+* @param {number} boardId ID of board to fetch
+* @param {number} userId local ID of user
* @returns Promise that resolves with a JSON representation of all
* board widgets or rejects with error
*/
@@ -249,7 +249,7 @@
},
/**
* Retrieve all boards available to a user (theirs and shared boards)
-* @param number userId local id of the user
+* @param {number} userId local id of the user
* @returns array of boards available to the user
*/
listBoards: function( userId ) {
diff --git a/routes/data.js b/routes/data.js
index 6766dc5..3154eb9 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -12,7 +12,7 @@
* Throws an error if an value is invalid for the given column
*
* @param {mixed} value
- * @param {Object} column
+ * @param {object} column
*/
function validateValue( value, column ) {
var valid = false,
@@ -51,9 +51,9 @@
}
/**
* Adds to the list of join statements
- * @param string table alias required
- * @param Object widget
- * @param Array joins
+ * @param {string} table alias required
+ * @param {object} widget
+ * @param {Array} joins
*/
function addJoin( table, widget, joins ) {
var i;
@@ -70,10 +70,10 @@
* Gets a filter and adds it to joins if not yet present
* Throws an error if the column does not exist
*
- * @param {String} name - qs param for the filter
- * @param {Object} widget
+ * @param {string} name - qs param for the filter
+ * @param {object} widget
* @param {Array} joins - list of table aliases to join
- * @returns {Object} describing column
+ * @returns {object} describing column
*/
function getColumn( name, widget, joins ) {
var col = widget.filters[name];
@@ -86,7 +86,7 @@
/**
* Formats a column object for SQL
- * @param Object filter column object
+ * @param {object} column filter column object
* @returns SQL representation of the given column for use in where or group
clauses
*/
function getColumnText( column ) {
@@ -106,11 +106,11 @@
* Uses '?' placeholders in clause, and appends literal
[MediaWiki-commits] [Gerrit] Don't lint dist/ if it exists - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Don't lint dist/ if it exists
..
Don't lint dist/ if it exists
Change-Id: I6721a29fc5d00d1405ca1df76c9e768ff0a4ca4e
---
M gulpfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/gulpfile.js b/gulpfile.js
index 0082cac..e03809a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,7 +52,7 @@
}
});
-var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js'];
+var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js', '!dist/**/*.js'];
// linting
gulp.task('lint', function () {
--
To view, visit https://gerrit.wikimedia.org/r/200079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6721a29fc5d00d1405ca1df76c9e768ff0a4ca4e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define common filters in one file - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Define common filters in one file
..
Define common filters in one file
Less duplication, easier to add all the filters to all the widgets.
Change-Id: I7bc14b8ba486d23a10c4014060c1a00c23c77105
---
M widgets/big-english.js
A widgets/common-filters.js
M widgets/fraud-gauge.js
M widgets/x-by-y.js
4 files changed, 290 insertions(+), 256 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/widgets/big-english.js b/widgets/big-english.js
index 22d84f0..10d9ae9 100644
--- a/widgets/big-english.js
+++ b/widgets/big-english.js
@@ -1,34 +1,12 @@
-var config = require( '../config.js' );
+var commonFilters = require( './common-filters.js' ),
+ config = require( '../config.js' );
module.exports = {
name: 'big-english',
query: 'select count(*) as donations, sum(total_amount) as usd_total,\n
IF( day(receive_date) = day(utc_timestamp()) and hour(receive_date) =
hour(utc_timestamp()), CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60), 60) as minutes, sum(total_amount)/IF( day(receive_date)
= day(utc_timestamp()) and hour(receive_date) = hour(utc_timestamp()),
CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date), MAX(receive_date))/60), 60)/60
as usd_per_second, DAY(receive_date) as day, HOUR(receive_date) as hour from '
+ config.civicrmDb + '.civicrm_contribution cc [[WHERE]] GROUP BY
DAY(receive_date), HOUR(receive_date) ORDER BY day ASC, hour ASC;',
mainTableAlias: 'cc',
optionalJoins: {},
- filters: {
- Year: {
- table: 'cc',
- func: 'YEAR',
- column: 'receive_date',
- display: 'Year',
- type: 'number'
- },
- Month: {
- table: 'cc',
- func: 'MONTH',
- column: 'receive_date',
- display: 'Month',
- type: 'number'
- },
- Amount: {
- table: 'cc',
- column : 'total_amount',
- display : 'Amount',
- type : 'number',
- min : 0,
- max : 1
- }
- },
+ filters: commonFilters.civicrmContribution,
defaultFilter: {
type: 'and',
left: {
diff --git a/widgets/common-filters.js b/widgets/common-filters.js
new file mode 100644
index 000..1ca2ef9
--- /dev/null
+++ b/widgets/common-filters.js
@@ -0,0 +1,267 @@
+/*
+ * Use these to extend() your widget's filters. Note that some filters are
+ * defined for multiple tables. Extend with the filter set of your primary
+ * table last to make sure you get the correct version.
+ */
+
+module.exports = {
+ civicrmContribution: {
+ DT: {
+ table: 'cc',
+ column : 'receive_date',
+ display: 'Date',
+ type: 'datetime',
+ //TODO: dynamic min/max
+ min: '2005-01-01',
+ max: '2099-12-31'
+ },
+ Year: {
+ table: 'cc',
+ func: 'YEAR',
+ column: 'receive_date',
+ display: 'Year',
+ type: 'number',
+ canGroup: true
+ },
+ Month: {
+ table: 'cc',
+ func: 'MONTH',
+ column: 'receive_date',
+ display: 'Month',
+ type: 'number',
+ canGroup: true
+ },
+ Day: {
+ table: 'cc',
+ func: 'DAY',
+ column: 'receive_date',
+ display: 'Year',
+ type: 'number',
+ canGroup: true
+ },
+ Hour: {
+ table: 'cc',
+ func: 'HOUR',
+ column: 'receive_date',
+ display: 'Hour',
+ type: 'number',
+ canGroup: true
+ },
+ YearsAgo: {
+ table: 'cc',
+ column : 'receive_date',
+ func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
+ display: 'Years ago',
+ type: 'number',
+ min: 0,
+ max: 12
+ },
+ MonthsAgo: {
+ table: 'cc',
+ column :
[MediaWiki-commits] [Gerrit] Fix fraud gauge color display - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/14
Change subject: Fix fraud gauge color display
..
Fix fraud gauge color display
Change-Id: I6559cb447e2bb66268a52ba79ed91da6a6215b75
---
M persistence.sql
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/94/14/1
diff --git a/persistence.sql b/persistence.sql
index 744b20f..ce8c45a 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -1,9 +1,9 @@
/* Should you need to drop first, use these
-DROP TABLE dash_widget_instance_board;
-DROP TABLE dash_board;
-DROP TABLE dash_widget_instance;
-DROP TABLE dash_widget;
-DROP TABLE dash_user;
+ DROP TABLE dash_widget_instance_board;
+ DROP TABLE dash_board;
+ DROP TABLE dash_widget_instance;
+ DROP TABLE dash_widget;
+ DROP TABLE dash_user;
*/
CREATE TABLE IF NOT EXISTS dash_user(
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 887fa66..c353dd5 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -140,7 +140,7 @@
color: {
pattern: ['#FF', '#F97600',
'#F6C600', '#60B044'], // the three color levels for the percentage values.
threshold: {
- values: [ 0,
self.greenHighRange, self.redLowRange, 100]
+ values: [ 0,
self.greenHighRange(), self.redLowRange(), 100]
}
}
});
--
To view, visit https://gerrit.wikimedia.org/r/14
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6559cb447e2bb66268a52ba79ed91da6a6215b75
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an add-widgets button to boards - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/200061 Change subject: Add an add-widgets button to boards .. Add an add-widgets button to boards bug: T93966 Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae --- M src/components/boards/generic-board/generic-board.html 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/61/200061/1 diff --git a/src/components/boards/generic-board/generic-board.html b/src/components/boards/generic-board/generic-board.html index 2c17a5b..dbf2861 100644 --- a/src/components/boards/generic-board/generic-board.html +++ b/src/components/boards/generic-board/generic-board.html @@ -7,9 +7,9 @@ !-- i class=fa fa-gear data-toggle=modal data-target=#changeBoardNameModal/i/p -- /div div class=col-md-8 titleCol -!-- div class=btn-group btn-group-xs pull-right -button type=button class=btn btn-default data-bind=click: reloadBoardi class=fa fa-refresh style=padding-right:5px/i Refresh/button -/div -- +div class=btn-group btn-group-xs pull-right +button type=button class=btn btn-default id=Library data-bind=click: $parent.setDisplayPagei class=fa fa-plus-square/i Add widgets/button +/div /div /div -- To view, visit https://gerrit.wikimedia.org/r/200061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make smaller widgets float - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199660
Change subject: Make smaller widgets float
..
Make smaller widgets float
TODO: this is a quick fix for now. When widgets get taller this will
break. A better schema is needed, and smaller widgets need to resize
when the window is smaller. Not mvp.
Change-Id: I214ba0658033bacdc32f30a2f9ce6cc046bee720
---
M src/bower_modules
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/cat-trombone/cat-trombone.html
M src/css/style.css
4 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/60/199660/1
diff --git a/src/bower_modules b/src/bower_modules
index f776d8b..b570271 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit f776d8b7f3152ceccfb02f425985c4612d957643
+Subproject commit b57027165c9375498978d3f65b8324d95621351c
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 80f0fa8..5a5855c 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -13,7 +13,7 @@
/div
div class=row widgetDisplayRow data-bind=foreach:
displayedBoard().widgets
-div class=col-md-12 style=padding-left:0
+div class=widgetPlace style=padding-left:0
span class=floatingWidget data-bind=component: { name:
widgetCode, params: { title: displayName, description: description,
configuration: configuration, widgetInstance: id, widgetCode: widgetCode,
dataLoading: dataLoading, sharedContext: $parent.sharedContext } }span
data-bind=text: display_name/span/span
/div
/div
diff --git a/src/components/widgets/cat-trombone/cat-trombone.html
b/src/components/widgets/cat-trombone/cat-trombone.html
index fffac86..2edef20 100644
--- a/src/components/widgets/cat-trombone/cat-trombone.html
+++ b/src/components/widgets/cat-trombone/cat-trombone.html
@@ -9,7 +9,7 @@
div class=panel-body
div class=row-fluid
div class=col-md-12
- p class=text-centerimg
src=/images/catmusician.gif/p
+ p class=text-centerimg
src=/images/catmusician.gif style=height:275px/p
/div
/div
/div
diff --git a/src/css/style.css b/src/css/style.css
index 9c9551d..53828aa 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -273,7 +273,7 @@
/* Different widget class sizes */
.widget-6 {
-width: 45%;
+width: 49%;
display:inline-block;
}
@@ -441,6 +441,12 @@
padding: 1em;
}
+.panel {
+vertical-align: top;
+min-height: 355px;
+margin-right: 10px;
+}
+
.panel-transparent {
border-color: #ccc;
}
@@ -513,6 +519,10 @@
min-width: 875px;
}
+.widgetPlace {
+display: inline;
+}
+
/* C3 Bar Chart Styles */
.c3-region {
fill: red;
--
To view, visit https://gerrit.wikimedia.org/r/199660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214ba0658033bacdc32f30a2f9ce6cc046bee720
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete some console.log - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Delete some console.log
..
Delete some console.log
Change-Id: I7c8cde03789eef2df2cc6482432385b66a7113ec
---
M src/components/app-content/app-content.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
3 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 36b52d3..232b210 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -74,7 +74,6 @@
self.removeWidgetFromBoard = function( event, data ){
var removingBoard = self.displayedBoard().id;
-console.log('data: ', data);
$.ajax({
method: 'DELETE',
url: '/board/' + removingBoard + '/widgets/' +
event.instanceID,
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 125e18c..78ebbf4 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -22,7 +22,7 @@
div id=FraudRiskScoreGauge/div
/div
-div class=row id=unspecifiedFraudGauge
data-bind=visible: !configSet(), click: console.log(configSet())
+div class=row id=unspecifiedFraudGauge
data-bind=visible: !configSet()
div class=col-md-12
div class=setupAsk
h3This widget hasn't been set up yet./h3
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 04482a7..bc97f76 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -130,10 +130,7 @@
columns: [
['failure', self.gaugeValue()]
],
- type: 'gauge',
- onclick: function (d, i) {
console.log('onclick', d, i); }, //TODO: make these better
- onmouseover: function (d, i) {
console.log('onmouseover', d, i); },
- onmouseout: function (d, i) {
console.log('onmouseout', d, i); }
+ type: 'gauge'
},
gauge: {
min: 0,
@@ -262,7 +259,6 @@
self.queryRequest.timespan =
self.selectedTimePeriod();
//gauge filters
- console.log('selected filters? ',
self.selectedFilters());
self.queryRequest.selectedFilters =
self.selectedFilters();
if(self.selectedFilters().length 0){
self.filtersSelected(true);
--
To view, visit https://gerrit.wikimedia.org/r/199570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c8cde03789eef2df2cc6482432385b66a7113ec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Insert a Big English board for each new user - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Insert a Big English board for each new user
..
Insert a Big English board for each new user
TODO: make shared boards show up, figure out permissions
Bug: T91581
Change-Id: I41da8460b210f58010fae93ccac9490f32fca4a4
---
M persistence.js
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/persistence.js b/persistence.js
index fda60f5..d776716 100644
--- a/persistence.js
+++ b/persistence.js
@@ -46,7 +46,20 @@
var params = [ user.id, user.provider, user.displayName ],
insertUser = 'INSERT IGNORE INTO dash_user ( oauth_id,
oauth_provider, display_name ) VALUES ( ?, ?, ? )',
getInfo = 'SELECT id, default_board, avatar, title,
email from dash_user where oauth_id = ? and oauth_provider = ?',
- insertBoard = 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( ?, \'\', ? ); UPDATE dash_user SET
default_board = LAST_INSERT_ID() WHERE id = ?; SELECT LAST_INSERT_ID() AS id',
+ insertBoard = 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( ?, \'\', ? );' +
+ 'UPDATE dash_user SET default_board =
LAST_INSERT_ID() WHERE id = ?;' +
+ 'SELECT LAST_INSERT_ID() AS id',
+ insertBigEnglish = 'SET @uid = ?;\n' +
+ 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( \'Big English\', \'\', @uid );\n' +
+ 'SET @beboard = LAST_INSERT_ID();\n' +
+ 'INSERT INTO dash_widget_instance ( widget_id,
owner_id, display_name, description )\n' +
+ 'SELECT id, @uid, display_name, description
FROM dash_widget WHERE code IN ( \'totals-earned-chart\',
\'distance-to-goal-chart\', \'amt-per-second-chart\' );\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 1 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'totals-earned-chart\';\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 2 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'distance-to-goal-chart\';\n' +
+ 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
+ 'SELECT dwi.id, @beboard, 3 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'amt-per-second-chart\';',
connection = getConnection();
return connection.query( insertUser, params ).then( function() {
@@ -68,6 +81,7 @@
// If user doesn't have a default board, insert
one now
return connection.query( insertBoard, [
'Default dashboard for ' + user.displayName, userId, userId ] ).then( function(
dbResults ) {
user.defaultBoard =
dbResults[0][2][0].id;
+ return connection.query(
insertBigEnglish, [ userId ] );
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/199560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I41da8460b210f58010fae93ccac9490f32fca4a4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make a C3 knockout binding - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Make a C3 knockout binding
..
Make a C3 knockout binding
We need this in order to put multiple charts of the same type on the
same page, so we're not binding each chart to a specific element id.
Bug: T92430
Change-Id: I02119e11585e88e392d7c87509c5753bb58c1dfe
---
M src/app/bindings.js
M src/app/startup.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
4 files changed, 48 insertions(+), 22 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/app/bindings.js b/src/app/bindings.js
index e69de29..b74f752 100644
--- a/src/app/bindings.js
+++ b/src/app/bindings.js
@@ -0,0 +1,37 @@
+define( [
+ 'knockout',
+ 'c3'
+], function( ko, c3 ) {
+ ko.bindingHandlers.c3 = {
+ init: function init( element, valueAccessor,
allBindingsAccessor, viewModel, bindingContext ) {
+ var chart, options = ko.unwrap( valueAccessor() );
+ if ( !options ) {
+ return;
+ }
+ options.bindto = element;
+ chart = c3.generate(options);
+ ko.utils.domNodeDisposal.addDisposeCallback( element,
function() {
+ chart.destroy();
+ });
+ ko.utils.domData.set( element, 'chart', chart );
+ },
+ update: function update( element, valueAccessor,
allBindingsAccessor, viewModel, bindingContext ) {
+ var chart = ko.utils.domData.get( element, 'chart' ),
+ options = ko.unwrap(valueAccessor());
+ if ( !options ) {
+ return;
+ }
+ if ( chart ) {
+ chart.load( options.data );
+ return;
+ }
+ options.bindto = element;
+ chart = c3.generate(options);
+ ko.utils.domNodeDisposal.addDisposeCallback( element,
function() {
+ chart.destroy();
+ });
+ ko.utils.domData.set( element, 'chart', chart );
+ }
+ };
+ return true;
+} );
\ No newline at end of file
diff --git a/src/app/startup.js b/src/app/startup.js
index 65f0d20..898a3f2 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -3,10 +3,9 @@
'knockout',
'./router',
'bootstrap',
- 'knockout-projections'
- //'./bindings'
+ 'knockout-projections',
+ './bindings'
], function( $, ko, router ){
-
ko.components.register( 'dashboard', { require:
'components/dashboard/dashboard' });
ko.components.register( 'home', { require:
'components/home/home' });
ko.components.register( 'nav-bar',{ require:
'components/nav-bar/nav-bar' });
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 0f64b3a..c08c720 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
@@ -11,7 +11,7 @@
h3i class=fa fa-2x fa-puzzle-piece/i No data
available./h3
This widget works in tandem with another widget, like
emTotals Earned/em. Add the other widget to this board and you'll see the
chart.
/div
- div class=col-md-12
+ div class=col-md-12 data-bind=c3: avgUSDperSecondChart
div id=avgUSDperSecond/div
/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index a4711e8..19865f4 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -11,10 +11,9 @@
var self = this;
WidgetBase.call( this, params );
self.hasData = ko.observable( false );
+ self.avgUSDperSecondChart = ko.observable( false );
self.makeChart = function() {
- var columns;
-
if ( params.sharedContext.dayObj.length 2 ) {
return;
}
@@ -54,21 +53,8 @@
self.gotPerSecond[ numPoints + 1 ] =
self.gotPerSecond[ numPoints ];
[MediaWiki-commits] [Gerrit] Linearize chained db queries - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Linearize chained db queries
..
Linearize chained db queries
Reduces nesting, might make errors bubble up correctly
Change-Id: I1612f9fdf2d6004111cd8be499c668ea81d24512
---
M persistence.js
1 file changed, 84 insertions(+), 62 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
jenkins-bot: Verified
diff --git a/persistence.js b/persistence.js
index d776716..6019af8 100644
--- a/persistence.js
+++ b/persistence.js
@@ -60,31 +60,39 @@
'SELECT dwi.id, @beboard, 2 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'distance-to-goal-chart\';\n' +
'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position )\n' +
'SELECT dwi.id, @beboard, 3 FROM
dash_widget_instance dwi JOIN dash_widget dw ON dwi.widget_id = dw.id WHERE
owner_id = @uid AND code = \'amt-per-second-chart\';',
- connection = getConnection();
+ connection = getConnection(),
+ defaultBoard,
+ userId;
- return connection.query( insertUser, params ).then( function() {
- return connection.query( getInfo, params ).then(
function( dbResults ) {
- var userId =
dbResults[0][0].id,
- defaultBoard=
dbResults[0][0].default_board,
- avatar =
dbResults[0][0].avatar,
- title =
dbResults[0][0].title,
- email =
dbResults[0][0].email;
- user.localId = userId;
- user.avatar = avatar;
- user.title = title;
- user.email = email;
+ return connection.query( insertUser, params )
+ .then( function() {
+ return connection.query( getInfo, params );
+ } )
+ .then( function( dbResults ) {
+ var avatar =
dbResults[0][0].avatar,
+ title = dbResults[0][0].title,
+ email = dbResults[0][0].email;
- if ( defaultBoard ) {
- user.defaultBoard = defaultBoard;
- return;
- }
- // If user doesn't have a default board, insert
one now
- return connection.query( insertBoard, [
'Default dashboard for ' + user.displayName, userId, userId ] ).then( function(
dbResults ) {
- user.defaultBoard =
dbResults[0][2][0].id;
- return connection.query(
insertBigEnglish, [ userId ] );
- });
- });
- });
+ userId = dbResults[0][0].id;
+ defaultBoard = dbResults[0][0].default_board;
+ user.localId = userId;
+ user.avatar = avatar;
+ user.title = title;
+ user.email = email;
+ if ( defaultBoard ) {
+ user.defaultBoard = defaultBoard;
+ return;
+ }
+ // If user doesn't have a default board, insert one now
+ return connection.query( insertBoard, [ 'Default
dashboard for ' + user.displayName, userId, userId ] );
+ } )
+ .then( function( dbResults ) {
+ if ( !dbResults ) {
+ return;
+ }
+ user.defaultBoard = dbResults[0][2][0].id;
+ return connection.query( insertBigEnglish, [ userId ] );
+ } );
},
/**
* Saves a widget configuration
@@ -101,12 +109,13 @@
connection = getConnection();
if ( instance.id ) {
- return connection.query( update, updateParams ).then(
function( dbResults ) {
+ return connection.query( update, updateParams )
+ .then( function( dbResults ) {
if ( dbResults[0].affectedRows !== 1 ) {
// Either the instance doesn't exist or
it's not ours
[MediaWiki-commits] [Gerrit] Optimize padding for laptops, better nav style - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199782
Change subject: Optimize padding for laptops, better nav style
..
Optimize padding for laptops, better nav style
Change-Id: Iaf5bd3e056100868a4fd21752657add3ddcd46c2
---
M src/css/style.css
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/82/199782/1
diff --git a/src/css/style.css b/src/css/style.css
index 53828aa..f0d3ad1 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -146,6 +146,7 @@
.subNavBoardOpts li {
padding: 10px;
text-align: right;
+border-top: 1px rgba(94, 102, 138, 0.2) solid;
}
.subNavBoardOpts li:hover {
@@ -273,7 +274,7 @@
/* Different widget class sizes */
.widget-6 {
-width: 49%;
+width: 48%;
display:inline-block;
}
@@ -444,7 +445,7 @@
.panel {
vertical-align: top;
min-height: 355px;
-margin-right: 10px;
+margin-right: 1.4em;
}
.panel-transparent {
--
To view, visit https://gerrit.wikimedia.org/r/199782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf5bd3e056100868a4fd21752657add3ddcd46c2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix caching - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix caching
..
Fix caching
Was storing at the wrong key. Oops.
Change-Id: I21f408c6a5c24ee6a40fb3118486928fd8709712
---
M routes/data.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/routes/data.js b/routes/data.js
index 6766dc5..78ef89f 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -357,7 +357,7 @@
}
result = { results: dbResults, sqlQuery: substituteParams(
sqlQuery, values), timestamp: new Date().getTime() };
logger.debug( 'Storing results at cache key ' + cacheKey );
- cache.put( req.url, result, config.cacheDuration );
+ cache.put( cacheKey, result, config.cacheDuration );
res.json( result );
});
};
--
To view, visit https://gerrit.wikimedia.org/r/199769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21f408c6a5c24ee6a40fb3118486928fd8709712
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove default wording and direct new user to lib - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199815
Change subject: Remove default wording and direct new user to lib
..
Remove default wording and direct new user to lib
bug: T93967
Change-Id: I7e8d373030380c74196285003c709cc46a0d
---
M persistence.js
M src/components/app-content/app-content.html
M src/components/boards/generic-board/generic-board.html
M src/components/boards/generic-board/generic-board.js
M src/css/style.css
5 files changed, 46 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/15/199815/1
diff --git a/persistence.js b/persistence.js
index ebdb290..5108a60 100644
--- a/persistence.js
+++ b/persistence.js
@@ -84,7 +84,8 @@
return;
}
// If user doesn't have a default board, insert one now
- return connection.query( insertBoard, [ 'Default
dashboard for ' + user.displayName, userId, userId ] );
+ var username = user.displayName.charAt(0).toUpperCase()
+ user.displayName.slice(1);
+ return connection.query( insertBoard, [ username + 's
Board, userId, userId ] );
} )
.then( function( dbResults ) {
if ( !dbResults ) {
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index caa32de..12def48 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -30,7 +30,7 @@
img data-bind=attr: {src:
previewPath}
h3 data-bind=text: displayName/h3
p class=widgetDesc data-bind=text:
description/p
- button class=btn btn-block btn-col
btn-primary addToBoardBtn data-bind=attr: { id: 'add-widget-'+id }, click:
$parent.addWidgetToBoardAdd to my default board/button
+ button class=btn btn-block btn-col
btn-primary addToBoardBtn data-bind=attr: { id: 'add-widget-'+id }, click:
$parent.addWidgetToBoardAdd to my board/button
button class=hide btn btn-block
btn-col btn-success addToBoardBtn data-bind=attr: { id: 'saved-widget-'+id
}i class=fa fa-check-circle-o/i Added./button
/li
/ul
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 5a5855c..2c17a5b 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -3,13 +3,24 @@
div class=row
div class=col-md-4 titleCol
h2 style=display:inline data-bind=text:
displayedBoard().displayName/h2
-p data-bind=text: displayDate/p
+pspan data-bind=text: displayDate/span/p
+!-- i class=fa fa-gear data-toggle=modal
data-target=#changeBoardNameModal/i/p --
/div
div class=col-md-8 titleCol
!-- div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default
data-bind=click: reloadBoardi class=fa fa-refresh
style=padding-right:5px/i Refresh/button
/div --
/div
+/div
+
+div class=row jumbotron transparent data-bind=visible:
displayedBoard().widgets.length == 0
+div class=alert alert-info
+h1i class=fa fa-flag/i There are no widgets on this
board./h1
+div class=text-center
+h3Don't worry, it's easy to add them. They live in the
Library./h3
+button class=btn btn-lg btn-info id=Library
data-bind=click: $parent.setDisplayPagei class=fa fa-paper-plane/i
Take me to the Library!/button
+/div
+/div
/div
div class=row widgetDisplayRow data-bind=foreach:
displayedBoard().widgets
@@ -30,4 +41,23 @@
/div
/div!-- /.modal-content --
/div
-/div
\ No newline at end of file
+/div
+
+div class=modal fade id=changeBoardNameModal
+div class=modal-dialog
+div class=modal-content
+div class=modal-header
+button type=button class=close data-dismiss=modalspan
aria-hidden=truetimes;/spanspan class=sr-onlyClose/span/button
+h4 class=modal-titleChange Board Name/h4
+/div
+div class=modal-body
+labelNew Name:/label
+input type=text class=form-control data-bind=textInput:
boardName
+/div
+div class=modal-footer
+button type=button class=btn btn-default
data-dismiss=modalCancel/button
+
[MediaWiki-commits] [Gerrit] Fix positioning of amt per second chart - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/199759 Change subject: Fix positioning of amt per second chart .. Fix positioning of amt per second chart Change-Id: I8ce1787de7370bae972bc631d60c49270640aeee --- M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/59/199759/1 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 c08c720..c4b79b7 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 @@ -11,7 +11,7 @@ h3i class=fa fa-2x fa-puzzle-piece/i No data available./h3 This widget works in tandem with another widget, like emTotals Earned/em. Add the other widget to this board and you'll see the chart. /div - div class=col-md-12 data-bind=c3: avgUSDperSecondChart + div class=col-md-12 style=margin-left:-2em data-bind=c3: avgUSDperSecondChart div id=avgUSDperSecond/div /div /div -- To view, visit https://gerrit.wikimedia.org/r/199759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ce1787de7370bae972bc631d60c49270640aeee Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify c3 style value to work with widgets - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199507
Change subject: Modify c3 style value to work with widgets
..
Modify c3 style value to work with widgets
Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
---
M c3/c3.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/src/bower_modules
refs/changes/07/199507/1
diff --git a/c3/c3.js b/c3/c3.js
index 233d1b5..98c4c56 100644
--- a/c3/c3.js
+++ b/c3/c3.js
@@ -877,7 +877,7 @@
.attr('width', $$.width)
.attr('height', $$.height);
// MEMO: parent div's height will be bigger than svg when !DOCTYPE
html
-$$.selectChart.style('max-height', $$.currentHeight + px);
+$$.selectChart.style('max-height',
$$.currentHeight+($$.currentHeight/5) + px);
};
--
To view, visit https://gerrit.wikimedia.org/r/199507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash/src/bower_modules
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pre-deploy interface fixes - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199518
Change subject: Pre-deploy interface fixes
..
Pre-deploy interface fixes
Need better widget flow for smaller widgets but this is good for now.
Change-Id: I8c0ed19a4f1b455adcf6bd063fcff2839cf92fb7
---
M src/components/boards/generic-board/generic-board.html
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/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/x-by-y/x-by-y.html
M src/css/style.css
8 files changed, 272 insertions(+), 293 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/18/199518/1
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 5484460..80f0fa8 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -1,6 +1,6 @@
div class=col-md-12
-div class=row row-top
+div class=row
div class=col-md-4 titleCol
h2 style=display:inline data-bind=text:
displayedBoard().displayName/h2
p data-bind=text: displayDate/p
@@ -12,8 +12,10 @@
/div
/div
-div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, dataLoading: dataLoading,
sharedContext: $parent.sharedContext } }span data-bind=text:
display_name/span/div
+div class=row widgetDisplayRow data-bind=foreach:
displayedBoard().widgets
+div class=col-md-12 style=padding-left:0
+span class=floatingWidget data-bind=component: { name:
widgetCode, params: { title: displayName, description: description,
configuration: configuration, widgetInstance: id, widgetCode: widgetCode,
dataLoading: dataLoading, sharedContext: $parent.sharedContext } }span
data-bind=text: display_name/span/span
+/div
/div
/div
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 be07c74..0f64b3a 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,20 +1,23 @@
-div class=col-md-6 lastWidget
- div class=panel panel-purple
- div class=panel-heading
- 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 class=panel panel-purple widget-6
+ div class=panel-heading
+ 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 class=panel-body
- p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
- div class=col-md-12
- div id=avgUSDperSecond/div
- /div
+ /div
+ div class=panel-body
+ div class=alert alert-warning style=padding:20px
data-bind=visible: !hasData()
+ h3i class=fa fa-2x fa-puzzle-piece/i No data
available./h3
+ This widget works in tandem with another widget, like
emTotals Earned/em. Add the other widget to this board and you'll see the
chart.
+ /div
+ div class=col-md-12
+ div id=avgUSDperSecond/div
/div
/div
/div
+
div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
div class=modal-dialog modal-sm
div class=modal-content
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 950b808..096f204 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,22 +1,25 @@
-div class=col-md-6
[MediaWiki-commits] [Gerrit] Add a cat playing a trombone - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199530
Change subject: Add a cat playing a trombone
..
Add a cat playing a trombone
Change-Id: I91f62e5ee0d3e2a4e6076c85cf95e624d85fe730
---
M persistence.sql
M src/app/startup.js
A src/components/widgets/cat-trombone/cat-trombone.html
A src/components/widgets/cat-trombone/cat-trombone.js
A src/images/catmusician.gif
5 files changed, 47 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/30/199530/1
diff --git a/persistence.sql b/persistence.sql
index d676b56..744b20f 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -63,6 +63,7 @@
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'amt-per-second-chart', 'Amount Per Second', 'Shows USD per second
required to reach Big English goal', 'images/amt-per-sec.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'distance-to-goal-chart', 'Distance to Goal', 'Line chart showing
USD needed to reach overall Big English goal', 'images/distance-to-goal.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'totals-earned-chart', 'Totals Earned', 'Main Big English bar chart
showing daily and hourly donation totals and counts',
'images/totals-earned.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'cat-trombone', 'Trombone Cat', 'A cat is playing a TROMBONE',
'images/catmusician.gif');
/* Tailor these to your liking
GRANT INSERT, SELECT, UPDATE, DELETE ON dash_widget_instance_board TO
'testuser'@'localhost';
diff --git a/src/app/startup.js b/src/app/startup.js
index e6cc743..65f0d20 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -25,6 +25,7 @@
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
ko.components.register( 'x-by-y', { require:
'components/widgets/x-by-y/x-by-y' });
+ko.components.register( 'cat-trombone', { require:
'components/widgets/cat-trombone/cat-trombone' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/widgets/cat-trombone/cat-trombone.html
b/src/components/widgets/cat-trombone/cat-trombone.html
new file mode 100644
index 000..fffac86
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.html
@@ -0,0 +1,31 @@
+
+div class=panel panel-purple widget-6
+ div class=panel-heading
+ p class=pull-leftThis cat is playing a trombone/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
+ div class=row-fluid
+ div class=col-md-12
+ p class=text-centerimg
src=/images/catmusician.gif/p
+ /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
+ h2Remove 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/cat-trombone/cat-trombone.js
b/src/components/widgets/cat-trombone/cat-trombone.js
new file mode 100644
index 000..48f5b81
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.js
@@ -0,0 +1,14 @@
+define( [
+ 'knockout',
+ 'text!components/widgets/cat-trombone/cat-trombone.html',
+ 'WidgetBase'
+], function( ko, template, WidgetBase ){
+
+ function CatTromboneViewModel( params ){
+
+ var self = this;
+ WidgetBase.call( this, params );
+
+ }
+ return { viewModel: CatTromboneViewModel, template: template };
+});
diff --git a/src/images/catmusician.gif b/src/images/catmusician.gif
new file mode 100644
index 000..012e511
--- /dev/null
+++
[MediaWiki-commits] [Gerrit] Render settings arc on either button - change (wikimedia...dash)
Ssmith has submitted this change and it was merged. Change subject: Render settings arc on either button .. Render settings arc on either button Quick-n-dirty fix Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 --- M src/components/widgets/fraud-gauge/fraud-gauge.html 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ssmith: Looks good to me, approved diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html b/src/components/widgets/fraud-gauge/fraud-gauge.html index 00cf2c2..125e18c 100644 --- a/src/components/widgets/fraud-gauge/fraud-gauge.html +++ b/src/components/widgets/fraud-gauge/fraud-gauge.html @@ -26,7 +26,7 @@ div class=col-md-12 div class=setupAsk h3This widget hasn't been set up yet./h3 -button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it up/button +button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModal data-bind=click: renderPercentRangeChartSet it up/button /div /div /div -- To view, visit https://gerrit.wikimedia.org/r/199533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 'Not set up' on new widget - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix 'Not set up' on new widget
..
Fix 'Not set up' on new widget
New fraud gauges weren't showing the chart till you saved and
reloaded
Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 425bcc1..04482a7 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -257,6 +257,7 @@
});
} else{
+ self.configSet( true );
//gauge time period
self.queryRequest.timespan =
self.selectedTimePeriod();
--
To view, visit https://gerrit.wikimedia.org/r/199531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add gulp task to copy images - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Add gulp task to copy images
..
Add gulp task to copy images
Change-Id: I1750bd1043382d77e1612f3e864ed2de757073dc
---
M gulpfile.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/gulpfile.js b/gulpfile.js
index df61593..3f3e910 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -160,7 +160,12 @@
.pipe(clean());
});
-gulp.task('default', ['clean', 'replace', 'lint', 'font', 'fonts'], function
(callback) {
+gulp.task('images', function() {
+return gulp.src('./src/images/**/*')
+ .pipe(gulp.dest('./dist/images/'));
+});
+
+gulp.task('default', ['clean', 'replace', 'lint', 'font', 'fonts', 'images'],
function (callback) {
callback();
console.log('\nPlaced optimized files in ' + chalk.magenta('dist/\n'));
console.log('\nPlaced font files in ' + chalk.magenta('font/\n'));
--
To view, visit https://gerrit.wikimedia.org/r/198800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1750bd1043382d77e1612f3e864ed2de757073dc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix default board id on first login - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix default board id on first login
..
Fix default board id on first login
Change-Id: Iee0c31ef05378c33d4343298e41cc635cc0d9309
---
M persistence.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
jenkins-bot: Verified
diff --git a/persistence.js b/persistence.js
index dd1c098..fda60f5 100644
--- a/persistence.js
+++ b/persistence.js
@@ -67,7 +67,7 @@
}
// If user doesn't have a default board, insert
one now
return connection.query( insertBoard, [
'Default dashboard for ' + user.displayName, userId, userId ] ).then( function(
dbResults ) {
- user.defaultBoard = dbResults[0].id;
+ user.defaultBoard =
dbResults[0][2][0].id;
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/198422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee0c31ef05378c33d4343298e41cc635cc0d9309
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix setConfig value in fraud widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198434
Change subject: Fix setConfig value in fraud widget
..
Fix setConfig value in fraud widget
Change-Id: I121cf66f44b5f9e50d027ba66e881c83477627b3
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/34/198434/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 673fbcd..b3fc217 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -52,7 +52,7 @@
self.queryStringSQL = ko.observable('This widget
hasn\'t been set up yet!');
self.greenHighRange = ko.observable(17);
self.redLowRange= ko.observable(68);
- self.configSet =
ko.observable(self.config);
+ self.configSet =
ko.observable(Object.keys(self.config).length 0);
self.populateChoices = function(){
return $.get( 'metadata/fraud-gauge', function(reqData){
--
To view, visit https://gerrit.wikimedia.org/r/198434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I121cf66f44b5f9e50d027ba66e881c83477627b3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove widgets from boards - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198255
Change subject: Remove widgets from boards
..
Remove widgets from boards
WIP need to add to the others tomorrow
Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca
---
M src/bower_modules
M src/components/app-content/app-content.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
4 files changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/55/198255/1
diff --git a/src/bower_modules b/src/bower_modules
index 1323394..2a4a5f0 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f
+Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 2624c2c..95e3998 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -72,6 +72,16 @@
};
+self.removeWidgetFromBoard = function( event, data ){
+$.ajax({
+method: 'DELETE',
+url: '/board/' + self.userdata().defaultBoard + '/widgets/' +
event.instanceID,
+success: function(stuff) {
+alert( JSON.stringify( stuff ) );
+}
+})
+};
+
self.setDisplayPage = function( e, data ){
var pages = [ 'Library', 'Profile', 'Home' ], view =
data.target.id;
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 a65b3df..2af5887 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -15,6 +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=#removeModali class=fa
fa-times/i/button
/div
/div
@@ -159,3 +160,17 @@
/div!-- /.modal-content --
/div
/div
+
+div class=modal fade id=removeModal
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove 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/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 01eaeac..3487941 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -13,6 +13,7 @@
WidgetBase.call( this, params );
var self = this,
wasSaved = self.chartSaved(); //populateChoices() may
overwrite
+ console.log('params: ', params);
self.showSlice= ko.observable();
self.bySlice = ko.observable();
--
To view, visit https://gerrit.wikimedia.org/r/198255
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix widget loader tracking on board switch - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix widget loader tracking on board switch
..
Fix widget loader tracking on board switch
Regenerate list of tracking observables whenever displayedBoard
changes. TODO: turn displayedBoard.widgets into an observable array
and track changes that way.
Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d
---
M src/components/boards/generic-board/generic-board.js
1 file changed, 23 insertions(+), 10 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/boards/generic-board/generic-board.js
b/src/components/boards/generic-board/generic-board.js
index 5d28730..282a82d 100644
--- a/src/components/boards/generic-board/generic-board.js
+++ b/src/components/boards/generic-board/generic-board.js
@@ -14,25 +14,38 @@
self.sharedContext = {};
self.displayedBoard = params.displayedBoard;
-self.widgetLoads = [];
-$.each( self.displayedBoard().widgets, function( i, widget ) {
-widget.dataLoading = ko.observable( false );
-self.widgetLoads.push( widget.dataLoading );
-} );
+self.widgetLoads = ko.observableArray([]);
+ function setWidgetLoads() {
+ self.widgetLoads.removeAll();
+ $.each( self.displayedBoard().widgets, function( i,
widget ) {
+ widget.dataLoading = ko.observable( false );
+ self.widgetLoads.push( widget.dataLoading );
+ } );
+ }
+ setWidgetLoads();
+ self.displayedBoard.subscribe( setWidgetLoads );
//This will return true if any child widget is loading
self.dataLoading = ko.computed( function() {
-var i, widgetCount = self.widgetLoads.length;
+var i,
+ loads = self.widgetLoads(),
+ widgetCount = loads.length;
+
for ( i = 0; i widgetCount; i++ ) {
-if ( self.widgetLoads[i]() === true ) {
-$('#loadingModal').modal('show'); //todo: knockout-style!
+if ( loads[i]() === true ) {
return true;
}
}
-$('#loadingModal').modal('hide'); //todo: knockout-style!
return false;
-} );
+} ).extend( { throttle: 10 } ); // don't flip too often
+self.dataLoading.subscribe( function( value ) {
+if ( value ) {
+$('#loadingModal').modal('show'); //todo: knockout-style!
+} else {
+$('#loadingModal').modal('hide'); //todo: knockout-style!
+}
+} );
// Get the date
self.displayDate = ko.observable( moment().format( timeFormat ) );
--
To view, visit https://gerrit.wikimedia.org/r/198265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove buttons for all widgets - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198402
Change subject: Remove buttons for all widgets
..
Remove buttons for all widgets
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
5 files changed, 66 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/02/198402/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index db61aed..232b210 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -79,8 +79,8 @@
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..30f4dc7 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-target=#removeModali
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 id=removeModal
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove 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..a5728fa 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-target=#removeModali
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 id=removeModal
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove this widget from the board?/h2
+ /div
+ div
[MediaWiki-commits] [Gerrit] Format smaller amounts of needed money more nicely - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Format smaller amounts of needed money more nicely
..
Format smaller amounts of needed money more nicely
No longer fractions of a million
Change-Id: Ied15165877b1d5e420e44eeccc6d5043ba5685b9
---
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
index 0f7df22..6e71c06 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
@@ -2,8 +2,9 @@
'knockout',
'text!components/widgets/distance-to-goal-chart/distance-to-goal-chart.html',
'c3',
+ 'numeraljs',
'WidgetBase'
-], function( ko, template, c3, WidgetBase ){
+], function( ko, template, c3, numeral, WidgetBase ){
function DistanceToGoalChartViewModel( params ){
@@ -62,7 +63,7 @@
position: 'outer-middle'
},
tick: {
- format: function(x){
return '$' + x/100 + 'm'; }
+ format: function(x){
return numeral(x).format( '$0.[00]a' ); }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/198147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied15165877b1d5e420e44eeccc6d5043ba5685b9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix board links when on library page - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix board links when on library page
..
Fix board links when on library page
Change-Id: Ice0cfdd3951eaa9e65c0f6c5948a21414df46f25
---
M src/components/app-content/app-content.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 24ecfa0..b96d969 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -96,6 +96,7 @@
self.displayPage($.trim($(data.target).text()));
} else {
$.get( 'board/' + view, function( bdata ){
+ self.displayPage('Home');
self.displayedBoard( bdata );
});
}
--
To view, visit https://gerrit.wikimedia.org/r/197852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice0cfdd3951eaa9e65c0f6c5948a21414df46f25
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add RESTful add/delete widget routes - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Add RESTful add/delete widget routes
..
Add RESTful add/delete widget routes
No longer need to gather and re-send all board data just to add
or delete a widget instance.
To add, POST { instanceId: 23 } to /board/5/widgets
To delete, DELETE /board/5/widgets/23
Change-Id: I729cc92d3b33af874f75bcabfd3ec0374f97eb05
---
M persistence.js
M routes/board.js
M server.js
M src/components/app-content/app-content.js
4 files changed, 55 insertions(+), 39 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/persistence.js b/persistence.js
index be17205..dd1c098 100644
--- a/persistence.js
+++ b/persistence.js
@@ -169,12 +169,22 @@
saveBoard: function( board ) {
var connection = getConnection(),
insert = 'INSERT INTO dash_board ( owner_id,
display_name, description, is_shared ) VALUES ( ?, ?, ?, ? )',
+ addWidget = 'INSERT INTO dash_widget_instance_board (
instance_id, board_id, widget_position ) SELECT ?, b.id, COALESCE( MAX(
widget_position ), 0 ) + 1 FROM dash_board b LEFT JOIN
dash_widget_instance_board i ON b.id = i.board_id WHERE b.id = ? AND b.owner_id
= ?',
+ addWidgetParams = [ board.addWidget, board.id,
board.ownerId ],
+ deleteWidget = 'DELETE FROM dash_widget_instance_board
WHERE instance_id = ? AND board_id = ? AND EXISTS( SELECT 1 FROM dash_board
WHERE id = ? AND owner_id = ? )',
+ deleteWidgetParams = [ board.deleteWidget, board.id,
board.id, board.ownerId ],
insertParams = [ board.ownerId, board.displayName,
board.description, board.isShared ? 1 : 0 ],
update = 'UPDATE dash_board set display_name = ?,
description = ?, is_shared = ? WHERE id = ? AND owner_id = ?',
updateParams = [ board.displayName, board.description,
board.isShared ? 1 : 0, board.id, board.ownerId ],
deleteWidgets = 'DELETE FROM dash_widget_instance_board
WHERE board_id = ?';
if ( board.id ) {
+ if ( board.addWidget ) {
+ return connection.query( addWidget,
addWidgetParams );
+ }
+ if ( board.deleteWidget ) {
+ return connection.query( deleteWidget,
deleteWidgetParams );
+ }
return connection.query( update, updateParams ).then(
function( dbResults ) {
if ( dbResults[0].affectedRows !== 1 ) {
// Either the board doesn't exist or
it's not ours
diff --git a/routes/board.js b/routes/board.js
index 17030bd..d8e3727 100644
--- a/routes/board.js
+++ b/routes/board.js
@@ -24,5 +24,25 @@
}, function( error ) {
res.json( { error: error } );
});
+ },
+ addWidget: function( req, res ) {
+ var board = {
+ ownerId: req.session.passport.user.localId,
+ id: req.params.id,
+ addWidget: req.body.instanceId
+ };
+ persistence.saveBoard( board ).then( function() {
+ res.json( { success: true, id: board.id } );
+ } );
+ },
+ deleteWidget: function( req, res ) {
+ var board = {
+ ownerId: req.session.passport.user.localId,
+ id: req.params.id,
+ deleteWidget: req.params.instanceId
+ };
+ persistence.saveBoard( board ).then( function() {
+ res.json( { success: true, id: board.id } );
+ } );
}
};
diff --git a/server.js b/server.js
index fbea8a9..e1e48b8 100644
--- a/server.js
+++ b/server.js
@@ -91,8 +91,9 @@
app.post( '/board', loginCheck, routes.board.save );
app.put( '/board/:id', loginCheck, routes.board.save );
app.get( '/board/:id', loginCheck, routes.board.get );
-
+app.post( '/board/:id/widgets', loginCheck, routes.board.addWidget );
/*jslint -W024*/
+app.delete( '/board/:id/widgets/:instanceId', loginCheck,
routes.board.deleteWidget );
app.use( express.static( __dirname + ( config.debug ? '/src' : '/dist' ) ) );
/*jslint +W024*/
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 24ecfa0..2c52b32 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -38,52 +38,37 @@
});
self.addWidgetToBoard = function( event, data ){
-var widgetIDToAdd;
-
-$.ajax({
+$.ajax( {
method: 'POST',
url: '/widget-instance',
[MediaWiki-commits] [Gerrit] Reduce session-enforcement copypasta - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Reduce session-enforcement copypasta
..
Reduce session-enforcement copypasta
Use a middleware function instead of copy-pasting the login check
everywhere.
Change-Id: I789e0570fc74d97eecc2c2d170e2593fa5833664
---
M routes/board.js
M routes/data.js
M routes/user.js
M routes/widget.js
M server.js
5 files changed, 22 insertions(+), 49 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/routes/board.js b/routes/board.js
index 835cd15..17030bd 100644
--- a/routes/board.js
+++ b/routes/board.js
@@ -2,10 +2,6 @@
module.exports = {
save: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
var board = {
ownerId: req.session.passport.user.localId,
displayName: req.body.displayName,
@@ -23,10 +19,6 @@
});
},
get: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
persistence.getBoard( req.params.id,
req.session.passport.user.localId ).then( function( board ) {
res.json( board );
}, function( error ) {
diff --git a/routes/data.js b/routes/data.js
index 7dcee8e..6766dc5 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -250,11 +250,6 @@
result,
cacheKey;
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
if ( !widget ) {
res.json( { error: 'Error: ' + req.params.widget + ' is not a
valid widget' } );
return;
diff --git a/routes/user.js b/routes/user.js
index 4917755..51c2430 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -2,11 +2,6 @@
module.exports = {
info: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( false );
- return;
- }
-
var user = req.session.passport.user;
res.json( {
@@ -19,11 +14,6 @@
} );
},
boards: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
persistence.listBoards( req.session.passport.user.localId
).then( function( boards ) {
res.json( boards );
}, function( error ) {
@@ -31,11 +21,6 @@
});
},
widgetInstances: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
-
persistence.listWidgetInstances(
req.session.passport.user.localId ).then( function( instances ) {
res.json( instances );
}, function( error ) {
diff --git a/routes/widget.js b/routes/widget.js
index 48c5985..a999acb 100644
--- a/routes/widget.js
+++ b/routes/widget.js
@@ -7,10 +7,6 @@
});
},
saveInstance: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
var instance = {
widgetId: req.body.widgetId,
ownerId: req.session.passport.user.localId,
@@ -29,10 +25,6 @@
});
},
getInstance: function( req, res ) {
- if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
- res.json( { error: 'Error: Not logged in' } );
- return;
- }
persistence.getWidgetInstance( req.params.id,
req.session.passport.user.localId ).then( function( instance ) {
res.json( instance );
}, function( error ) {
diff --git a/server.js b/server.js
index 13663ce..fbea8a9 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,8 @@
config = require( './config.js' ),
persistence = require( './persistence.js' ),
server,
- serverConfig;
+
[MediaWiki-commits] [Gerrit] Use board-level loading modal for all widgets - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Use board-level loading modal for all widgets
..
Use board-level loading modal for all widgets
TODO: Still using the bootstrappy functions like was in the x-by-y
widget instead of doing it more knockouty.
Change-Id: I7f942aa9399fe61994fb5c1c3b743aca1b839ea8
---
M src/app/widgetBase.js
M src/components/boards/generic-board/generic-board.html
M src/components/boards/generic-board/generic-board.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
5 files changed, 32 insertions(+), 27 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index fd19cc8..4a395d0 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -21,7 +21,7 @@
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
self.preDataLoading = ko.observable(true);
- self.dataLoading=
ko.observable(!!params.configuration);
+ self.dataLoading= params.dataLoading;
self.chartSaved =
ko.observable(!!params.configuration);
self.optionStateChanged = ko.observable(false);
self.chartWidth = ko.observable('900');
@@ -34,6 +34,7 @@
return $.ajax({
url: '/data/' + self.widgetCode + '?' + ( qs
).replace( /\+/g, '%20' ),
success: function ( dataget ) {
+ self.dataLoading(false);
self.retrievedResults( dataget.results
);
self.queryStringSQL( dataget.sqlQuery );
}
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 9dd8d2f..5484460 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -12,15 +12,20 @@
/div
/div
-span data-bind=if: dataLoading
-div class=loading
-img src=/images/catloader.gif /
-divLoading Dashspan class=ellipsis data-bind=text:
ellipsis/span/div
-/div
-/span
-
div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, sharedContext:
$parent.sharedContext } }span data-bind=text: display_name/span/div
+div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, dataLoading: dataLoading,
sharedContext: $parent.sharedContext } }span data-bind=text:
display_name/span/div
/div
+/div
+
+div class=modal fade id=loadingModal
+ div class=modal-dialog
+ div class=modal-content
+ h3 class=modal-bodyChart Loading/h3
+ div class=progress
+ div class=progress-bar progress-bar-success
progress-bar-striped active role=progressbar aria-valuenow=100
aria-valuemin=0 aria-valuemax=100 style=width: 100%
+ /div
+ /div
+ /div!-- /.modal-content --
+ /div
/div
\ No newline at end of file
diff --git a/src/components/boards/generic-board/generic-board.js
b/src/components/boards/generic-board/generic-board.js
index fb3fa04..5d28730 100644
--- a/src/components/boards/generic-board/generic-board.js
+++ b/src/components/boards/generic-board/generic-board.js
@@ -14,9 +14,24 @@
self.sharedContext = {};
self.displayedBoard = params.displayedBoard;
+self.widgetLoads = [];
+$.each( self.displayedBoard().widgets, function( i, widget ) {
+widget.dataLoading = ko.observable( false );
+self.widgetLoads.push( widget.dataLoading );
+} );
-//make this false until data loading has been written
-self.dataLoading = ko.observable(false);
+//This will return true if any child widget is loading
+self.dataLoading = ko.computed( function() {
+var i, widgetCount = self.widgetLoads.length;
+for ( i = 0; i widgetCount; i++ ) {
+if ( self.widgetLoads[i]() === true ) {
+$('#loadingModal').modal('show'); //todo: knockout-style!
+return true;
+}
+}
+$('#loadingModal').modal('hide'); //todo: knockout-style!
+return false;
+} );
[MediaWiki-commits] [Gerrit] Use shared context in amount per second - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Use shared context in amount per second
..
Use shared context in amount per second
Also change y ticks to include cents, for use in smaller campaigns.
Bug: T89298
Change-Id: I867b741cddaaaec16bf7d4a25bac6e29a6a9be4b
---
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
2 files changed, 31 insertions(+), 61 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
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 71185d3..56091db 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,9 +1,10 @@
div class=col-md-6 lastWidget
div class=panel panel-purple
div class=panel-heading
- pUSD/Second Required (Average)/p
+ p data-bind=text:title/p
/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
div class=col-md-12
div id=avgUSDperSecond/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index e48d9db..a4711e8 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -3,81 +3,41 @@
'text!components/widgets/amt-per-second-chart/amt-per-second-chart.html',
'c3',
'numeraljs',
- 'momentjs'
-], function( ko, template, c3, numeral, moment ){
-
+ 'WidgetBase'
+], function( ko, template, c3, numeral, WidgetBase ){
function AmtPerSecondChartViewModel( params ){
var self = this;
-
- //TODO: make dayObj (and other params) come from data
- self.dayObj = [];
-
- self.loadData = function ( decemberData, timestamp ) {
- var runningTotal = 0,
- currentDate = new Date(),
- timeFormat = ', Do , h:mm:ss a';
-
- currentDate.setTime( timestamp );
- self.displayDate( moment( currentDate ).format(
timeFormat ) );
- self.lastDataPoint.day = currentDate.getUTCDate();
- self.lastDataPoint.hour = currentDate.getUTCHours();
-
- for (var d = 1; d 32; d++) {
- self.dailyDataArray[d] = 0;
- self.dailyCountArray[d] = 0;
- if (!self.dayObj[d]) {
- self.dayObj[d] = new Array(25);
- self.dayObj[d][0] = 'Hourly Totals';
- for (var h = 0; h 24; h++) {
- self.dayObj[d][h + 1] = {
total: 0, count: 0 };
-
self.secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
- }
- }
- }
-
- var dataCount = decemberData.length;
- for (var i = 0; i dataCount; i++ ) {
-
- var el = decemberData[i],
- day = el.day,
- hour = el.hour,
- total = el.usd_total;
- self.dayObj[day][hour + 1] = { total: total,
count: el.donations };
-
- self.secondsByHourDonationData[(day - 1) * 24 +
hour + 1] = el.usd_per_second;
- runningTotal += total;
- self.dailyDataArray[day] += total;
- self.dailyCountArray[day] += el.donations;
- }
-
- self.raised(runningTotal);
- };
+ WidgetBase.call( this, params );
+ self.hasData = ko.observable( false );
self.makeChart = function() {
- if ( self.dayObj.length 2 ) {
+ var columns;
+
+ if ( params.sharedContext.dayObj.length 2 ) {
return;
}
- var numPoints = ( self.lastDataPoint.day - 1 ) * 24 +
[MediaWiki-commits] [Gerrit] WIP add remove button to widgets - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197360
Change subject: WIP add remove button to widgets
..
WIP add remove button to widgets
Remove a widget from its board.
First use is in x by y chart.
Change-Id: If0bce28fcfde837a321b2601d9627f8d4a3cab2f
---
M src/app/widgetBase.js
M src/components/app-content/app-content.js
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/x-by-y/x-by-y.html
4 files changed, 50 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/60/197360/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index ba71d70..a01e742 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -163,6 +163,38 @@
return query;
};
+self.removeWidgetFromBoard = function( data, event ){
+ console.log('remove widget # ', self.instanceID);
+ console.log('from parent board ID # ', params.parentBoard);
+
+var gettingBoard, defaultBoardConfig;
+
+gettingBoard = $.ajax({
+url: '/board/' + params.parentBoard,
+success: function( stuff ) {
+defaultBoardConfig = stuff;
+}
+});
+
+$.when( gettingBoard ).then( function( returnedData ){
+defaultBoardConfig = returnedData;
+console.log(defaultBoardConfig);
+
+var index =
defaultBoardConfig.widgets.indexOf(self.instanceID);
+ defaultBoardConfig.widgets.splice(index, 1);
+
+$.ajax({
+method: 'PUT',
+url: '/board/' + params.parentBoard,
+contentType: 'application/json; charset=UTF-8',
+data: JSON.stringify( defaultBoardConfig ),
+success: function( stuff ) {
+console.log('here is the new stuff: ', stuff);
+}
+});
+});
+};
+
self.logStateChange = function(n){
self.optionStateChanged(n);
self.chartSaved(false);
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index c24ee35..c5d52c5 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -81,11 +81,8 @@
}
});
});
-
-
}
});
-
};
self.setDisplayPage = function( e, data ){
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 7797fae..da49f1c 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -20,7 +20,7 @@
/span
div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode } }span data-bind=text:
display_name/span/div
+div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, parentBoard:
$parent.displayedBoard().id } }span data-bind=text:
display_name/span/div
/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 27185a9..5f60d1f 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -9,6 +9,9 @@
div class=panel panel-purple
div class=panel-heading
+ div class=btn-group btn-group-xs pull-left
+ button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#removeModali class=fa
fa-times/i/button
+ /div
div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#XYsqlModali class=fa
fa-database/i/button
!-- button type=button id=savedCharts
class=btn btn-default dropdown-toggle data-toggle=dropdown
data-target=#XYsavedCharti class=fa fa-area-chart/i Saved
charts.../button
@@ -170,4 +173,18 @@
/div
/div!-- /.modal-content --
/div
+/div
+
+div class=modal fade id=removeModal
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+
[MediaWiki-commits] [Gerrit] Fraud gauge widget refactor - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196614
Change subject: Fraud gauge widget refactor
..
Fraud gauge widget refactor
Change-Id: I97821c63e25ab10bc08ea3cb5ea5de0204eb0db0
---
M src/app/widgetBase.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
4 files changed, 269 insertions(+), 273 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/14/196614/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index ba71d70..30a52c1 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -26,6 +26,7 @@
self.chartWidth = ko.observable('900');
self.chartHeight= ko.observable('550');
self.chartLoaded= ko.observable(false);
+ self.chartModified = ko.observable(false);
self.getChartData = function( qs ){
self.dataLoading(true);
@@ -50,6 +51,7 @@
}),
success: function( data ) {
self.chartSaved(true);
+ self.chartModified(false);
}
});
} else {
@@ -64,6 +66,7 @@
success: function( data ) {
self.instanceID = data.id;
self.chartSaved(true);
+ self.chartModified(false);
}
});
}
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index e3b9fed..633a953 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,11 +1,13 @@
div class=row
-div data-bind=attr: {class: columnSize}
+div class=col-md-6
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
span data-bind='text: title'/span
div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default dropdown-toggle
data-toggle=modal data-target=#sqlModali class=fa
fa-database/i/button
button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModali class=fa
fa-edit/i/button
+button type=button class=btn btn-danger
data-bind=visible: chartModified, click: saveWidgetConfigi class=fa
fa-save/i/button
+button type=button class=btn btn-success
data-bind=visible: chartSaved !chartModified()i class=fa fa-save/i
Saved/button
/div
/div
div class=panel-body
@@ -14,14 +16,14 @@
div class=gauge
div class=row
-h3 class=text-center data-bind=visible:
gaugeIsSetUp(), text: selectedTimePeriod/h3
+h3 class=text-center data-bind=visible:
chartSaved, text: selectedTimePeriod/h3
/div
-div class=row id=specifiedFraudGauge
data-bind=visible: gaugeIsSetUp
+div class=row id=specifiedFraudGauge
data-bind=visible: chartSaved
div id=FraudRiskScoreGauge/div
/div
-div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
+div class=row id=unspecifiedFraudGauge
data-bind=visible: !chartSaved()
div class=col-md-12
div class=setupAsk
h3This widget hasn't been set up yet./h3
@@ -30,7 +32,7 @@
/div
/div
-div class=row id=fraudGaugeMeta data-bind=visible:
gaugeIsSetUp()
+div class=row id=fraudGaugeMeta data-bind=visible:
chartSaved
p class=text-centerspan data-bind=visible:
filtersSelected()By: /spanspan class=label label-info data-bind=text:
selectedFilters/span/p
/div
@@ -46,14 +48,14 @@
form role=form class=fraudForm
div class=form-group
div class=well
-label
for=fraudPercentSliderFraud Percent Ranges/label
+label
for=fraudPercentRangesFraud Percent Ranges/label
[MediaWiki-commits] [Gerrit] Fetch/use user default board for lib widget adds - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196664
Change subject: Fetch/use user default board for lib widget adds
..
Fetch/use user default board for lib widget adds
Change-Id: Id4242ee05d6edaa73cfe0d9f3cbea0c2f0797ef5
---
M src/components/app-content/app-content.js
1 file changed, 46 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/64/196664/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index a6e51c1..7b950cb 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -2,37 +2,34 @@
[ 'jquery',
'knockout',
'text!./app-content.html'
-], function( $, ko, templateMarkup) {
+], function( $, ko, templateMarkup ) {
-function AppContent(params) {
+function AppContent( params ) {
var self = this;
-self.url = params.url || 'hi';
-self.displayedBoard = ko.observable();
-self.userBoards = ko.observableArray();
-self.userdata = ko.observableArray();
-self.displayPage = ko.observable('Home');
-self.loggedIn = ko.observable(false);
-self.welcome = ko.observable('');
-self.widgetTemplates = ko.observableArray();
-self.widgetInstances = ko.observableArray();
+self.url= params.url || 'hi';
+self.displayedBoard = ko.observable();
+self.userBoards = ko.observableArray();
+self.userdata = ko.observableArray();
+self.displayPage= ko.observable('Home');
+self.loggedIn = ko.observable(false);
+self.welcome= ko.observable('');
+self.widgetTemplates= ko.observableArray();
+self.widgetInstances= ko.observableArray();
-
-
-//Get user info and configs like default board
-$.get('/user/info', function(userInfo) {
-if (userInfo) {
+$.get( '/user/info', function( userInfo ) {
+if ( userInfo ) {
self.userdata( userInfo );
self.welcome( userInfo.name.charAt(0).toUpperCase() +
userInfo.name.slice(1) );
self.loggedIn( true );
-$.get('board/' + self.userdata().defaultBoard, function(
moredata ){
+$.get( 'board/' + self.userdata().defaultBoard, function(
moredata ){
self.displayedBoard( moredata );
});
-$.get('board/', function (boards){
-$.each(boards, function(i, board){
-if(board.ownerId === self.userdata().id){
+$.get( 'board/', function ( boards ){
+$.each( boards, function( i, board ){
+if( board.ownerId === self.userdata().id ){
self.userBoards.push(board);
}
});
@@ -42,10 +39,7 @@
self.addWidgetToBoard = function( event, data ){
var widgetIDToAdd;
-console.log('event: ', event);
-console.log('data', data.target.id);
-//create an instance of the widget
$.ajax({
method: 'POST',
url: '/widget-instance',
@@ -57,18 +51,35 @@
isShared: false
}),
success: function( data ) {
-widgetIDToAdd = data.id;
-self.displayedBoard().widgets.push(data.id);
+widgetIDToAdd = data.id; var gettingBoard,
defaultBoardConfig;
+
+if( self.userdata().defaultBoard !==
parseInt(self.displayedBoard().id) ){
+var gettingBoard = $.ajax({
+url: '/board/' + self.userdata().defaultBoard,
+success: function( stuff ) {
+defaultBoardConfig = stuff;
+}
+});
+} else {
+defaultBoardConfig = self.displayedBoard();
+};
+
+if( gettingBoard ){
+$.when( gettingBoard ).then( function( returnedData ){
+defaultBoardConfig = returnedData;
+defaultBoardConfig.widgets.push(data.id);
+});
+};
$.ajax({
method: 'PUT',
url: '/board/' + self.userdata().defaultBoard,
contentType: 'application/json; charset=UTF-8',
-data: JSON.stringify(self.displayedBoard()),
-success: function(stuff) {
+
[MediaWiki-commits] [Gerrit] Add widget instances to user default board - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196403
Change subject: Add widget instances to user default board
..
Add widget instances to user default board
This could be better.. there should be a better flow for adding multiple
instances, for example.
Change-Id: I6739adc15eefe41b6c51c0ce367da3f4b1df4101
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
4 files changed, 55 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/03/196403/1
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index fd086ea..c3ac744 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -29,7 +29,9 @@
li
img data-bind=attr: {src:
previewPath}
h3 data-bind=text: displayName/h3
- p data-bind=text: description/p
+ p class=widgetDesc data-bind=text:
description/p
+ button class=btn btn-block btn-col
btn-primary addToBoardBtn data-bind=attr: { id: 'add-widget-'+id }, click:
$parent.addWidgetToBoardAdd to my default board/button
+ button class=hide btn btn-block
btn-col btn-success addToBoardBtn data-bind=attr: { id: 'saved-widget-'+id },
click: $parent.addWidgetToBoardi class=fa fa-check-circle-o/i
Added./button
/li
/ul
/div
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 49b3c65..a6e51c1 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -17,6 +17,8 @@
self.widgetTemplates = ko.observableArray();
self.widgetInstances = ko.observableArray();
+
+
//Get user info and configs like default board
$.get('/user/info', function(userInfo) {
if (userInfo) {
@@ -38,6 +40,42 @@
}
});
+self.addWidgetToBoard = function( event, data ){
+var widgetIDToAdd;
+console.log('event: ', event);
+console.log('data', data.target.id);
+
+//create an instance of the widget
+$.ajax({
+method: 'POST',
+url: '/widget-instance',
+contentType: 'application/json; charset=UTF-8',
+data: JSON.stringify({
+widgetId: event.id,
+displayName: 'My ' + event.displayName,
+configuration: {},
+isShared: false
+}),
+success: function( data ) {
+widgetIDToAdd = data.id;
+self.displayedBoard().widgets.push(data.id);
+
+$.ajax({
+method: 'PUT',
+url: '/board/' + self.userdata().defaultBoard,
+contentType: 'application/json; charset=UTF-8',
+data: JSON.stringify(self.displayedBoard()),
+success: function(stuff) {
+//change the look of the add widget button
+$('#add-widget-'+event.id).hide();
+$('#saved-widget-'+event.id).removeClass('hide');
+}
+});
+}
+});
+
+};
+
self.setDisplayPage = function(e, data){
var pages = ['Library', 'Profile', 'Home'], view = data.target.id;
if( pages.indexOf(data.target.id) -1 ){
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 8fca0bd..3baecae 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -33,7 +33,7 @@
var self = this;
self.filters = ko.observableArray();
self.title = ko.observable(params.title);
-console.log('fraud widget params: ', params);
+
self.columnSize = 'col-md-' + params.configuration.width + ' fraudGauge';
$.get( 'metadata/fraud-gauge', function(reqData){
diff --git a/src/css/style.css b/src/css/style.css
index f0a0982..9561bb0 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -378,6 +378,14 @@
width: 100%;
}
+.addToBoardBtn {
+bottom: 0;
+}
+
+.widgetDesc {
+height: 70px;
+}
+
/* BOOTSTRAP OVERRIDES */
.btn {
@@ -598,12 +606,16 @@
background-color: rgba(49,176,213,0.6);
color: #f5f5f5;
width:
[MediaWiki-commits] [Gerrit] Fix board nav links - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix board nav links
..
Fix board nav links
Change-Id: I4b11ac67ded6d256661b8e1b1be740fee7ea1ba5
---
M src/components/app-content/app-content.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index dce8604..49b3c65 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -42,7 +42,7 @@
var pages = ['Library', 'Profile', 'Home'], view = data.target.id;
if( pages.indexOf(data.target.id) -1 ){
self.displayPage(view);
-} else if( typeof view !== 'number' ) {
+} else if( isNaN( parseInt( view, 10 ) ) ) {
self.displayPage($.trim($(data.target).text()));
} else {
$.get('board/' + view, function( bdata ){
--
To view, visit https://gerrit.wikimedia.org/r/195979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b11ac67ded6d256661b8e1b1be740fee7ea1ba5
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix time windowing and grouping - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix time windowing and grouping
..
Fix time windowing and grouping
If grouping by day, also group by month and add a filter to limit
to less than one month ago. Similarly for month/year.
Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
---
M src/app/widgetBase.js
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 3def589..3efc24f 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -140,7 +140,16 @@
self.convertToQuery = function( userChoices ){
- var timeBreakout = 'group=' + userChoices.timeBreakout;
+ var timeArray = ['Year', 'Month', 'Day', 'Hour'],
+ index = timeArray.indexOf(
userChoices.timeBreakout ),
+ query = 'group=' + userChoices.timeBreakout;
+
+ // If we're grouping by anything finer than year, add a
filter and
+ // also group by the next level up.
+ if ( index 0 ) {
+ query = query + 'group=' + timeArray[index -
1];
+ query = query + '$filter=' + timeArray[index -
1] + 'sAgo lt \'1\'';
+ }
//groupStr = timeBreakout + 'group=' +
userChoices.xSlice;
// if( userChoices.additionalFilters.length 0 ){
@@ -174,7 +183,7 @@
// } else {
// return groupStr;
// }
- return timeBreakout;
+ return query;
};
// Generate chart label arrays for time increment types
--
To view, visit https://gerrit.wikimedia.org/r/195807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set dropdown initial values to saved values - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Set dropdown initial values to saved values
..
Set dropdown initial values to saved values
And re-use submit function to get initial data
Change-Id: I64c74faed90923b8851695676745bca60faef85f
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 19 insertions(+), 24 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 2fdf2fd..3def589 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -33,7 +33,6 @@
};
self.saveWidgetConfig = function(){
-
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -207,7 +206,7 @@
self.chartSaved(false);
};
- return(this);
+ return this;
}
return( WidgetBase );
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 7a42f96..7a36515 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -11,22 +11,8 @@
function XByYChartViewModel( params ){
WidgetBase.call( this, params );
- var self = this;
-
- if ( self.chartSaved() ) {
- var chartDataCall =
self.getChartData(self.config.queryString);
-
- $.when( chartDataCall ).then( function( dataArray ){
- self.retrievedResults(dataArray.results);
- self.dataLoading(false);
- self.preDataLoading(false);
-
- self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
-
- self.makeChart(self.chartData);
- });
- }
-
+ var self = this,
+ wasSaved = self.chartSaved(); //populateChoices() may
overwrite
self.showSlice = ko.observable();
self.bySlice = ko.observable();
self.timeChoice = ko.observable();
@@ -297,9 +283,9 @@
self.groupChoices = ko.observableArray();
//populate user choices dynamically
- self.populateChoices = (function(){
+ self.populateChoices = function(){
//populate y slices
- $.get( 'metadata/x-by-y', function(reqData){
+ return $.get( 'metadata/x-by-y', function(reqData){
self.metadata = reqData;
var xArray = [], timeArray = ['Year', 'Month',
'Day'], groupArray = [];
@@ -324,10 +310,9 @@
self.xSlices(xArray);
self.timeChoices(timeArray);
self.groupChoices(groupArray);
-
});
- })();
+ };
self.submitXY = function(){
@@ -338,6 +323,7 @@
self.queryRequest.timeBreakout = self.timeChoice();
self.queryString =
self.convertToQuery(self.queryRequest);
+ self.config.showSlice= self.showSlice();
self.config.queryString = self.queryString;
self.config.timeBreakout =
self.queryRequest.timeBreakout;
self.config.chartData = self.chartData;
@@ -353,13 +339,23 @@
self.makeChart(self.chartData);
$('#loadingModal').modal('hide');
- self.chartSaved(false);
});
};
- return(this);
+ self.populateChoices().then(function() {
+ self.preDataLoading(false);
+ if ( wasSaved ) {
+ // restore choices and show the chart
+ self.showSlice( self.config.showSlice );
+ self.timeChoice( self.config.timeBreakout );
+ self.chartSaved( true );
+ self.submitXY();
+ }
+ });
+
+ return this;
}
--
To view, visit https://gerrit.wikimedia.org/r/195767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64c74faed90923b8851695676745bca60faef85f
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith
[MediaWiki-commits] [Gerrit] Fix time display, remove refresh and profile btns - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195996
Change subject: Fix time display, remove refresh and profile btns
..
Fix time display, remove refresh and profile btns
Change-Id: Ia0bbb34c0101647d5e17317453db763e94e93db8
---
M src/components/boards/generic-board/generic-board.html
M src/components/nav-bar/nav-bar.html
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
4 files changed, 32 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/96/195996/1
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index dcdcc9e..7797fae 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -6,9 +6,9 @@
p data-bind=text: displayDate/p
/div
div class=col-md-8 titleCol
-div class=btn-group btn-group-xs pull-right
+!-- div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default
data-bind=click: reloadBoardi class=fa fa-refresh
style=padding-right:5px/i Refresh/button
-/div
+/div --
/div
/div
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index b1fb42a..6e2a1c1 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -27,7 +27,7 @@
div class=hide subNavBoardOpts
subNavButton id=profileLinks
ul
lia
href=/logoutLog out/a/li
- li id=Profile
data-bind=click: $parent.setDisplayPageProfile/li
+ !-- li id=Profile
data-bind=click: $parent.setDisplayPageProfile/li --
/ul
/div
/span
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 3229239..210f9ec 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -97,7 +97,7 @@
div class=row-fluid data-bind=if:
chartLoaded
- h1 data-bind=text: title/h1
+ h2 data-bind=text: title/h2
h4 data-bind=visible:
chosenFilters 0Narrowed by:
span data-bind=foreach:
chosenFilters
span class='label
label-success' data-bind=text: $data/span
@@ -152,7 +152,7 @@
div class=modal-content
div class=modal-header
button type=button class=close data-dismiss=modalspan
aria-hidden=truetimes;/spanspan class=sr-onlyClose/span/button
-h4 class=modal-titleFraud Gauge SQL:/h4
+h4 class=modal-titleChart SQL:/h4
/div
div class=modal-body data-bind=text: queryStringSQL/div
/div!-- /.modal-content --
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 7a36515..cbbaea3 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -11,19 +11,21 @@
function XByYChartViewModel( params ){
WidgetBase.call( this, params );
- var self = this,
- wasSaved = self.chartSaved(); //populateChoices() may
overwrite
- self.showSlice = ko.observable();
- self.bySlice = ko.observable();
- self.timeChoice = ko.observable();
- self.queryRequest = {};
- self.queryString = '';
- self.chosenFilters = ko.observableArray();
- self.subChoices = ko.observableArray();
+ var self = this,
+ wasSaved = self.chartSaved(); //populateChoices() may
overwrite
+
+ self.showSlice= ko.observable();
+ self.bySlice = ko.observable();
+ self.timeChoice = ko.observable();
+self.displayedTimeChoice = ko.observable('');
+ self.queryRequest = {};
+ self.queryString = '';
+ self.chosenFilters= ko.observableArray();
+ self.subChoices = ko.observableArray();
self.chartWidth(950);
self.title = ko.computed(function(){
-
[MediaWiki-commits] [Gerrit] Lint all js except node_modules and bower_modules - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Lint all js except node_modules and bower_modules
..
Lint all js except node_modules and bower_modules
Yes, even the node bits that run server side. This should match
better the linting that Jenkins does.
Change-Id: Ia1968364862042c923de0964f7657d8cb34c85ca
---
M gulpfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/gulpfile.js b/gulpfile.js
index 317ec74..df61593 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -51,7 +51,7 @@
}
});
-var jsfilesToLint = ['src/app/*.js', 'src/components/*/*.js'];
+var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js'];
// linting
gulp.task('lint', function () {
--
To view, visit https://gerrit.wikimedia.org/r/194389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1968364862042c923de0964f7657d8cb34c85ca
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browser tests: add mobile tags - change (mediawiki...CentralNotice)
Ssmith has submitted this change and it was merged. Change subject: Browser tests: add mobile tags .. Browser tests: add mobile tags Bug: T86092 Change-Id: I39e17e67a051670ff0ec612cf487809da84f9c4a --- M tests/browser/features/banners.feature 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ssmith: Looks good to me, approved diff --git a/tests/browser/features/banners.feature b/tests/browser/features/banners.feature index 0cc..db7ad2e 100644 --- a/tests/browser/features/banners.feature +++ b/tests/browser/features/banners.feature @@ -1,4 +1,4 @@ -@chrome @firefox @safari @internet_explorer_10 @internet_explorer_11 @en.m.wikipedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org +@chrome @firefox @safari @internet_explorer_10 @internet_explorer_11 @android @iphone @ipad @en.m.wikipedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org Feature: Crude banner display Scenario: Banner three is displayed for low roll -- To view, visit https://gerrit.wikimedia.org/r/193552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39e17e67a051670ff0ec612cf487809da84f9c4a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Mwalker mwal...@khaosdev.com Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] final x by y chart commit - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194243
Change subject: final x by y chart commit
..
final x by y chart commit
Change-Id: I0271f7c14c31db8c3438cb0d0f35c2950cae095b
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
4 files changed, 36 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/43/194243/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index a0b81e6..416df09 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -63,6 +63,7 @@
switch(timescale){
case
'Year':
+ case
'Month':
var monthlyDataArray = ['Monthly Total'],
monthlyCountArray = ['Monthly Count'],
months
= rawdata.results;
@@ -78,8 +79,6 @@
monthlyCountArray: monthlyCountArray
};
return returnObj;
-
break;
- case
'Month':
break;
case
'Day':
case
'Hour':
@@ -100,10 +99,16 @@
for (var i = 0; i dataCount; i++ ) {
var el = rawdata.results[i],
-
day = el.day,
+
day = el.Day,
hour = el.hour,
total = el.usd_total;
-
dayObj[day][hour + 1] = { total: total, count: el.donations };
+
runningTotal = 0;
+
+
if(!hour){
+
dayObj[day+1] = { total: total, count: el.donations };
+
} else {
+
dayObj[day][hour + 1] = { total: total, count: el.donations };
+
}
secondsByHourDonationData[(day - 1) * 24 + hour + 1] =
el.usd_per_second;
runningTotal += total;
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 34eae72..2a4f89c 100644
--- a/src/components/widgets/x-by-y/x-by-y.html
+++ b/src/components/widgets/x-by-y/x-by-y.html
@@ -162,4 +162,16 @@
div class=modal-body data-bind=text: queryStringXYsql/div
/div!-- /.modal-content --
/div
+/div
+
+div class=modal fade id=loadingModal
+ div class=modal-dialog
+div class=modal-content
+h3 class=modal-bodyChart Loading/h3
+div class=progress
+ div class=progress-bar progress-bar-success
progress-bar-striped active role=progressbar aria-valuenow=100
aria-valuemin=0 aria-valuemax=100 style=width: 100%
+ /div
+ /div
+/div!-- /.modal-content --
+/div
/div
\ No newline at end of file
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
[MediaWiki-commits] [Gerrit] Chart now renders - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193535
Change subject: Chart now renders
..
Chart now renders
WIP still tweaking
Change-Id: I7057e5f089cc56e60ac7309a0a928d7e81f5f138
---
M src/app/widgetBase.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/x-by-y/x-by-y.html
M src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
6 files changed, 118 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/35/193535/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index c32842c..9f2071c 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -54,46 +54,61 @@
});
};
- self.processDailyData =
function(rawdata, timescale){
- //TODO:
determine if the data is daily, monthly, etc and process accordingly
- var
dailyDataArray = ['Daily Total'],
- dailyCountArray
= ['Daily Count'],
-
secondsByHourDonationData = ['Donations Per Second'],
- dayObj = {};
+ self.processData =
function(rawdata, timescale){
+
console.log('timescale: ', timescale);
- for
(var d = 1; d 32; d++) {
-
dailyDataArray[d] = 0;
-
dailyCountArray[d] = 0;
-
if (!dayObj[d]) {
-
dayObj[d] = new Array(25);
-
dayObj[d][0] = 'Hourly Totals';
-
for (var h = 0; h 24; h++) {
-
dayObj[d][h + 1] = { total: 0, count: 0 };
-
secondsByHourDonationData[(d - 1) * 24 + h + 1] = 0;
+
switch(timescale){
+ case
'Year':
+
console.log('this is a year');
+
break;
+ case
'Month':
+
console.log('this is a motnh');
+
break;
+ case
'Day':
+
//TODO: determine if the data is daily, monthly, etc and process accordingly
+
var dailyDataArray = ['Daily Total'],
+
dailyCountArray = ['Daily Count'],
+
secondsByHourDonationData = ['Donations Per Second'],
+ dayObj
= {};
+
+
for (var d = 1; d 32; d++) {
+
dailyDataArray[d] = 0;
+
dailyCountArray[d] = 0;
+
if (!dayObj[d]) {
+
dayObj[d] = new Array(25);
+
dayObj[d][0] = 'Hourly Totals';
+
[MediaWiki-commits] [Gerrit] WIP x-by-y data retrieval/parsing - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190343
Change subject: WIP x-by-y data retrieval/parsing
..
WIP x-by-y data retrieval/parsing
not ready for review yet.
Conflicts:
src/components/app-content/app-content.js
src/components/boards/generic-board/generic-board.html
src/components/boards/generic-board/generic-board.js
src/components/nav-bar/nav-bar.html
src/components/nav-bar/nav-bar.js
src/components/widgets/fraud-gauge/fraud-gauge.html
Change-Id: I8c685154bf3da6659996a5104dfd30115f9e30d1
---
M src/components/app-content/app-content.js
M src/components/boards/generic-board/generic-board.html
M src/components/boards/generic-board/generic-board.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
9 files changed, 6 insertions(+), 76 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/43/190343/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 4ff26fb..b7f1c8c 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -16,11 +16,6 @@
self.welcome = ko.observable('');
self.widgetTemplates = ko.observableArray();
self.widgetInstances = ko.observableArray();
- HEAD (bd101f Save configuration for fraud gauge.)
-
-
-===
- BRANCH (49cedf Library and Profile styles and flow)
//Get user info and configs like default board
$.get('/user/info', function(userInfo) {
@@ -33,7 +28,6 @@
self.displayedBoard( moredata );
});
- HEAD (bd101f Save configuration for fraud gauge.)
$.get('board/', function (boards){
var userBoards = [];
$.each(boards, function(i, board){
@@ -43,22 +37,6 @@
});
self.userBoards(userBoards);
-===
-var userBoards = [];
-$.get('board/', function (boards){
-$.each(boards, function(i, board){
-if(board.ownerId === self.userdata().id){
-//add to a board array to retrieve
-userBoards.push(board.id);
-}
-});
-}).done(function(){
-$.each(userBoards, function(el, i){
-$.get('board/' + i, function( bdata ){
-self.userBoards.push( bdata );
-});
-});
- BRANCH (49cedf Library and Profile styles and flow)
});
}
});
@@ -68,26 +46,11 @@
if( pages.indexOf(data.target.id) -1 ){
self.displayPage(view);
} else {
- HEAD (bd101f Save configuration for fraud gauge.)
-var bid = parseInt(view, 10);
-$.each(self.userBoards(), function(i, el){
-if(el.id === bid){
-self.displayedBoard(el);
-self.displayPage('Home');
-} else {
-return;
-}
-});
-
-self.displayPage.valueHasMutated();
-self.displayedBoard.valueHasMutated();
-===
$.get('board/' + view, function( bdata ){
console.log('get board #', data.target.id);
console.log('bdata: ', bdata);
self.displayedBoard( bdata );
});
- BRANCH (49cedf Library and Profile styles and flow)
}
};
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 2e91cd3..6f3e711 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -20,11 +20,7 @@
/span
div class=row data-bind=foreach: displayedBoard().widgets
- HEAD (bd101f Save configuration for fraud gauge.)
div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id } }span data-bind=text: display_name/span/div
-===
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration } }span
data-bind=text: display_name/span/div
- BRANCH (49cedf Library and Profile styles and flow)
/div
-/div
+/div
\ No newline at end of file
diff --git
[MediaWiki-commits] [Gerrit] Save configuration for fraud gauge. - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189840
Change subject: Save configuration for fraud gauge.
..
Save configuration for fraud gauge.
Change-Id: I11c1e0eecb74c5389f7fb672c04db3ac8936c054
WIP: this patch will cover saving for each widget.
---
M src/components/app-content/app-content.js
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
M src/css/style.css
7 files changed, 46 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/40/189840/1
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 8147df4..3c93c64 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -17,6 +17,8 @@
self.widgetTemplates = ko.observableArray();
self.widgetInstances = ko.observableArray();
+
+
//Get user info and configs like default board
$.get('/user/info', function(userInfo) {
if (userInfo) {
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 9408094..6f3e711 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -20,7 +20,7 @@
/span
div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration } }span
data-bind=text: display_name/span/div
+div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id } }span data-bind=text: display_name/span/div
/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 ee4c49a..e3b9fed 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,4 +1,5 @@
div class=row
+div data-bind=attr: {class: columnSize}
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
span data-bind='text: title'/span
@@ -10,7 +11,7 @@
div class=panel-body
div class=row
-div class=col-md-12 gauge
+div class=gauge
div class=row
h3 class=text-center data-bind=visible:
gaugeIsSetUp(), text: selectedTimePeriod/h3
@@ -126,6 +127,6 @@
/div
/div
-
+/div
/div
/div
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index c3b7824..6053409 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -34,6 +34,9 @@
self.filters = ko.observableArray();
self.title = ko.observable(params.title);
+self.config = params.configuration;
+self.columnSize = ko.observable('col-md-' + self.config.width +
fraudGauge);
+
$.get( 'metadata/fraud-gauge', function(reqData){
self.data = reqData;
//broken down data from above
@@ -258,13 +261,11 @@
var queryString = self.convertToQuery(self.queryRequest);
-//Todo: if this is already set up in configs, take that data.
-//otherwise do this.
-$.get( '/data/fraud?' + $.param({ '$filter': queryString }).replace(
+$.get( '/data/fraud-gauge?' + $.param({ '$filter': queryString
}).replace(
/\+/g, '%20' ), function ( dataget ) {
- self.gaugeIsSetUp(true);
-
self.gaugeValue(parseFloat(dataget.results[0].fraud_percent).toFixed(2) );
- self.queryStringSQL(dataget.sqlQuery);
+ self.gaugeIsSetUp( true );
+ self.gaugeValue(
parseFloat(dataget.results[0].fraud_percent).toFixed(2) );
+ self.queryStringSQL( dataget.sqlQuery );
self.gauge = c3.generate({
bindto: '#FraudRiskScoreGauge',
@@ -293,7 +294,28 @@
}
}
});
+
+ //Save these settings to this instance
+ $.ajax({
+method: 'PUT',
+url: '/widget-instance/' + params.widgetInstance,
+contentType: 'application/json; charset=UTF-8',
+data: {
+configuration: {
+width: self.columnSize(),
+gaugeValue: self.gaugeValue(),
+
[MediaWiki-commits] [Gerrit] WIP stash recovery omg do not review - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188608
Change subject: WIP stash recovery omg do not review
..
WIP stash recovery omg do not review
Change-Id: If30228f002d582ac86028b080edef9e6f80f387d
---
M routes/board.js
A src/images/honey-avatar.jpg
M src/index.html
3 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/08/188608/1
diff --git a/routes/board.js b/routes/board.js
index 835cd15..249597b 100644
--- a/routes/board.js
+++ b/routes/board.js
@@ -13,6 +13,7 @@
isShared: req.body.isShared,
widgets: req.body.widgets
};
+ console.log('req.params is this = ', req.params);
if ( req.params.id ) {
board.id = req.params.id;
}
@@ -23,6 +24,7 @@
});
},
get: function( req, res ) {
+ console.log('req.params is this = ', req.params);
if ( !req.session || !req.session.passport ||
!req.session.passport.user ) {
res.json( { error: 'Error: Not logged in' } );
return;
diff --git a/src/images/honey-avatar.jpg b/src/images/honey-avatar.jpg
new file mode 100644
index 000..8c34ff5
--- /dev/null
+++ b/src/images/honey-avatar.jpg
Binary files differ
diff --git a/src/index.html b/src/index.html
index da61e77..dc3e653 100644
--- a/src/index.html
+++ b/src/index.html
@@ -39,7 +39,7 @@
url: '/widget-instance',
contentType: 'application/json; charset=UTF-8',
data: JSON.stringify({
-widgetId: 5,
+widgetId: 1,
displayName: 'My config',
configuration: {
blah: 'something'
--
To view, visit https://gerrit.wikimedia.org/r/188608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If30228f002d582ac86028b080edef9e6f80f387d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed WIP madness - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188674
Change subject: Fixed WIP madness
..
Fixed WIP madness
Conflicts:
src/components/app-content/app-content.html
src/components/app-content/app-content.js
Change-Id: Idf8042fb7451b076065d479aba37690b9ac3e1a4
---
M persistence.js
M persistence.sql
M routes/user.js
M server.js
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/boards/generic-board/generic-board.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/css/style.css
A src/images/honey-avatar.jpg
11 files changed, 87 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/74/188674/1
diff --git a/persistence.js b/persistence.js
index cd08104..28ee309 100644
--- a/persistence.js
+++ b/persistence.js
@@ -45,15 +45,22 @@
loginUser: function( user ) {
var params = [ user.id, user.provider, user.displayName ],
insertUser = 'INSERT IGNORE INTO dash_user ( oauth_id,
oauth_provider, display_name ) VALUES ( ?, ?, ? )',
- getInfo = 'SELECT id, default_board from dash_user
where oauth_id = ? and oauth_provider = ?',
+ getInfo = 'SELECT id, default_board, avatar, title,
email from dash_user where oauth_id = ? and oauth_provider = ?',
insertBoard = 'INSERT INTO dash_board ( display_name,
description, owner_id ) VALUES ( ?, \'\', ? ); UPDATE dash_user SET
default_board = LAST_INSERT_ID() WHERE id = ?; SELECT LAST_INSERT_ID() AS id',
connection = getConnection();
return connection.query( insertUser, params ).then( function() {
return connection.query( getInfo, params ).then(
function( dbResults ) {
- var userId = dbResults[0][0].id,
- defaultBoard =
dbResults[0][0].default_board;
+ var userId =
dbResults[0][0].id,
+ defaultBoard=
dbResults[0][0].default_board;
+ avatar =
dbResults[0][0].avatar;
+ title =
dbResults[0][0].title;
+ email =
dbResults[0][0].email;
user.localId = userId;
+ user.avatar = avatar;
+ user.title = title;
+ user.email = email;
+
if ( defaultBoard ) {
user.defaultBoard = defaultBoard;
return;
diff --git a/persistence.sql b/persistence.sql
index 57ff27c..c9209f1 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -12,6 +12,9 @@
oauth_provider VARCHAR(255), /* service that gave us the remote id */
display_name VARCHAR(255), /* display name provided by oauth */
default_board INT,
+ avatar VARCHAR(255), /* avatar image */
+ title VARCHAR(255),
+ email VARCHAR(255),
UNIQUE (oauth_id, oauth_provider)
);
/* List of available widgets */
diff --git a/routes/user.js b/routes/user.js
index f39fdf5..4917755 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -12,7 +12,10 @@
res.json( {
name: user.displayName,
id: user.localId,
- defaultBoard: user.defaultBoard
+ defaultBoard: user.defaultBoard,
+ avatar: user.avatar,
+ title: user.title,
+ email: user.email
} );
},
boards: function( req, res ) {
diff --git a/server.js b/server.js
index 111d2de..565b3b2 100644
--- a/server.js
+++ b/server.js
@@ -82,7 +82,6 @@
app.post( '/board', routes.board.save );
app.put( '/board/:id', routes.board.save );
app.get( '/board/:id', routes.board.get );
-app.get( '/library', routes.library.get );
/*jslint -W024*/
app.use( express.static( __dirname + ( config.debug ? '/src' : '/dist' ) ) );
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 70ca8b6..796ea94 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,17 +1,52 @@
section id=navbar
- nav-bar params=welcome: welcome, loggedIn: loggedIn, userBoards:
userBoards/nav-bar
+ nav-bar params=welcome: welcome, loggedIn: loggedIn, userBoards:
userBoards, displayPage: displayPage/nav-bar
/section
-div class=container-fluid data-bind='if: loggedIn'
- div class=row
-
[MediaWiki-commits] [Gerrit] Retrieve widget code with instance data - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Retrieve widget code with instance data
..
Retrieve widget code with instance data
Should avoid an extra round trip when showing boards or library.
Change-Id: I6759d0a25aa2d67e1f4fbd131dfdc928ac3579db
---
M persistence.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Ssmith: Verified; Looks good to me, approved
diff --git a/persistence.js b/persistence.js
index ef4cee9..cd08104 100644
--- a/persistence.js
+++ b/persistence.js
@@ -99,7 +99,7 @@
*/
getWidgetInstance: function( instanceId, userId ) {
var connection = getConnection(),
- select = 'SELECT widget_id, owner_id, display_name,
description, is_shared, configuration FROM dash_widget_instance WHERE id = ?
and ( is_shared OR owner_id = ? )';
+ select = 'SELECT wi.widget_id, w.code, wi.owner_id,
wi.display_name, wi.description, wi.is_shared, wi.configuration FROM
dash_widget_instance wi INNER JOIN dash_widget w ON w.id = wi.widget_id WHERE
wi.id = ? AND ( wi.is_shared OR wi.owner_id = ? )';
return connection.query( select, [ instanceId, userId ] ).then(
function( dbResults ) {
var result = dbResults[0][0];
@@ -107,6 +107,7 @@
return {
id: instanceId,
widgetId: result.widget_id,
+ widgetCode: result.code,
ownerId: result.owner_id,
displayName: result.display_name,
description: result.description,
@@ -126,7 +127,7 @@
*/
listWidgetInstances: function( userId ) {
var connection = getConnection(),
- select = 'SELECT id, widget_id, owner_id, display_name,
description, is_shared, configuration FROM dash_widget_instance WHERE is_shared
OR owner_id = ?';
+ select = 'SELECT wi.id, wi.widget_id, w.code,
wi.owner_id, wi.display_name, wi.description, wi.is_shared, wi.configuration
FROM dash_widget_instance wi INNER JOIN dash_widget w on w.id = wi.widget_id
WHERE wi.is_shared OR wi.owner_id = ?';
return connection.query( select, [ userId ] ).then( function(
dbResults ) {
var rows = dbResults[0],
@@ -138,6 +139,7 @@
result[i] = {
id: rows[i].id,
widgetId: rows[i].widget_id,
+ widgetCode: rows[i].code,
ownerId: rows[i].owner_id,
displayName: rows[i].display_name,
description: rows[i].description,
@@ -193,7 +195,7 @@
return connection.query( select, [ boardId, userId ] ).then(
function( dbResults ) {
var result = dbResults[0][0],
board,
- widgetSelect = 'SELECT wi.id, widget_id,
owner_id, display_name, description, is_shared, configuration FROM
dash_widget_instance wi INNER JOIN dash_widget_instance_board dwib ON wi.id =
dwib.instance_id WHERE board_id = ? ORDER BY dwib.widget_position';
+ widgetSelect = 'SELECT wi.id, wi.widget_id,
w.code, wi.owner_id, wi.display_name, wi.description, wi.is_shared,
wi.configuration FROM dash_widget_instance wi INNER JOIN dash_widget w on w.id
= wi.widget_id INNER JOIN dash_widget_instance_board wib ON wi.id =
wib.instance_id WHERE wib.board_id = ? ORDER BY wib.widget_position';
if ( !result.owner_id ) {
throw new Error('Board ' + boardId + ' with
owner ' + userId + ' not found' );
@@ -215,6 +217,7 @@
board.widgets[i] = {
id: rows[i].id,
widgetId: rows[i].widget_id,
+ widgetCode: rows[i].code,
ownerId: rows[i].owner_id,
displayName:
rows[i].display_name,
description:
rows[i].description,
--
To view, visit https://gerrit.wikimedia.org/r/187819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6759d0a25aa2d67e1f4fbd131dfdc928ac3579db
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
[MediaWiki-commits] [Gerrit] Add generic board functionality update sql - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187628
Change subject: Add generic board functionality update sql
..
Add generic board functionality update sql
(WIP)
edit: refactor to make the board deal with its own data, rather than the
app view
edit: fixed jslint complaints
Needs big english refactor
Change-Id: Ia270e86aa84ff8956a6af47b1bd8db3cda0485bd
---
M gulpfile.js
M persistence.sql
A routes/library.js
M server.js
M src/app/startup.js
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
A src/components/boards/generic-board/generic-board.html
A src/components/boards/generic-board/generic-board.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
R src/components/widgets/x-by-y/x-by-y.html
R src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
M src/index.html
18 files changed, 293 insertions(+), 74 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/28/187628/1
diff --git a/gulpfile.js b/gulpfile.js
index a464932..e6657cc 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -38,7 +38,7 @@
'components/widgets/totals-earned-chart/totals-earned-chart',
'components/widgets/amt-per-second-chart/amt-per-second-chart',
'components/boards/bigEnglish/bigEnglishBoard',
-'components/widgets/x-by-y-chart/x-by-y-chart'
+'components/widgets/x-by-y/x-by-y'
],
insertRequire: ['app/startup'],
bundles: {
diff --git a/persistence.sql b/persistence.sql
index 7e3b2c6..57ff27c 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -21,7 +21,7 @@
display_name VARCHAR(255),
description TEXT,
preview_path VARCHAR(255), /* preview image */
- UNIQUE (code)
+ UNIQUE (code)
);
/* Saved widget configurations */
CREATE TABLE IF NOT EXISTS dash_widget_instance(
@@ -55,9 +55,11 @@
);
/* Add definitions for existing widgets */
-INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'fraud', 'Fraud Gauge', 'Shows the percentage of transactions
rejected by fraud filters', 'images/fraud.png' );
-INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'big-english', 'Big English', 'Shows a set of graphs relating to the
big English fundraiser', 'images/big-english.png' );
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'fraud-gauge', 'Fraud Gauge', 'Shows the percentage of transactions
rejected by fraud filters', 'images/fraud.png' );
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'x-by-y', 'X by Y', 'A highly configurable chart allowing grouping
by many measures', 'images/x-by-y.png' );
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'amt-per-second-chart', 'Amount Per Second', 'Shows USD per second
required to reach Big English goal', 'images/amt-per-sec.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'distance-to-goal-chart', 'Distance to Goal', 'Line chart showing
USD needed to reach overall Big English goal', 'images/distance-to-goal.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'totals-earned-chart', 'Totals Earned', 'Main Big English bar chart
showing daily and hourly donation totals and counts',
'images/totals-earned.png');
/* Tailor these to your liking
GRANT INSERT, SELECT, UPDATE, DELETE ON dash_widget_instance_board TO
'testuser'@'localhost';
diff --git a/routes/library.js b/routes/library.js
new file mode 100644
index 000..a504415
--- /dev/null
+++ b/routes/library.js
@@ -0,0 +1,9 @@
+//var persistence = require( '../persistence.js' );
+
+module.exports = {
+ //find all widgets
+ //find all widget instances that are shared
+ get: function( req, res ) {
+ return res;
+ }
+};
\ No newline at end of file
diff --git a/server.js b/server.js
index 565b3b2..111d2de 100644
--- a/server.js
+++ b/server.js
@@ -82,6 +82,7 @@
app.post( '/board', routes.board.save );
app.put( '/board/:id', routes.board.save );
app.get( '/board/:id', routes.board.get );
+app.get( '/library', routes.library.get );
/*jslint -W024*/
app.use( express.static( __dirname + ( config.debug ? '/src' : '/dist' ) ) );
diff --git a/src/app/startup.js b/src/app/startup.js
index 00c9550..e6cc743 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -16,6 +16,7 @@
ko.components.register( 'date-pickers', { require:
'components/utils/date-pickers/date-pickers'
[MediaWiki-commits] [Gerrit] Add generic board functionality update sql - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187297
Change subject: Add generic board functionality update sql
..
Add generic board functionality update sql
Needs big english refactor
Change-Id: I0e09c65f7d2ea73dae261e20b337d07774a6a55e
---
A cividump.sql
M gulpfile.js
M persistence.sql
A routes/library.js
M server.js
M src/app/startup.js
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
A src/components/boards/generic-board/generic-board.html
A src/components/boards/generic-board/generic-board.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
R src/components/widgets/x-by-y/x-by-y.html
R src/components/widgets/x-by-y/x-by-y.js
M src/css/style.css
17 files changed, 274 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/97/187297/1
diff --git a/cividump.sql b/cividump.sql
new file mode 100644
index 000..1e7c4f6
--- /dev/null
+++ b/cividump.sql
Binary files differ
diff --git a/gulpfile.js b/gulpfile.js
index a464932..e6657cc 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -38,7 +38,7 @@
'components/widgets/totals-earned-chart/totals-earned-chart',
'components/widgets/amt-per-second-chart/amt-per-second-chart',
'components/boards/bigEnglish/bigEnglishBoard',
-'components/widgets/x-by-y-chart/x-by-y-chart'
+'components/widgets/x-by-y/x-by-y'
],
insertRequire: ['app/startup'],
bundles: {
diff --git a/persistence.sql b/persistence.sql
index 7e3b2c6..57ff27c 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -21,7 +21,7 @@
display_name VARCHAR(255),
description TEXT,
preview_path VARCHAR(255), /* preview image */
- UNIQUE (code)
+ UNIQUE (code)
);
/* Saved widget configurations */
CREATE TABLE IF NOT EXISTS dash_widget_instance(
@@ -55,9 +55,11 @@
);
/* Add definitions for existing widgets */
-INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'fraud', 'Fraud Gauge', 'Shows the percentage of transactions
rejected by fraud filters', 'images/fraud.png' );
-INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'big-english', 'Big English', 'Shows a set of graphs relating to the
big English fundraiser', 'images/big-english.png' );
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'fraud-gauge', 'Fraud Gauge', 'Shows the percentage of transactions
rejected by fraud filters', 'images/fraud.png' );
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'x-by-y', 'X by Y', 'A highly configurable chart allowing grouping
by many measures', 'images/x-by-y.png' );
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'amt-per-second-chart', 'Amount Per Second', 'Shows USD per second
required to reach Big English goal', 'images/amt-per-sec.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'distance-to-goal-chart', 'Distance to Goal', 'Line chart showing
USD needed to reach overall Big English goal', 'images/distance-to-goal.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'totals-earned-chart', 'Totals Earned', 'Main Big English bar chart
showing daily and hourly donation totals and counts',
'images/totals-earned.png');
/* Tailor these to your liking
GRANT INSERT, SELECT, UPDATE, DELETE ON dash_widget_instance_board TO
'testuser'@'localhost';
diff --git a/routes/library.js b/routes/library.js
new file mode 100644
index 000..9166ef6
--- /dev/null
+++ b/routes/library.js
@@ -0,0 +1,9 @@
+var persistence = require( '../persistence.js' );
+
+module.exports = {
+ //find all widgets
+ //find all widget instances that are shared
+ get: function( req, res ) {
+ return res;
+ }
+};
\ No newline at end of file
diff --git a/server.js b/server.js
index 565b3b2..111d2de 100644
--- a/server.js
+++ b/server.js
@@ -82,6 +82,7 @@
app.post( '/board', routes.board.save );
app.put( '/board/:id', routes.board.save );
app.get( '/board/:id', routes.board.get );
+app.get( '/library', routes.library.get );
/*jslint -W024*/
app.use( express.static( __dirname + ( config.debug ? '/src' : '/dist' ) ) );
diff --git a/src/app/startup.js b/src/app/startup.js
index 00c9550..e6cc743 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -16,6 +16,7 @@
ko.components.register( 'date-pickers', { require:
'components/utils/date-pickers/date-pickers' });
//register boards
+
[MediaWiki-commits] [Gerrit] Fix form width for consistent cross-device display - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186552
Change subject: Fix form width for consistent cross-device display
..
Fix form width for consistent cross-device display
bug: T86085
Change-Id: If698f13cc02e13aea22cce9078e9f15c7348351a
---
M worldpay_gateway/forms/css/worldpay.css
1 file changed, 0 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/52/186552/1
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index 2f00d4d..ebe81c4 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -68,9 +68,6 @@
/* Forms and form partials */
/* TODO: move common rules to shared css */
-.formCol {
- width:465px !important;
-}
#greenBackground, div.donor{
background-color:#CCE7CD;
border: none;
--
To view, visit https://gerrit.wikimedia.org/r/186552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If698f13cc02e13aea22cce9078e9f15c7348351a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some style things with nav - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185102
Change subject: Fix some style things with nav
..
Fix some style things with nav
Change-Id: Icc9fdebffb325d5954f2173ef252b9d13ed122a3
---
M src/components/nav-bar/nav-bar.js
M src/css/style.css
2 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/02/185102/1
diff --git a/src/components/nav-bar/nav-bar.js
b/src/components/nav-bar/nav-bar.js
index d0612c1..d5a4963 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -14,7 +14,7 @@
//make the nav menu fold out of view.
$('#navContainer .navWrapper').toggleClass('hide');
$('#showNavMenu').css('display', 'inline');
-$('#dashApp').css('padding', '0 0 0 80px');
+$('#dashApp').css('padding', '0 0 0 20px');
};
self.showNav = function(){
@@ -36,12 +36,18 @@
self.toggleBoardList = function(){
$('#boards.subNavBoardOpts').slideDown(200, 'swing', function(){
$('#boards.subNavBoardOpts').toggleClass('hide');
+if(!$('#profileLinks.subNavBoardOpts').hasClass('hide')){
+$('#profileLinks.subNavBoardOpts').toggleClass('hide');
+}
});
};
self.toggleProfileList = function(){
$('#profileLinks.subNavBoardOpts').slideDown(200, 'swing',
function(){
$('#profileLinks.subNavBoardOpts').toggleClass('hide');
+if(!$('#boards.subNavBoardOpts').hasClass('hide')){
+$('#boards.subNavBoardOpts').toggleClass('hide');
+}
});
};
diff --git a/src/css/style.css b/src/css/style.css
index 18b6d94..55b8854 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -117,18 +117,18 @@
cursor: pointer;
}
-.selectedSubNav {
+.selectedSubNav, .mainNavButton.selectedSubNav:hover {
background-color: #f5f5f5;
color: #5e668a;
cursor: pointer;
border-top: 1px rgba(94,102,138,0.5) solid;
}
-.subNavButton {
-background-color: rgba(255,255,255,0.5);
+.subNavButton, .mainNavButton:hover {
+background-color: rgba(255,255,255,0.6);
color: #5e668a;
cursor: pointer;
-transition:700ms ease-in;
+transition: 300ms ease-in;
}
.subNavButton {
--
To view, visit https://gerrit.wikimedia.org/r/185102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc9fdebffb325d5954f2173ef252b9d13ed122a3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] sidebar nav changes - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184422
Change subject: sidebar nav changes
..
sidebar nav changes
Change-Id: I15a781afdf5ecf2ccfbaf167d9f39db1b3966ab2
---
M server.js
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/css/style.css
6 files changed, 105 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/22/184422/1
diff --git a/server.js b/server.js
index b0ef5bf..1d88449 100644
--- a/server.js
+++ b/server.js
@@ -80,7 +80,7 @@
app.get( '/auth/drupal', function( req, res ) {
req.session.passport = {
user: {
- displayName: 'debuguser'
+ displayName: 'HoneyD'
}
};
res.redirect( '/' );
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 3ec432d..79f1a40 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -4,10 +4,7 @@
div class=container-fluid data-bind='if: loggedIn'
div class=row
- div data-bind=component: 'bigEnglishBoard'
class=col-md-12/div
- /div
- div class=row layoutRow
- div data-bind=component: 'fraud-gauge' class=col-md-4
firstWidget/div
+ div data-bind=component: userDefaultBoard
class=col-md-12/div
/div
/div
@@ -15,7 +12,6 @@
div class=row
div class=jumbotron
h1Welcome To Dash./h1
- h3Please a href=/auth/drupalbutton class=btn
btn-infoLog in/button/a to continue./h3
/div
/div
/div
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index e3dc2b7..53cde44 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -13,6 +13,17 @@
self.description = ko.observable();
self.graphs = ko.observableArray([]);
+//set this based on user settings.
+self.userDefaultBoard = ko.observable('bigEnglishBoard');
+
+//for now make this dummy - it should come from params/global user
settings
+self.userBoards = ko.observableArray([
+{ name: Big English, component: bigEnglishBoard },
+{ name: A/B Testing, component: bigEnglishBoard },
+{ name: Fraud Monitoring, component: bigEnglishBoard },
+{ name: Times Honey is Cute, component: bigEnglishBoard },
+]);
+
self.loggedIn = ko.observable(false);
self.welcome = ko.observable('');
$.get('/user/info', function(userInfo) {
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index 69844bc..c2f670e 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -7,28 +7,38 @@
div class=row sidebar-nav navRow
div class=col-md-12 navRow
- div class=row-fluid
- ul
- lispan
id=navDefaultBoardi class=fa fa-dashboard/span/i/li
- lispan
id=navProfileSettingsi class=fa fa-user/span/i/li
- /ul
+ div class=row-fluid text-center
id=collapseNavMenu data-bind=click: hideNav
+ span id=navCollapseArrowsi
class=fa fa-angle-double-left/i/span
/div
- div class=row-fluid
- ul
- lispan id=navFavoritesi
class=fa fa-star-o/span/i/li
- lispan id=navLibraryi
class=fa fa-book/span/i/li
- /ul
+ div class=row-fluid mainNavButton
+ i class=fa fa-user/i
+ span class=row-fluid text-center
logoutBtn data-bind=if: loggedIn
+ a href=/logoutspan
class=loginWelcome data-bind=text: welcome/span/a
+ /span
+ span class=row-fluid text-center
loginBtn data-bind=if: !loggedIn()
+ a href=/auth/drupalLog
in/a
+ /span
/div
- div class=row-fluid
-
[MediaWiki-commits] [Gerrit] Move filters from modal add save/preview - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/182239
Change subject: Move filters from modal add save/preview
..
Move filters from modal add save/preview
Change-Id: Ibcf015a12af1325d4facb78d3c8b3d5a3ccd78ab
---
M src/components/widgets/x-by-y-chart/x-by-y-chart.html
M src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
3 files changed, 67 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/39/182239/1
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
index 36527d5..1300998 100644
--- a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -14,35 +14,61 @@
div class=panel-body
div class=row
- div class=col-md-2
+ div class=col-md-3
- div class=row-fluid
- div class=well
- h4Show:/h4
- select data-bind=options: ySlices,
value: showSlice/select
- /div
- /div
- div class=row-fluid
- div class=well
- h4By:/h4
- select data-bind=options: xSlices,
value: bySlice/select
- /div
- /div
+
div class=row-fluid
- div class=well
- button class=btn btn-block btn-info
data-toggle=modal data-target=#XYfilterModali class=fa fa-filter/i
Narrow further/button
+ div class=well lightWell col-md-12
+ form id=XYform data-bind=event:
{change: logStateChange(true)}
+ div class=row-fluid
+ h4Show:/h4
+ select
data-bind=options: ySlices, value: showSlice/select
+ hr
+ /div
+ div class=row-fluid
+ h4By:/h4
+ select
data-bind=options: xSlices, value: bySlice/select
+ hr
+ /div
+
+ div class=row-fluid
+ h4Starting
time range:/h4br
+ select
id=startingTimeRange placeholder=Range... data-bind=options:
timeChoices/select
+ hr
+ /div
+
+ div class=row-fluid
+ label
for=selectXYFiltersAdditional filters to show:/labelbr
+ span
data-bind=foreach: groupChoices
+ div
class=panel panel-default xyGroupOption
+
div class=panel-heading
+
span data-bind=text: $data.name class=pull-left/span
+
span class=pull-right data-bind=if: $data.choicesi
class=fa fa-caret-down data-bind=click:
$parent.showPanelBody($data.name)/i/span
+
span class=pull-right data-bind=if: !$data.choicesinput
type=checkbox data-bind=value: 'group='+$data.name, checked:
$parent.chosenFilters/i/span
+
/div
+
div class=panel-body hide data-bind=if: $data.choices, visible:
$data.choices, attr: { id: $data.name + 'body' }
+
ul data-bind=foreach: $data.choices class=filterPickerList
+
li
[MediaWiki-commits] [Gerrit] add new libs - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/181602 Change subject: add new libs .. add new libs Change-Id: I25fd5b3cb064df671fd5ba52b4b623ba8d701d4a --- A chosen_v1.1.0/.bower.json A chosen_v1.1.0/chosen-sprite.png A chosen_v1.1.0/chosen-spr...@2x.png A chosen_v1.1.0/chosen.css A chosen_v1.1.0/chosen.jquery.js A chosen_v1.1.0/chosen.jquery.min.js A chosen_v1.1.0/chosen.min.css A chosen_v1.1.0/chosen.proto.js A chosen_v1.1.0/chosen.proto.min.js A chosen_v1.1.0/docsupport/chosen.png A chosen_v1.1.0/docsupport/oss-credit.png A chosen_v1.1.0/docsupport/prism.css A chosen_v1.1.0/docsupport/prism.js A chosen_v1.1.0/docsupport/style.css A chosen_v1.1.0/index.html A chosen_v1.1.0/index.proto.html A chosen_v1.1.0/options.html A select2/.bower.json A select2/.gitignore A select2/CONTRIBUTING.md A select2/LICENSE A select2/README.md A select2/bower.json A select2/component.json A select2/composer.json A select2/package.json A select2/release.sh A select2/select2-bootstrap.css A select2/select2-spinner.gif A select2/select2.css A select2/select2.jquery.json A select2/select2.js A select2/select2.min.js A select2/select2.png A select2/select2_locale_ar.js A select2/select2_locale_az.js A select2/select2_locale_bg.js A select2/select2_locale_ca.js A select2/select2_locale_cs.js A select2/select2_locale_da.js A select2/select2_locale_de.js A select2/select2_locale_el.js A select2/select2_locale_en.js.template A select2/select2_locale_es.js A select2/select2_locale_et.js A select2/select2_locale_eu.js A select2/select2_locale_fa.js A select2/select2_locale_fi.js A select2/select2_locale_fr.js A select2/select2_locale_gl.js A select2/select2_locale_he.js A select2/select2_locale_hr.js A select2/select2_locale_hu.js A select2/select2_locale_id.js A select2/select2_locale_is.js A select2/select2_locale_it.js A select2/select2_locale_ja.js A select2/select2_locale_ka.js A select2/select2_locale_ko.js A select2/select2_locale_lt.js A select2/select2_locale_lv.js A select2/select2_locale_mk.js A select2/select2_locale_ms.js A select2/select2_locale_nb.js A select2/select2_locale_nl.js A select2/select2_locale_pl.js A select2/select2_locale_pt-BR.js A select2/select2_locale_pt-PT.js A select2/select2_locale_ro.js A select2/select2_locale_rs.js A select2/select2_locale_ru.js A select2/select2_locale_sk.js A select2/select2_locale_sv.js A select2/select2_locale_th.js A select2/select2_locale_tr.js A select2/select2_locale_ug-CN.js A select2/select2_locale_uk.js A select2/select2_locale_vi.js A select2/select2_locale_zh-CN.js A select2/select2_locale_zh-TW.js A select2/select2x2.png 81 files changed, 12,349 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/src/bower_modules refs/changes/02/181602/1 -- To view, visit https://gerrit.wikimedia.org/r/181602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25fd5b3cb064df671fd5ba52b4b623ba8d701d4a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash/src/bower_modules Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] connect front and back ends for x-by-y - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181528
Change subject: connect front and back ends for x-by-y
..
connect front and back ends for x-by-y
WIP but feel free to comment
Change-Id: I971e61fffcc0d10d065cd1e0526b4a7d67e1f8c0
---
M src/components/app-content/app-content.html
M src/components/widgets/x-by-y-chart/x-by-y-chart.html
M src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
4 files changed, 171 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/28/181528/1
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index c605965..3ec432d 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -3,7 +3,12 @@
/section
div class=container-fluid data-bind='if: loggedIn'
- x-by-y-chart/x-by-y-chart
+ div class=row
+ div data-bind=component: 'bigEnglishBoard'
class=col-md-12/div
+ /div
+ div class=row layoutRow
+ div data-bind=component: 'fraud-gauge' class=col-md-4
firstWidget/div
+ /div
/div
div class=container-fluid data-bind='if: !loggedIn()'
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
index 624555f..36527d5 100644
--- a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -2,7 +2,7 @@
div class=panel panel-purple
div class=panel-heading
div class=btn-group btn-group-xs pull-right
- button type=button class=btn btn-default
dropdown-togglei class=fa fa-database/i/button
+ button type=button class=btn btn-default
dropdown-toggle data-toggle=modal data-target=#XYsqlModali class=fa
fa-database/i/button
button type=button id=savedCharts class=btn
btn-default dropdown-toggle data-toggle=dropdown
data-target=#XYsavedCharti class=fa fa-area-chart/i Saved
charts.../button
ul class=dropdown-menu role=menu
aria-labelledby=savedCharts id=savedChartsMenu data-bind=foreach:
presetTitles, style: { width: '300px'}
li data-bind=text: $data/li
@@ -42,7 +42,6 @@
/div
div class=col-md-10
-
div class=row id=specifiedXYchart
@@ -92,14 +91,34 @@
h4 class=modal-titleSet up the chart!/h4
/div
div class=modal-body
- div class=row-fluid well
- label for=selectXYFiltersAdditional filters
to show:/labelbr
- select multiple
name=selectedXYFilters id=selectXYFilters class=filters
placeholder=Filters... data-bind=options: filters, selectedOptions:
chosenFilters/select
-/div
-div class=row-fluid well
+
+div class=row-fluid
label for=startingTimeRangeStarting time
range:/labelbr
- select id=startingTimeRange
placeholder=Range... data-bind=options: timeChoices/select
+ select id=startingTimeRange
class=well placeholder=Range... data-bind=options: timeChoices/select
/div
+
+ div class=row-fluid
+ label for=selectXYFiltersAdditional filters
to show:/labelbr
+ span data-bind=foreach: groupChoices
+ div class=panel panel-default
xyGroupOption
+ div class=panel-heading
+ span
data-bind=text: $data.name class=pull-left/span
+ span
class=pull-right data-bind=if: $data.choicesi class=fa fa-caret-down
data-bind=click: $parent.showPanelBody($data.name)/i/span
+ span
class=pull-right data-bind=if: !$data.choicesinput type=checkbox
data-bind=value: 'group='+$data.name, checked:
$parent.chosenFilters/i/span
+ /div
+ div class=panel-body
hide data-bind=if: $data.choices, visible: $data.choices, attr: { id:
$data.name + 'body' }
+ ul
data-bind=foreach: $data.choices class=filterPickerList
+ li
class=subFilterPickerList
+
span
[MediaWiki-commits] [Gerrit] Fix negative number issue - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180087
Change subject: Fix negative number issue
..
Fix negative number issue
Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
---
M src/components/boards/bigEnglish/bigEnglishBoard.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/87/180087/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 114b6b7..1aa0c33 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -28,7 +28,7 @@
self.totalRemainingToDate = ko.computed( function(){
var trtd = self.goal() - self.raised();
-return numeral(trtd).format('$0,0');
+return numeral(trtd = 0 ? trtd : 0).format('$0,0');
});
self.secondsByHourDonationData = ['Donations Per Second'];
--
To view, visit https://gerrit.wikimedia.org/r/180087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: deployment
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix negative number issue - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180096
Change subject: Fix negative number issue
..
Fix negative number issue
Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
---
M src/components/boards/bigEnglish/bigEnglishBoard.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/96/180096/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 5209139..42bd381 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -27,7 +27,7 @@
self.totalRemainingToDate = ko.computed( function(){
var trtd = self.goal() - self.raised();
-return numeral(trtd).format('$0,0');
+return numeral(trtd = 0 ? trtd : 0).format('$0,0');
});
self.secondsByHourDonationData = ['Donations Per Second'];
--
To view, visit https://gerrit.wikimedia.org/r/180096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge from master, gulp - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/180113 Change subject: Merge from master, gulp .. Merge from master, gulp Change-Id: Iae80752aaa14e042dd233916545cbed7af45e735 --- M dist/index.html M dist/js.manifest.json R dist/scripts-29749b3e.js M node_modules 4 files changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/13/180113/1 -- To view, visit https://gerrit.wikimedia.org/r/180113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae80752aaa14e042dd233916545cbed7af45e735 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge, gulp, ready to deploy - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/180114 Change subject: Merge, gulp, ready to deploy .. Merge, gulp, ready to deploy Change-Id: I4c60addc9be4e9cf6f96746aaa12a2b271c56142 --- M dist/index.html M dist/js.manifest.json R dist/scripts-29749b3e.js M node_modules 4 files changed, 20 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/14/180114/1 -- To view, visit https://gerrit.wikimedia.org/r/180114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c60addc9be4e9cf6f96746aaa12a2b271c56142 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add loader gif - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179200
Change subject: Add loader gif
..
Add loader gif
Change-Id: Ib1e890814a55b580c78478bd1ab8f50db3e94ebf
---
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/css/style.css
A src/images/catloader.gif
4 files changed, 55 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/00/179200/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index 323f6d2..f7a3cff 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -12,6 +12,11 @@
/div
/div
+div class=loading
+img src=/images/catloader.gif /
+divLoading Dashspan class=ellipsis/span/div
+/div
+
div class=row
div class=panel panel-transparent
div class=panel-body
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 5209139..40b057e 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -46,6 +46,32 @@
return self.totalRemainingToDate();
});
+//todo: this could go elsewhere
+ellipsis = {
+'value' : ['', '.', '..', '...', ''],
+'count' : 0,
+'run' : false,
+'timer' : null,
+'element' : '.ellipsis',
+'start' : function () {
+ var t = this;
+this.run = true;
+this.timer = setInterval(function () {
+if (t.run) {
+$(t.element).html(t.value[t.count %
t.value.length]).text();
+t.count++;
+}
+}, 400);
+},
+'stop' : function () {
+this.run = false;
+clearInterval(this.timer);
+this.count = 0;
+}
+}
+
+ellipsis.start();
+
// Only recalculate child boards once per half second
self.dataChanged.extend( { rateLimit: 500 } );
@@ -91,12 +117,14 @@
// Reload the data. For the automatic reload, we're fine
getting
// something from the cache.
self.reloadBigEnglish = function( automatic ){
+$(.loading).show();
var url = '/data/big-english';
if ( automatic !== true ) {
url += '/?cache=false';
}
$.get( url , function ( dataget ) {
self.loadData( dataget.results,
dataget.timestamp );
+$(.loading).hide();
});
// Do it every 5 minutes as well
setTimeout( function () {
diff --git a/src/css/style.css b/src/css/style.css
index e60c807..f09127d 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -438,4 +438,26 @@
#distanceToGoalChart {
padding: 0 9px 0 0;
+}
+
+.loading {
+display: none;
+position: fixed;
+top: 360px;
+left: 50%;
+margin-top: -96px;
+margin-left: -96px;
+background-color: #5bc0de;
+opacity: .85;
+border-radius: 25px;
+width: 192px;
+height: 192px;
+padding: 37px;
+color: #ff;
+z-index: 9;
+font-size: 110%;
+}
+
+.loading div {
+margin-left: 10px;
}
\ No newline at end of file
diff --git a/src/images/catloader.gif b/src/images/catloader.gif
new file mode 100644
index 000..6ef0dbf
--- /dev/null
+++ b/src/images/catloader.gif
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/179200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1e890814a55b580c78478bd1ab8f50db3e94ebf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent double clicks on gc cc forms - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179354
Change subject: Prevent double clicks on gc cc forms
..
Prevent double clicks on gc cc forms
Change-Id: Ica094ca2fa542cff4452ed0e13dd43a5ab9fb635
---
M globalcollect_gateway/forms/js/gc.cc.js
M globalcollect_gateway/forms/js/gc.js
2 files changed, 7 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/54/179354/1
diff --git a/globalcollect_gateway/forms/js/gc.cc.js
b/globalcollect_gateway/forms/js/gc.cc.js
index 5f19108..1005a4c 100644
--- a/globalcollect_gateway/forms/js/gc.cc.js
+++ b/globalcollect_gateway/forms/js/gc.cc.js
@@ -55,10 +55,14 @@
} );
// Set the cards to progress to step 3
- $( '.cardradio' ).live( 'click', function () {
+ $( '.cardradio' ).live( 'change', function (event) {
+
+ $('.cardradio').prop('disabled', true);
+
if ( validate_personal( document.payment ) validateAmount()
) {
$( '#payment' ).animate( { height: '314px' }, 1000 );
displayCreditCardForm();
+
// hide the continue button so that people don't get
confused with two of them
$( '#paymentContinue' ).hide();
} else {
diff --git a/globalcollect_gateway/forms/js/gc.js
b/globalcollect_gateway/forms/js/gc.js
index 26f6237..f2e17d8 100644
--- a/globalcollect_gateway/forms/js/gc.js
+++ b/globalcollect_gateway/forms/js/gc.js
@@ -82,9 +82,11 @@
mw.generatePaymentForm( data );
}
}
+ $('.cardradio').prop('disabled', false);
},
error: function ( xhr ) {
alert( mw.msg( 'donate_interface-error-msg-general' ) );
+ $('.cardradio').prop('disabled', false);
}
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/179354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica094ca2fa542cff4452ed0e13dd43a5ab9fb635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix double click issue - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/179353 Change subject: Fix double click issue .. Fix double click issue Change-Id: Ie797fbd235a15afda6a8405e08ef506f21a53083 --- M globalcollect_gateway/forms/html/_personal-information/default.html 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/53/179353/1 diff --git a/globalcollect_gateway/forms/html/_personal-information/default.html b/globalcollect_gateway/forms/html/_personal-information/default.html index 89968d4..9028c62 100644 --- a/globalcollect_gateway/forms/html/_personal-information/default.html +++ b/globalcollect_gateway/forms/html/_personal-information/default.html @@ -18,9 +18,5 @@ input class=fullwidth optional name=city value=@city type=text title=%donate_interface-city-town% placeholder=%donate_interface-city-town% id=city /td /tr - HEAD (400fcc Remove AU State label and newline email) - -=== - BRANCH (9846bd Localisation updates from https://translatewiki.net.) input type=hidden value=@country name=country id=country / -- To view, visit https://gerrit.wikimedia.org/r/179353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie797fbd235a15afda6a8405e08ef506f21a53083 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the x-by-y chart widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178994
Change subject: Add the x-by-y chart widget
..
Add the x-by-y chart widget
Change-Id: I7f7f473f7cb942766f9c2b8db408d4e94ceabd9e
---
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
6 files changed, 218 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/94/178994/1
diff --git a/src/app/startup.js b/src/app/startup.js
index d564500..00c9550 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -23,6 +23,7 @@
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
+ko.components.register( 'x-by-y-chart', { require:
'components/widgets/x-by-y-chart/x-by-y-chart' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index 323f6d2..e13e142 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,6 +61,8 @@
/div
/div
+x-by-y-chart/x-by-y-chart
+
totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
div class=row layoutRow
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 25bc16a..ac0fabc 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -21,8 +21,10 @@
div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
div class=col-md-12
-h3This widget hasn't been set up yet./h3
-button type=button class=btn btn-primary btn-lg
btn-block data-toggle=modal data-target=#modifyModalSet it up/button
+div class=setupAsk
+h3This widget hasn't been set up yet./h3
+button type=button class=btn btn-primary
btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it
up/button
+/div
/div
/div
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
new file mode 100644
index 000..b96849d
--- /dev/null
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -0,0 +1,129 @@
+div class=row
+ div class=panel panel-purple
+div class=panel-heading
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default
dropdown-togglei class=fa fa-database/i/button
+ button type=button class=btn btn-default
data-toggle=modal data-target=#modifyXYModali class=fa
fa-edit/i/button
+ /div
+/div
+
+div class=panel-body
+div class=row
+ div class=col-md-12
+
+ div class=row-fluid
+ h1 data-bind=visible: xyIsSetUp(), text:
title/h1
+ /div
+
+ div class=row id=specifiedXYchart
data-bind=visible: xyIsSetUp
+ div class=col-md-2
+ div class=row
+ div class=sidebox
+ h4Show:/h4
+ select
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+ /select
+ /div
+
[MediaWiki-commits] [Gerrit] Updated chart for basic design. - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/178995 Change subject: Updated chart for basic design. .. Updated chart for basic design. Change-Id: I658f548414a7e11998d812a7043e224b4ceeea5d --- M bower.json A dist/fonts/FontAwesome.otf A dist/fonts/fontawesome-webfont.eot A dist/fonts/fontawesome-webfont.svg A dist/fonts/fontawesome-webfont.ttf A dist/fonts/fontawesome-webfont.woff A dist/index.html A dist/js.manifest.json A dist/scripts-03a9f6ea.js A dist/style-7965bd12.css M node_modules M src/app/require.config.js M src/components/boards/bigEnglish/bigEnglishBoard.html M src/components/widgets/x-by-y-chart/x-by-y-chart.html M src/components/widgets/x-by-y-chart/x-by-y-chart.js M src/css/style.css M src/index.html 17 files changed, 9,656 insertions(+), 138 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/95/178995/1 -- To view, visit https://gerrit.wikimedia.org/r/178995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I658f548414a7e11998d812a7043e224b4ceeea5d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the x-by-y chart widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178242
Change subject: Add the x-by-y chart widget
..
Add the x-by-y chart widget
Change-Id: I88c3e450245aac02dddcecab489516302e821f31
---
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
6 files changed, 218 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/42/178242/1
diff --git a/src/app/startup.js b/src/app/startup.js
index d564500..00c9550 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -23,6 +23,7 @@
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
+ko.components.register( 'x-by-y-chart', { require:
'components/widgets/x-by-y-chart/x-by-y-chart' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index ee4bfaa..2076eb8 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,6 +61,8 @@
/div
/div
+x-by-y-chart/x-by-y-chart
+
totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
div class=row layoutRow
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 25bc16a..ac0fabc 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -21,8 +21,10 @@
div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
div class=col-md-12
-h3This widget hasn't been set up yet./h3
-button type=button class=btn btn-primary btn-lg
btn-block data-toggle=modal data-target=#modifyModalSet it up/button
+div class=setupAsk
+h3This widget hasn't been set up yet./h3
+button type=button class=btn btn-primary
btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it
up/button
+/div
/div
/div
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
new file mode 100644
index 000..b96849d
--- /dev/null
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -0,0 +1,129 @@
+div class=row
+ div class=panel panel-purple
+div class=panel-heading
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default
dropdown-togglei class=fa fa-database/i/button
+ button type=button class=btn btn-default
data-toggle=modal data-target=#modifyXYModali class=fa
fa-edit/i/button
+ /div
+/div
+
+div class=panel-body
+div class=row
+ div class=col-md-12
+
+ div class=row-fluid
+ h1 data-bind=visible: xyIsSetUp(), text:
title/h1
+ /div
+
+ div class=row id=specifiedXYchart
data-bind=visible: xyIsSetUp
+ div class=col-md-2
+ div class=row
+ div class=sidebox
+ h4Show:/h4
+ select
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+ /select
+ /div
+
[MediaWiki-commits] [Gerrit] Add the x-by-y chart widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178245
Change subject: Add the x-by-y chart widget
..
Add the x-by-y chart widget
Change-Id: I77d3e52e8368b09e78d550bab0d77c710d286fa8
---
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
6 files changed, 218 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/45/178245/1
diff --git a/src/app/startup.js b/src/app/startup.js
index d564500..00c9550 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -23,6 +23,7 @@
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
+ko.components.register( 'x-by-y-chart', { require:
'components/widgets/x-by-y-chart/x-by-y-chart' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index ee4bfaa..2076eb8 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,6 +61,8 @@
/div
/div
+x-by-y-chart/x-by-y-chart
+
totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
div class=row layoutRow
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 25bc16a..ac0fabc 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -21,8 +21,10 @@
div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
div class=col-md-12
-h3This widget hasn't been set up yet./h3
-button type=button class=btn btn-primary btn-lg
btn-block data-toggle=modal data-target=#modifyModalSet it up/button
+div class=setupAsk
+h3This widget hasn't been set up yet./h3
+button type=button class=btn btn-primary
btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it
up/button
+/div
/div
/div
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
new file mode 100644
index 000..b96849d
--- /dev/null
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -0,0 +1,129 @@
+div class=row
+ div class=panel panel-purple
+div class=panel-heading
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default
dropdown-togglei class=fa fa-database/i/button
+ button type=button class=btn btn-default
data-toggle=modal data-target=#modifyXYModali class=fa
fa-edit/i/button
+ /div
+/div
+
+div class=panel-body
+div class=row
+ div class=col-md-12
+
+ div class=row-fluid
+ h1 data-bind=visible: xyIsSetUp(), text:
title/h1
+ /div
+
+ div class=row id=specifiedXYchart
data-bind=visible: xyIsSetUp
+ div class=col-md-2
+ div class=row
+ div class=sidebox
+ h4Show:/h4
+ select
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+ /select
+ /div
+
[MediaWiki-commits] [Gerrit] Add the x-by-y chart widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178246
Change subject: Add the x-by-y chart widget
..
Add the x-by-y chart widget
Change-Id: I7f7f473f7cb942766f9c2b8db408d4e94ceabd9e
---
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.html
A src/components/widgets/x-by-y-chart/x-by-y-chart.js
M src/css/style.css
6 files changed, 218 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/46/178246/1
diff --git a/src/app/startup.js b/src/app/startup.js
index d564500..00c9550 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -23,6 +23,7 @@
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
+ko.components.register( 'x-by-y-chart', { require:
'components/widgets/x-by-y-chart/x-by-y-chart' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index ee4bfaa..2076eb8 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,6 +61,8 @@
/div
/div
+x-by-y-chart/x-by-y-chart
+
totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
div class=row layoutRow
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 25bc16a..ac0fabc 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -21,8 +21,10 @@
div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
div class=col-md-12
-h3This widget hasn't been set up yet./h3
-button type=button class=btn btn-primary btn-lg
btn-block data-toggle=modal data-target=#modifyModalSet it up/button
+div class=setupAsk
+h3This widget hasn't been set up yet./h3
+button type=button class=btn btn-primary
btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it
up/button
+/div
/div
/div
diff --git a/src/components/widgets/x-by-y-chart/x-by-y-chart.html
b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
new file mode 100644
index 000..b96849d
--- /dev/null
+++ b/src/components/widgets/x-by-y-chart/x-by-y-chart.html
@@ -0,0 +1,129 @@
+div class=row
+ div class=panel panel-purple
+div class=panel-heading
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default
dropdown-togglei class=fa fa-database/i/button
+ button type=button class=btn btn-default
data-toggle=modal data-target=#modifyXYModali class=fa
fa-edit/i/button
+ /div
+/div
+
+div class=panel-body
+div class=row
+ div class=col-md-12
+
+ div class=row-fluid
+ h1 data-bind=visible: xyIsSetUp(), text:
title/h1
+ /div
+
+ div class=row id=specifiedXYchart
data-bind=visible: xyIsSetUp
+ div class=col-md-2
+ div class=row
+ div class=sidebox
+ h4Show:/h4
+ select
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+
optionThing/option
+ /select
+ /div
+
[MediaWiki-commits] [Gerrit] Merge master and gulp for deploy - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/178274 Change subject: Merge master and gulp for deploy .. Merge master and gulp for deploy Change-Id: I075b2465d79d915ae4c1bd0e750f2689641bb385 --- M dist/index.html M dist/js.manifest.json A dist/scripts-4ddc1b77.js 3 files changed, 108 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/74/178274/1 -- To view, visit https://gerrit.wikimedia.org/r/178274 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I075b2465d79d915ae4c1bd0e750f2689641bb385 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix number formats on donation chart - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177699
Change subject: Fix number formats on donation chart
..
Fix number formats on donation chart
Change-Id: I0ec0f75a5755ad7cac35d282320ebfa1bd4fda13
---
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/99/177699/1
diff --git a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
index dca881b..bf9ebd7 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
@@ -62,10 +62,13 @@
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('$0,0') }
}
},
y2: {
+ tick: {
+ format:
function(x){ return numeral(x).format('0,0') }
+ },
show: true
}
},
@@ -127,10 +130,13 @@
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('$0,0') }
}
},
y2: {
+ tick: {
+ format:
function(x){ return numeral(x).format('0,0') }
+ },
show: true
}
},
--
To view, visit https://gerrit.wikimedia.org/r/177699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec0f75a5755ad7cac35d282320ebfa1bd4fda13
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gulped and ready for deploy - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177728 Change subject: Gulped and ready for deploy .. Gulped and ready for deploy Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-97471915.js R dist/style-65aa068f.css 5 files changed, 34 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/28/177728/1 -- To view, visit https://gerrit.wikimedia.org/r/177728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add donation count to donation amts chart - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177282
Change subject: Add donation count to donation amts chart
..
Add donation count to donation amts chart
Change-Id: Id2f894c12fdc28b8d79c46ff9c17bf22459c1cda
---
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
3 files changed, 67 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/82/177282/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index 40146ea..d3a82c5 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,7 +61,7 @@
/div
/div
-totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyDataArray: dailyDataArray, dayObj: dayObj, dataChanged:
dataChanged/totals-earned-chart
+totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
div class=row
distance-to-goal-chart params=title: 'Distance To Goal', dailyDataArray:
dailyDataArray, goal: goal, dataChanged: dataChanged/distance-to-goal-chart
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 0bb7718..7e298a6 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -17,7 +17,6 @@
// Reload the page
self.reloadBigEnglish = function(){
-console.log('reloading');
location.reload();
};
// Do it every 5 minutes as well
@@ -47,6 +46,16 @@
//initialize day/hour data
self.dayObj = [];
self.dailyDataArray = ['Daily Total'];
+self.dailyCountArray = ['Daily Count'];
+ for (var d = 1; d 32; d++) {
+ self.dailyDataArray[d] = 0;
+self.dailyCountArray[d] = 0;
+ self.dayObj[d] = [ 'Hourly Totals' ];
+ for (var h = 1; h 25; h++) {
+ self.dayObj[d][h] = 0;
+ self.secondsByHourDonationData[(d - 1) * 24 +
h] = 0;
+ }
+ }
// Allows components in the board to subscribe to a single
property
// and get notified of any changes to the available data.
@@ -73,7 +82,7 @@
}
$.each(self.decemberData, function(el, i){
var d = self.decemberData[el].day, h =
self.decemberData[el].hour;
- self.dayObj[d][h + 1] =
self.decemberData[el].usd_total;
+ self.dayObj[d][h + 1] = { total:
self.decemberData[el].usd_total, count: self.decemberData[el].donations };
//get all seconds into seconds array
self.secondsByHourDonationData[(d - 1) * 24 +
h+1] = self.decemberData[el].usd_per_second;
runningTotal += self.decemberData[el].usd_total;
@@ -88,15 +97,17 @@
//get data slice for days: donation amt
if(self.dailyDonationData[el.day]){
- self.dailyDonationData[el.day] +=
el.usd_total;
+
self.dailyDonationData[el.day]['amount'] += el.usd_total;
+self.dailyDonationData[el.day]['count'] += el.donations;
} else {
- self.dailyDonationData[el.day] =
el.usd_total;
+ self.dailyDonationData[el.day] = {
amount: el.usd_total, count: el.donations};
}
});
$.each( self.dailyDonationData, function(el, i){
- self.dailyDataArray[parseInt(el, 10)] =
self.dailyDonationData[el];
+ self.dailyDataArray[parseInt(el, 10)] =
self.dailyDonationData[el]['amount'];
+self.dailyCountArray[parseInt(el, 10)] =
self.dailyDonationData[el]['count'];
});
self.raised(runningTotal);
});
diff --git a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
index 188450c..bc67e04 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++
[MediaWiki-commits] [Gerrit] Fix widget alignment/css issues - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177392
Change subject: Fix widget alignment/css issues
..
Fix widget alignment/css issues
Change-Id: I92f119243b32d88ea39be4737c2e69ebf4c1a2c3
---
M src/components/app-content/app-content.html
M src/components/boards/bigEnglish/bigEnglishBoard.html
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/css/style.css
6 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/92/177392/1
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 4e79491..4606be5 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -2,7 +2,7 @@
div class=row
div data-bind=component: 'bigEnglishBoard'
class=col-md-12/div
/div
- div class=row
- div data-bind=component: 'fraud-gauge'
class=col-md-4/div
+ div class=row layoutRow
+ div data-bind=component: 'fraud-gauge' class=col-md-4
firstWidget/div
/div
/div
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index d3a82c5..ee4bfaa 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -63,7 +63,7 @@
totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyCountArray: dailyCountArray, dailyDataArray: dailyDataArray, dayObj:
dayObj, dataChanged: dataChanged/totals-earned-chart
-div class=row
+div class=row layoutRow
distance-to-goal-chart params=title: 'Distance To Goal', dailyDataArray:
dailyDataArray, goal: goal, dataChanged: dataChanged/distance-to-goal-chart
amt-per-second-chart params=title: 'USD/Second Required (Average)',
dayObj: dayObj, goal: goal, secondsByHourDonationData:
secondsByHourDonationData, dataChanged: dataChanged/amt-per-second-chart
/div
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 312c8f1..51150ab 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,4 +1,4 @@
-div class=col-md-6 layoutRow
+div class=col-md-6 lastWidget
div class=panel panel-purple
div class=panel-heading
p data-bind=text: titleUSD/Second Required
(Average)/p
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 ce779c1..78983e9 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,4 +1,4 @@
-div class=col-md-6 layoutRow
+div class=col-md-6 firstWidget
div class=panel panel-purple
div class=panel-heading
p data-bind=text: title/p
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index ed3ca18..25bc16a 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,4 +1,3 @@
-
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
Fraud Rejections
diff --git a/src/css/style.css b/src/css/style.css
index db85903..2298c52 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -353,11 +353,11 @@
font-weight: normal;
}
-.layoutRow:first-child {
+.layoutRow:first-child, .layoutRow .firstWidget {
padding-left: 0;
}
-.layoutRow:last-child {
+.layoutRow:last-child, .layoutRow .lastWidget {
padding-right: 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/177392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92f119243b32d88ea39be4737c2e69ebf4c1a2c3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master into head and gulp changes for deploy - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177435 Change subject: Merge master into head and gulp changes for deploy .. Merge master into head and gulp changes for deploy Change-Id: Ib5be3946785810990ea8447509077c20164e12d6 --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-67aeec83.js R dist/style-da0e1d0c.css 5 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/35/177435/1 -- To view, visit https://gerrit.wikimedia.org/r/177435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5be3946785810990ea8447509077c20164e12d6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the way unlogged-in screen looks - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177463
Change subject: Change the way unlogged-in screen looks
..
Change the way unlogged-in screen looks
Change-Id: Ib7c443cbcbd00050ee3c0faef2c3cedc5bf076b8
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/css/style.css
M src/index.html
6 files changed, 45 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/63/177463/1
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 4606be5..df8f32d 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,4 +1,8 @@
-div class=container-fluid
+section id=navbar
+ nav-bar params=welcome: welcome, loggedIn: loggedIn/nav-bar
+/section
+
+div class=container-fluid data-bind='visible: loggedIn()'
div class=row
div data-bind=component: 'bigEnglishBoard'
class=col-md-12/div
/div
@@ -6,3 +10,12 @@
div data-bind=component: 'fraud-gauge' class=col-md-4
firstWidget/div
/div
/div
+
+div class=container-fluid data-bind='visible: !loggedIn()'
+ div class=row
+ div class=jumbotron
+ h1Welcome To Dash./h1
+ h3Please a href=/auth/drupal data-bind=visible:
!loggedIn()button class=btn btn-infoLog in/button/a to continue./h3
+ /div
+ /div
+/div
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 4a5558c..6dcd170 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -18,6 +18,17 @@
return value === e;
};
};
+
+self.loggedIn = ko.observable(false);
+self.welcome = ko.observable('');
+$.get('/user/info', function(userInfo) {
+if (userInfo) {
+var name = userInfo.name;
+self.welcome(userInfo['name'].charAt(0).toUpperCase() +
userInfo['name'].slice(1));
+} else {
+self.loggedIn(true);
+}
+});
}
return { viewModel: AppContent, template: templateMarkup };
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index 2504971..9b6db58 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -24,10 +24,9 @@
span id=navCollapseArrowsi
class=fa fa-angle-double-left/i/span
/ul
/div
- div class=row-fluid text-center logoutBtn
- a href=/auth/drupal
data-bind=visible: showLogInbutton class=btn btn-block btn-infoLog
in/button/a
- p data-bind=text: welcome/p
- a href=/logout data-bind=visible:
!showLogIn()button class=btn btn-block btn-infoLog out/button/a
+ div class=row-fluid text-center logoutBtn
data-bind=visible: loggedIn()
+ a href=/logoutbutton class=btn
btn-block btn-infoLog out/button/a
+ p class=loginWelcomei class=fa
fa-user/i span data-bind=text: welcome()/span/p
/div
/div
/div
diff --git a/src/components/nav-bar/nav-bar.js
b/src/components/nav-bar/nav-bar.js
index 4f498e4..a273622 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -6,8 +6,8 @@
function NavBarViewModel( params ){
var self = this;
-
-self.route = params.route;
+self.loggedIn = ko.observable(params.loggedIn),
+self.welcome = ko.observable(params.welcome);
self.hideNav = function(){
//make the nav menu fold out of view.
@@ -22,16 +22,6 @@
$('#dashApp').css('padding-left', '175px');
}, 200);
};
-
-self.showLogIn = ko.observable(false);
-self.welcome = ko.observable('');
-$.get('/user/info', function(userInfo) {
-if (userInfo) {
-self.welcome('Welcome, ' + userInfo.name);
-} else {
-self.showLogIn(true);
-}
-});
}
return { viewModel: NavBarViewModel, template: template };
diff --git a/src/css/style.css b/src/css/style.css
index 2298c52..e60c807 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -105,6 +105,19 @@
border-bottom: 1px #555 solid;
}
+.loginWelcome i {
+padding: 0 3px;
+}
+
[MediaWiki-commits] [Gerrit] Rebuild because fonts didn't run - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/176987 Change subject: Rebuild because fonts didn't run .. Rebuild because fonts didn't run Change-Id: Ic9aac798aa5f497b992372c89e1293bd53a1392d --- A dist/css.manifest.json A dist/date-pickers-d41d8cd9.js A dist/font/lato-black.eot A dist/font/lato-black.svg A dist/font/lato-black.ttf A dist/font/lato-black.woff A dist/font/lato-blackitalic.eot A dist/font/lato-blackitalic.svg A dist/font/lato-blackitalic.ttf A dist/font/lato-blackitalic.woff A dist/font/lato-bold.eot A dist/font/lato-bold.svg A dist/font/lato-bold.ttf A dist/font/lato-bold.woff A dist/font/lato-bolditalic.eot A dist/font/lato-bolditalic.svg A dist/font/lato-bolditalic.ttf A dist/font/lato-bolditalic.woff A dist/font/lato-hairline.eot A dist/font/lato-hairline.svg A dist/font/lato-hairline.ttf A dist/font/lato-hairline.woff A dist/font/lato-hairlineitalic.eot A dist/font/lato-hairlineitalic.svg A dist/font/lato-hairlineitalic.ttf A dist/font/lato-hairlineitalic.woff A dist/font/lato-italic.eot A dist/font/lato-italic.svg A dist/font/lato-italic.ttf A dist/font/lato-italic.woff A dist/font/lato-light.eot A dist/font/lato-light.svg A dist/font/lato-light.ttf A dist/font/lato-light.woff A dist/font/lato-lightitalic.eot A dist/font/lato-lightitalic.svg A dist/font/lato-lightitalic.ttf A dist/font/lato-lightitalic.woff A dist/font/lato-regular.eot A dist/font/lato-regular.svg A dist/font/lato-regular.ttf A dist/font/lato-regular.woff M dist/js.manifest.json M dist/scripts-2726ebaa.js M src/bower_modules 45 files changed, 47,355 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/87/176987/1 -- To view, visit https://gerrit.wikimedia.org/r/176987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9aac798aa5f497b992372c89e1293bd53a1392d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Have Big English reload every 5 minutes - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/176991 Change subject: Have Big English reload every 5 minutes .. Have Big English reload every 5 minutes Gulped it as well Change-Id: I275de9971d25be7f02d5e002ba7a2c465394f88d --- M dist/js.manifest.json A dist/scripts-2f3cc906.js A dist/scripts-54b46f7c.js A dist/scripts-818129c0.js A dist/scripts-ad21df15.js M src/components/boards/bigEnglish/bigEnglishBoard.js M src/components/widgets/totals-earned-chart/totals-earned-chart.js 7 files changed, 436 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/91/176991/1 -- To view, visit https://gerrit.wikimedia.org/r/176991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I275de9971d25be7f02d5e002ba7a2c465394f88d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update bower - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177011 Change subject: Update bower .. Update bower New version of fontawesome, numeraljs, c3 Change-Id: I3b79b92baf0c6ca1a9b898be21c4ce99d9be4c5e --- A c3/.bower.json M c3/bower.json D c3/htdocs/css/c3.css D c3/htdocs/js/c3.js D c3/htdocs/js/c3.min.js D c3/htdocs/js/extensions M fontawesome/.bower.json A fontawesome/bower.json M fontawesome/css/font-awesome.css M fontawesome/css/font-awesome.min.css M fontawesome/fonts/FontAwesome.otf M fontawesome/fonts/fontawesome-webfont.eot M fontawesome/fonts/fontawesome-webfont.svg M fontawesome/fonts/fontawesome-webfont.ttf M fontawesome/fonts/fontawesome-webfont.woff M fontawesome/less/core.less M fontawesome/less/font-awesome.less M fontawesome/less/icons.less M fontawesome/less/list.less M fontawesome/less/mixins.less M fontawesome/less/path.less M fontawesome/less/rotated-flipped.less M fontawesome/less/spinning.less M fontawesome/less/variables.less M fontawesome/scss/_core.scss M fontawesome/scss/_icons.scss M fontawesome/scss/_mixins.scss M fontawesome/scss/_rotated-flipped.scss M fontawesome/scss/_spinning.scss M fontawesome/scss/_variables.scss M fontawesome/scss/font-awesome.scss A numeraljs/.bower.json A numeraljs/.gitignore A numeraljs/.travis.yml A numeraljs/Gruntfile.js A numeraljs/LICENSE A numeraljs/README.md A numeraljs/bower.json A numeraljs/component.json A numeraljs/languages.js A numeraljs/languages/be-nl.js A numeraljs/languages/chs.js A numeraljs/languages/cs.js A numeraljs/languages/da-dk.js A numeraljs/languages/de-ch.js A numeraljs/languages/de.js A numeraljs/languages/en-gb.js A numeraljs/languages/es-ES.js A numeraljs/languages/es.js A numeraljs/languages/et.js A numeraljs/languages/fi.js A numeraljs/languages/fr-CA.js A numeraljs/languages/fr-ch.js A numeraljs/languages/fr.js A numeraljs/languages/hu.js A numeraljs/languages/it.js A numeraljs/languages/ja.js A numeraljs/languages/nl-nl.js A numeraljs/languages/pl.js A numeraljs/languages/pt-br.js A numeraljs/languages/pt-pt.js A numeraljs/languages/ru-UA.js A numeraljs/languages/ru.js A numeraljs/languages/sk.js A numeraljs/languages/th.js A numeraljs/languages/tr.js A numeraljs/languages/uk-UA.js A numeraljs/min/languages.min.js A numeraljs/min/languages/be-nl.min.js A numeraljs/min/languages/chs.min.js A numeraljs/min/languages/cs.min.js A numeraljs/min/languages/da-dk.min.js A numeraljs/min/languages/de-ch.min.js A numeraljs/min/languages/de.min.js A numeraljs/min/languages/en-gb.min.js A numeraljs/min/languages/es-ES.min.js A numeraljs/min/languages/es.min.js A numeraljs/min/languages/et.min.js A numeraljs/min/languages/fi.min.js A numeraljs/min/languages/fr-CA.min.js A numeraljs/min/languages/fr-ch.min.js A numeraljs/min/languages/fr.min.js A numeraljs/min/languages/hu.min.js A numeraljs/min/languages/it.min.js A numeraljs/min/languages/ja.min.js A numeraljs/min/languages/nl-nl.min.js A numeraljs/min/languages/pl.min.js A numeraljs/min/languages/pt-br.min.js A numeraljs/min/languages/pt-pt.min.js A numeraljs/min/languages/ru-UA.min.js A numeraljs/min/languages/ru.min.js A numeraljs/min/languages/sk.min.js A numeraljs/min/languages/th.min.js A numeraljs/min/languages/tr.min.js A numeraljs/min/languages/uk-UA.min.js A numeraljs/min/numeral.min.js A numeraljs/numeral.js A numeraljs/package.json A numeraljs/tests/languages/be-nl.js A numeraljs/tests/languages/chs.js A numeraljs/tests/languages/cs.js A numeraljs/tests/languages/da-dk.js A numeraljs/tests/languages/de-ch.js A numeraljs/tests/languages/de.js A numeraljs/tests/languages/en-gb.js A numeraljs/tests/languages/en.js A numeraljs/tests/languages/es-ES.js A numeraljs/tests/languages/es.js A numeraljs/tests/languages/et.js A numeraljs/tests/languages/fi.js A numeraljs/tests/languages/fr-CA.js A numeraljs/tests/languages/fr-ch.js A numeraljs/tests/languages/fr.js A numeraljs/tests/languages/hu.js A numeraljs/tests/languages/it.js A numeraljs/tests/languages/ja.js A numeraljs/tests/languages/nl-nl.js A numeraljs/tests/languages/pl.js A numeraljs/tests/languages/pt-br.js A numeraljs/tests/languages/pt-pt.js A numeraljs/tests/languages/ru-UA.js A numeraljs/tests/languages/ru.js A numeraljs/tests/languages/sk.js A numeraljs/tests/languages/th.js A numeraljs/tests/languages/tr.js A numeraljs/tests/languages/uk-UA.js A numeraljs/tests/numeral/format.js A numeraljs/tests/numeral/manipulate.js A numeraljs/tests/numeral/misc.js A numeraljs/tests/numeral/unformat.js 130 files changed, 7,752 insertions(+), 596 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/src/bower_modules refs/changes/11/177011/1 -- To view, visit https://gerrit.wikimedia.org/r/177011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b79b92baf0c6ca1a9b898be21c4ce99d9be4c5e Gerrit-PatchSet: 1 Gerrit-Project:
[MediaWiki-commits] [Gerrit] Update node modules - change (wikimedia...node_modules)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177012 Change subject: Update node modules .. Update node modules Change-Id: I4f34bfa9d8ba39a99721575b0d93238a4472f33c --- A .bin/mkdirp M node-syslog/build/Makefile D node-syslog/build/Release/.deps/Release/obj.target/syslog.node.d M node-syslog/build/Release/.deps/Release/obj.target/syslog/syslog.o.d M node-syslog/build/Release/.deps/Release/syslog.node.d D node-syslog/build/Release/obj.target/syslog.node M node-syslog/build/Release/obj.target/syslog/syslog.o M node-syslog/build/Release/syslog.node M node-syslog/build/binding.Makefile M node-syslog/build/config.gypi A node-syslog/build/gyp-mac-tool M node-syslog/build/syslog.target.mk M node-syslog/package.json 13 files changed, 783 insertions(+), 139 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/node_modules refs/changes/12/177012/1 diff --git a/.bin/mkdirp b/.bin/mkdirp new file mode 12 index 000..017896c --- /dev/null +++ b/.bin/mkdirp @@ -0,0 +1 @@ +../mkdirp/bin/cmd.js \ No newline at end of file diff --git a/node-syslog/build/Makefile b/node-syslog/build/Makefile index 041cee3..5c7c97c 100644 --- a/node-syslog/build/Makefile +++ b/node-syslog/build/Makefile @@ -40,6 +40,14 @@ +CC.target ?= $(CC) +CFLAGS.target ?= $(CFLAGS) +CXX.target ?= $(CXX) +CXXFLAGS.target ?= $(CXXFLAGS) +LINK.target ?= $(LINK) +LDFLAGS.target ?= $(LDFLAGS) +AR.target ?= $(AR) + # C++ apps need to be linked with g++. # # Note: flock is used to seralize linking. Linking is a memory-intensive @@ -49,29 +57,17 @@ # export LINK=g++ # # This will allow make to invoke N linker processes as specified in -jN. -LINK ?= flock $(builddir)/linker.lock $(CXX) +LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(CXX.target) -CC.target ?= $(CC) -CFLAGS.target ?= $(CFLAGS) -CXX.target ?= $(CXX) -CXXFLAGS.target ?= $(CXXFLAGS) -LINK.target ?= $(LINK) -LDFLAGS.target ?= $(LDFLAGS) -AR.target ?= $(AR) -ARFLAGS.target ?= crsT - -# N.B.: the logic of which commands to run should match the computation done -# in gyp's make.py where ARFLAGS.host etc. is computed. # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. CC.host ?= gcc CFLAGS.host ?= CXX.host ?= g++ CXXFLAGS.host ?= -LINK.host ?= g++ +LINK.host ?= $(CXX.host) LDFLAGS.host ?= AR.host ?= ar -ARFLAGS.host := crsT # Define a dir function that can handle spaces. # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions @@ -138,43 +134,52 @@ quiet_cmd_cxx = CXX($(TOOLSET)) $@ cmd_cxx = $(CXX.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $ +quiet_cmd_objc = CXX($(TOOLSET)) $@ +cmd_objc = $(CC.$(TOOLSET)) $(GYP_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $ + +quiet_cmd_objcxx = CXX($(TOOLSET)) $@ +cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $ + +# Commands for precompiled header files. +quiet_cmd_pch_c = CXX($(TOOLSET)) $@ +cmd_pch_c = $(CC.$(TOOLSET)) $(GYP_PCH_CFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $ +quiet_cmd_pch_cc = CXX($(TOOLSET)) $@ +cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $ +quiet_cmd_pch_m = CXX($(TOOLSET)) $@ +cmd_pch_m = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $ +quiet_cmd_pch_mm = CXX($(TOOLSET)) $@ +cmd_pch_mm = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $ + +# gyp-mac-tool is written next to the root Makefile by gyp. +# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd +# already. +quiet_cmd_mac_tool = MACTOOL $(4) $ +cmd_mac_tool = ./gyp-mac-tool $(4) $ $@ + +quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@ +cmd_mac_package_framework = ./gyp-mac-tool package-framework $@ $(4) + +quiet_cmd_infoplist = INFOPLIST $@ +cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) $ -o $@ + quiet_cmd_touch = TOUCH $@ cmd_touch = touch $@ quiet_cmd_copy = COPY $@ # send stderr to /dev/null to ignore messages when linking directories. -cmd_copy = ln -f $ $@ 2/dev/null || (rm -rf $@ cp -af $ $@) +cmd_copy = rm -rf $@ cp -af $ $@ -quiet_cmd_alink = AR($(TOOLSET)) $@ -cmd_alink = rm -f $@ $(AR.$(TOOLSET)) $(ARFLAGS.$(TOOLSET)) $@ $(filter %.o,$^) +quiet_cmd_alink = LIBTOOL-STATIC $@ +cmd_alink = rm -f $@ ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^) -# Due to circular dependencies between libraries :(, we wrap the -# special figure out circular dependencies flags around the entire -# input list during linking. quiet_cmd_link = LINK($(TOOLSET)) $@ -cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) +cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS)
[MediaWiki-commits] [Gerrit] Fix issue with label on USD/sec chart - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177014 Change subject: Fix issue with label on USD/sec chart .. Fix issue with label on USD/sec chart Update node and bower too Gulped Change-Id: Ic93b0a443f226cfd60deea31d155acfbaa433e47 --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json D dist/scripts-2726ebaa.js D dist/scripts-2f3cc906.js D dist/scripts-54b46f7c.js R dist/scripts-6bccf6d8.js D dist/scripts-818129c0.js A dist/style-9087314d.css M src/components/boards/bigEnglish/bigEnglishBoard.js 10 files changed, 8,644 insertions(+), 429 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/14/177014/1 -- To view, visit https://gerrit.wikimedia.org/r/177014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic93b0a443f226cfd60deea31d155acfbaa433e47 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bower modules - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177018 Change subject: Fix bower modules .. Fix bower modules Change-Id: I9f1ab85e941f46655aaee537a98a66923f40d2b5 --- M src/bower_modules 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/18/177018/1 diff --git a/src/bower_modules b/src/bower_modules index eae6ed5..b2fafc9 16 --- a/src/bower_modules +++ b/src/bower_modules -Subproject commit eae6ed5094e35f85ad6ac315f059630928e29870 +Subproject commit b2fafc91ac5faa161a06f4f67a8af8eb60b1c6b4 -- To view, visit https://gerrit.wikimedia.org/r/177018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f1ab85e941f46655aaee537a98a66923f40d2b5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Format hourly totals to currency - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177023 Change subject: Format hourly totals to currency .. Format hourly totals to currency Change-Id: I8d6d70f85f3ba565ee867871b8ed7d0dd5a16a29 --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-207e1545.js D dist/style-9087314d.css M src/bower_modules M src/components/widgets/totals-earned-chart/totals-earned-chart.js 7 files changed, 7 insertions(+), 8,643 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/23/177023/1 -- To view, visit https://gerrit.wikimedia.org/r/177023 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d6d70f85f3ba565ee867871b8ed7d0dd5a16a29 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix navbar padding on collapse - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177024
Change subject: fix navbar padding on collapse
..
fix navbar padding on collapse
Change-Id: I44460d629202b5b0880c7e9bf9e0fe2b9cf28b13
---
M src/components/nav-bar/nav-bar.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/24/177024/1
diff --git a/src/components/nav-bar/nav-bar.js
b/src/components/nav-bar/nav-bar.js
index 80676ad..4f498e4 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -13,7 +13,7 @@
//make the nav menu fold out of view.
$('#navContainer .navWrapper').toggleClass('hide');
$('#showNavMenu').css('display', 'inline');
-$('#dashApp').css('padding', '0 0 0 55px');
+$('#dashApp').css('padding', '0 0 0 80px');
};
self.showNav = function(){
--
To view, visit https://gerrit.wikimedia.org/r/177024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44460d629202b5b0880c7e9bf9e0fe2b9cf28b13
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: deployment
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new forms for WorlPay - Big English countries - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176791
Change subject: Add new forms for WorlPay - Big English countries
..
Add new forms for WorlPay - Big English countries
Also add updated Visa logo, Diner's Club logo, add AmEx to French forms
Change-Id: I55175ff2d2c4bcac94702e391d65b978384440d5
---
A gateway_forms/includes/card-dinersclub.png
M gateway_forms/includes/card-visa.png
M worldpay_gateway/forms/css/worldpay.css
A worldpay_gateway/forms/html/_personal-information/AU.html
A worldpay_gateway/forms/html/_personal-information/CA.html
A worldpay_gateway/forms/html/_personal-information/GB.html
A worldpay_gateway/forms/html/_wp_ott_form/AU.html
A worldpay_gateway/forms/html/_wp_ott_form/CA.html
A worldpay_gateway/forms/html/_wp_ott_form/FR.html
A worldpay_gateway/forms/html/_wp_ott_form/GB.html
A worldpay_gateway/forms/html/_wp_ott_form/NZ.html
A worldpay_gateway/forms/html/_wp_ott_form/US.html
M worldpay_gateway/forms/html/_wp_ott_form/default.html
13 files changed, 610 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/91/176791/1
diff --git a/gateway_forms/includes/card-dinersclub.png
b/gateway_forms/includes/card-dinersclub.png
new file mode 100644
index 000..3cb68f3
--- /dev/null
+++ b/gateway_forms/includes/card-dinersclub.png
Binary files differ
diff --git a/gateway_forms/includes/card-visa.png
b/gateway_forms/includes/card-visa.png
index 6cd86b8..b015842 100644
--- a/gateway_forms/includes/card-visa.png
+++ b/gateway_forms/includes/card-visa.png
Binary files differ
diff --git a/worldpay_gateway/forms/css/worldpay.css
b/worldpay_gateway/forms/css/worldpay.css
index 0f6b60b..10b4515 100644
--- a/worldpay_gateway/forms/css/worldpay.css
+++ b/worldpay_gateway/forms/css/worldpay.css
@@ -91,7 +91,14 @@
.ccAreaHeader {
width: 100%;
}
-select#state.us, select#state.au, select#state.ca, select#country {
+.ccAreaHeader .row-fluid .pull-left {
+ height: 25px;
+}
+select#state.us,
+select#state.gb,
+select#state.au,
+select#state.ca,
+select#country {
height: 30px;
width: 100%;
line-height: 170%;
diff --git a/worldpay_gateway/forms/html/_personal-information/AU.html
b/worldpay_gateway/forms/html/_personal-information/AU.html
new file mode 100644
index 000..b059c47
--- /dev/null
+++ b/worldpay_gateway/forms/html/_personal-information/AU.html
@@ -0,0 +1,42 @@
+div class=row-fluid
+ div class=col-md-12
+ h3 class=cc_header%donate_interface-amount-legend%: span
id=selected-amount{% block donation-amount currency_code %}/spanimg
src=@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif
style=vertical-align:baseline;margin-left:8px;/h3
+ /div
+/div
+div class=row-fluid
+ div class=col-md-6
+ label for=fname
id=fname-label%donate_interface-donor-fname%/label
+ input class=form-control value=@fname type=text
id=fname
+ /div
+
+ div class=col-md-6
+ label for=lname
id=lname-label%donate_interface-donor-lname%/label
+ input class=form-control value=@lname type=text
id=lname
+ /div
+/div
+div class=row-fluid
+ div class=col-md-12span class=creditcard-error-msg/span/div
+/div
+div class=row-fluid
+ div class=col-md-6
+ labelState:/label
+ select id=state name=state class=au value=@state
+ option value= disabled selectedState/option
+ option value=ACTACT/option
+ option value=NSWNSW/option
+ option value=NTNT/option
+ option value=QLDQLD/option
+ option value=SASA/option
+ option value=TASTAS/option
+ option value=VICVIC/option
+ option value=WAWA/option
+ /select
+ /div
+div class=col-md-6
+ label for=emailAdd
id=emailAdd-label%donate_interface-donor-email%/label
+ input class=form-control value=@emailAdd type=text
title=%donate_interface-donor-email% id=emailAdd
+ /div
+/div
+div style=display: none;
+ input type=hidden value=@country name=country id=country /
+/div
\ No newline at end of file
diff --git a/worldpay_gateway/forms/html/_personal-information/CA.html
b/worldpay_gateway/forms/html/_personal-information/CA.html
new file mode 100644
index 000..acac247
--- /dev/null
+++ b/worldpay_gateway/forms/html/_personal-information/CA.html
@@ -0,0 +1,71 @@
+div class=row-fluid
+ div class=col-md-12
+ h3 class=cc_header%donate_interface-amount-legend%: span
id=selected-amount{% block donation-amount currency_code %}/spanimg
src=@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif
[MediaWiki-commits] [Gerrit] Fix unwanted display of country dropdown - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/176798 Change subject: Fix unwanted display of country dropdown .. Fix unwanted display of country dropdown The default personal info template for GC doesn't need to show the country dropdown and isn't hidden, so this fixes that Change-Id: I513605c309b83a92bea989d07ae6650158175b75 --- M globalcollect_gateway/forms/html/_personal-information/default.html 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/98/176798/1 diff --git a/globalcollect_gateway/forms/html/_personal-information/default.html b/globalcollect_gateway/forms/html/_personal-information/default.html index a5afb50..79d589d 100644 --- a/globalcollect_gateway/forms/html/_personal-information/default.html +++ b/globalcollect_gateway/forms/html/_personal-information/default.html @@ -18,12 +18,5 @@ input class=fullwidth optional name=city value=@city type=text title=%donate_interface-city-town% placeholder=%donate_interface-city-town% id=city /td /tr -tr -td colspan=2 -select class=txt id=country name=country value=@country placeholder=%donate_interface-country% -option value=%donate_interface-select-country%/option - @select_country -/select -/td -/tr + -- To view, visit https://gerrit.wikimedia.org/r/176798 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I513605c309b83a92bea989d07ae6650158175b75 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Big English countries to form settings - change (mediawiki/core)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/176849 Change subject: Add Big English countries to form settings .. Add Big English countries to form settings Change-Id: I147bb84dcf469ce0d98e48e4a2d931c66f4e572d --- M DonationInterfaceFormSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/49/176849/1 diff --git a/DonationInterfaceFormSettings.php b/DonationInterfaceFormSettings.php index 1024103..f92ae27 100644 --- a/DonationInterfaceFormSettings.php +++ b/DonationInterfaceFormSettings.php @@ -488,7 +488,7 @@ $forms_whitelist['worldpay'] = array( 'file' = $form_dirs['worldpay'] . '/worldpay.html', 'gateway' = 'worldpay', - 'countries' = array( '+' = array( 'BE', 'FR', 'US' ) ), + 'countries' = array( '+' = array( 'AU', 'BE', 'CA', 'FR', 'GB', 'NZ', 'US' ) ), 'currencies' = array( '+' = 'ALL' ), 'payment_methods' = array( 'cc' = 'ALL' ), 'selection_weight' = 0 -- To view, visit https://gerrit.wikimedia.org/r/176849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I147bb84dcf469ce0d98e48e4a2d931c66f4e572d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove AU State label and newline email - change (mediawiki...DonationInterface)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/176866 Change subject: Remove AU State label and newline email .. Remove AU State label and newline email Change-Id: I7d3b0f5c4d61d889a889bff263784046dd5b0962 --- M globalcollect_gateway/forms/html/_personal-information/AU.html 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/66/176866/1 diff --git a/globalcollect_gateway/forms/html/_personal-information/AU.html b/globalcollect_gateway/forms/html/_personal-information/AU.html index 48eb32b..81aef38 100644 --- a/globalcollect_gateway/forms/html/_personal-information/AU.html +++ b/globalcollect_gateway/forms/html/_personal-information/AU.html @@ -16,7 +16,6 @@ /tr tr td colspan=2 style=white-space: nowrap; - labelState:/label select id=state name=state class=au value=@state option value= disabled selectedState/option option value=ACTACT/option @@ -28,6 +27,10 @@ option value=VICVIC/option option value=WAWA/option /select + /td +/tr +tr + td input class=fullwidth name=emailAdd value=@emailAdd type=text title=%donate_interface-donor-email% placeholder=%donate_interface-donor-email% id=emailAdd /td /tr -- To view, visit https://gerrit.wikimedia.org/r/176866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d3b0f5c4d61d889a889bff263784046dd5b0962 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add totals earned chart widget - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175742
Change subject: Add totals earned chart widget
..
Add totals earned chart widget
Change-Id: I1881e92e727e7aaa467b57d36633e36d67a65944
---
M src/app/require.config.js
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/boards/bigEnglish/bigEnglishBoard.js
A src/components/widgets/totals-earned-chart/totals-earned-chart.html
A src/components/widgets/totals-earned-chart/totals-earned-chart.js
6 files changed, 175 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/42/175742/1
diff --git a/src/app/require.config.js b/src/app/require.config.js
index 8568383..3908307 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -21,7 +21,8 @@
'microplugin': 'bower_modules/microplugin/src/microplugin',
'selectize':'bower_modules/selectize/dist/js/selectize',
'c3': 'bower_modules/c3/c3',
-'numeraljs':'bower_modules/numeraljs/numeral'
+'numeraljs':'bower_modules/numeraljs/numeral',
+'decemberData': 'bower_modules/fakeData/decemberData'
},
shim: {
'bootstrap': {
diff --git a/src/app/startup.js b/src/app/startup.js
index 28c4400..5c451c9 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -20,6 +20,8 @@
//register individual widgets
ko.components.register( 'fraud-gauge',{ require:
'components/widgets/fraud-gauge/fraud-gauge' });
+ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
+
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index f4a9029..a6c0ef9 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -61,6 +61,8 @@
/div
/div
+totals-earned-chart params=title: 'Donation Amounts by Day in December',
dailyDataArray: dailyDataArray, dayObj: dayObj/totals-earned-chart
+
div class=modal fade id=bigEsqlModal
div class=modal-dialog
div class=modal-content
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index dedda02..41427e9 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -37,6 +37,56 @@
return numeral(trtd).format('$0,0');
});
+self.decemberData = [];
+self.queryString = ko.observable(Year eq '2014');
+$.get( '/data/big-english?' + $.param({ '$filter': self.queryString()
}).replace(
+ /\+/g, '%20' ), function ( dataget ) {
+self.decemberData = dataget.results;
+});
+
+
+self.dailyDonationLabels = [];
+self.secondsByHourDonationData = ['Donations Per Second'];
+self.dailyDonationData = {};
+
+//initialize day/hour data
+self.dayObj = {};
+$.each(self.decemberData, function(el, i){
+if(!self.dayObj[self.decemberData[el].day]){
+self.dayObj[self.decemberData[el].day] = [ 'Hourly Totals',
self.decemberData[el].usd_total ];
+} else {
+
self.dayObj[self.decemberData[el].day].push(self.decemberData[el].usd_total);
+}
+});
+
+$.each(self.decemberData, function(i, el){
+
+//get labels from chart based on where we are in December.
+if (self.dailyDonationLabels.indexOf(el.day) 0){
+self.dailyDonationLabels.push(el.day);
+}
+
+//get data slice for days: donation amt
+if(self.dailyDonationData[el.day]){
+self.dailyDonationData[el.day] += el.usd_total;
+} else {
+self.dailyDonationData[el.day] = el.usd_total;
+}
+
+//get all seconds into seconds array
+self.secondsByHourDonationData.push(el.usd_per_second);
+
+});
+
+self.dailyDonations = $.map(self.dailyDonationData, function(p, k){
+return p;
+});
+
+self.dailyDataArray = ['Daily Total'];
+$.each( self.dailyDonationData, function(el, i){
+self.dailyDataArray.push(self.dailyDonationData[el]);
+});
+
}
return { viewModel: BigEnglishBoardViewModel, template: template };
diff --git
a/src/components/widgets/totals-earned-chart/totals-earned-chart.html
b/src/components/widgets/totals-earned-chart/totals-earned-chart.html
new file mode 100644
index 000..6afc0ff
--- /dev/null
+++
[MediaWiki-commits] [Gerrit] Add amount per second chart views - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175903
Change subject: Add amount per second chart views
..
Add amount per second chart views
Change-Id: Ief5bed541cce6e579ddde0f35dae8128fa2bd146
---
M src/app/startup.js
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/boards/bigEnglish/bigEnglishBoard.js
A src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
A src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
5 files changed, 73 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/03/175903/1
diff --git a/src/app/startup.js b/src/app/startup.js
index d5285a9..d564500 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -22,7 +22,7 @@
ko.components.register( 'fraud-gauge',{ require:
'components/widgets/fraud-gauge/fraud-gauge' });
ko.components.register( 'totals-earned-chart',{ require:
'components/widgets/totals-earned-chart/totals-earned-chart' });
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
-
+ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index de8be14..3f68b0b 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -65,6 +65,7 @@
div class=row
distance-to-goal-chart params=title: 'Distance To Goal', dailyDonations:
dailyDonations, goal: goal/distance-to-goal-chart
+amt-per-second-chart params=title: 'Distance To Goal', dailyDonations:
dailyDonations, goal: goal, secondsByHourDonationData:
secondsByHourDonationData/amt-per-second-chart
/div
div class=modal fade id=bigEsqlModal
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 41427e9..fedd43c 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -38,6 +38,8 @@
});
self.decemberData = [];
+
+//default value
self.queryString = ko.observable(Year eq '2014');
$.get( '/data/big-english?' + $.param({ '$filter': self.queryString()
}).replace(
/\+/g, '%20' ), function ( dataget ) {
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
new file mode 100644
index 000..312c8f1
--- /dev/null
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -0,0 +1,12 @@
+div class=col-md-6 layoutRow
+ div class=panel panel-purple
+ div class=panel-heading
+ p data-bind=text: titleUSD/Second Required
(Average)/p
+ /div
+ div class=panel-body
+ div class=col-md-12
+ div id=avgUSDperSecond/div
+ /div
+ /div
+ /div
+/div
\ No newline at end of file
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
new file mode 100644
index 000..e56dea0
--- /dev/null
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -0,0 +1,57 @@
+define( [
+'knockout',
+'text!components/widgets/amt-per-second-chart/amt-per-second-chart.html',
+'c3'
+], function( ko, template, c3 ){
+
+
+function AmtPerSecondChartViewModel( params ){
+
+var self = this;
+
+self.title = ko.observable(params.title);
+self.goal = ko.observable(params.goal);
+self.raised = ko.observable(params.raised);
+self.secondsByHourDonationData =
ko.observable(params.secondsByHourDonationData);
+
+self.updatedGoal = self.goal;
+self.neededArray = $.map( self.dailyDonations, function( val, i ){
+self.updatedGoal = self.updatedGoal - val;
+return self.updatedGoal;
+});
+
+self.perSecondArray = $.map(self.neededArray, function(val, i){
+return (val/31)/24)/60)/60));
+});
+self.secondsByDayArray = ['Needed Per Second'];
+$.each(self.perSecondArray, function(val, i){
+for(var i=0; i25; i++){
+self.secondsByDayArray.push(self.perSecondArray[val]);
+}
+});
+
+self.perSecondArray.unshift('Per Second');
+self.avgUSDComboChart = c3.generate({
+
[MediaWiki-commits] [Gerrit] Update with numeralJS and fontawesome upgrade - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/175493 Change subject: Update with numeralJS and fontawesome upgrade .. Update with numeralJS and fontawesome upgrade Change-Id: I28595c28ab5d4a607295db58dc06cb2b3fadbdb3 --- A c3/.bower.json M c3/bower.json D c3/htdocs/css/c3.css D c3/htdocs/js/c3.js D c3/htdocs/js/c3.min.js D c3/htdocs/js/extensions M fontawesome/.bower.json A fontawesome/bower.json M fontawesome/css/font-awesome.css M fontawesome/css/font-awesome.min.css M fontawesome/fonts/FontAwesome.otf M fontawesome/fonts/fontawesome-webfont.eot M fontawesome/fonts/fontawesome-webfont.svg M fontawesome/fonts/fontawesome-webfont.ttf M fontawesome/fonts/fontawesome-webfont.woff M fontawesome/less/core.less M fontawesome/less/font-awesome.less M fontawesome/less/icons.less M fontawesome/less/list.less M fontawesome/less/mixins.less M fontawesome/less/path.less M fontawesome/less/rotated-flipped.less M fontawesome/less/spinning.less M fontawesome/less/variables.less M fontawesome/scss/_core.scss M fontawesome/scss/_icons.scss M fontawesome/scss/_mixins.scss M fontawesome/scss/_rotated-flipped.scss M fontawesome/scss/_spinning.scss M fontawesome/scss/_variables.scss M fontawesome/scss/font-awesome.scss A numeraljs/.bower.json A numeraljs/.gitignore A numeraljs/.travis.yml A numeraljs/Gruntfile.js A numeraljs/LICENSE A numeraljs/README.md A numeraljs/bower.json A numeraljs/component.json A numeraljs/languages.js A numeraljs/languages/be-nl.js A numeraljs/languages/chs.js A numeraljs/languages/cs.js A numeraljs/languages/da-dk.js A numeraljs/languages/de-ch.js A numeraljs/languages/de.js A numeraljs/languages/en-gb.js A numeraljs/languages/es-ES.js A numeraljs/languages/es.js A numeraljs/languages/et.js A numeraljs/languages/fi.js A numeraljs/languages/fr-CA.js A numeraljs/languages/fr-ch.js A numeraljs/languages/fr.js A numeraljs/languages/hu.js A numeraljs/languages/it.js A numeraljs/languages/ja.js A numeraljs/languages/nl-nl.js A numeraljs/languages/pl.js A numeraljs/languages/pt-br.js A numeraljs/languages/pt-pt.js A numeraljs/languages/ru-UA.js A numeraljs/languages/ru.js A numeraljs/languages/sk.js A numeraljs/languages/th.js A numeraljs/languages/tr.js A numeraljs/languages/uk-UA.js A numeraljs/min/languages.min.js A numeraljs/min/languages/be-nl.min.js A numeraljs/min/languages/chs.min.js A numeraljs/min/languages/cs.min.js A numeraljs/min/languages/da-dk.min.js A numeraljs/min/languages/de-ch.min.js A numeraljs/min/languages/de.min.js A numeraljs/min/languages/en-gb.min.js A numeraljs/min/languages/es-ES.min.js A numeraljs/min/languages/es.min.js A numeraljs/min/languages/et.min.js A numeraljs/min/languages/fi.min.js A numeraljs/min/languages/fr-CA.min.js A numeraljs/min/languages/fr-ch.min.js A numeraljs/min/languages/fr.min.js A numeraljs/min/languages/hu.min.js A numeraljs/min/languages/it.min.js A numeraljs/min/languages/ja.min.js A numeraljs/min/languages/nl-nl.min.js A numeraljs/min/languages/pl.min.js A numeraljs/min/languages/pt-br.min.js A numeraljs/min/languages/pt-pt.min.js A numeraljs/min/languages/ru-UA.min.js A numeraljs/min/languages/ru.min.js A numeraljs/min/languages/sk.min.js A numeraljs/min/languages/th.min.js A numeraljs/min/languages/tr.min.js A numeraljs/min/languages/uk-UA.min.js A numeraljs/min/numeral.min.js A numeraljs/numeral.js A numeraljs/package.json A numeraljs/tests/languages/be-nl.js A numeraljs/tests/languages/chs.js A numeraljs/tests/languages/cs.js A numeraljs/tests/languages/da-dk.js A numeraljs/tests/languages/de-ch.js A numeraljs/tests/languages/de.js A numeraljs/tests/languages/en-gb.js A numeraljs/tests/languages/en.js A numeraljs/tests/languages/es-ES.js A numeraljs/tests/languages/es.js A numeraljs/tests/languages/et.js A numeraljs/tests/languages/fi.js A numeraljs/tests/languages/fr-CA.js A numeraljs/tests/languages/fr-ch.js A numeraljs/tests/languages/fr.js A numeraljs/tests/languages/hu.js A numeraljs/tests/languages/it.js A numeraljs/tests/languages/ja.js A numeraljs/tests/languages/nl-nl.js A numeraljs/tests/languages/pl.js A numeraljs/tests/languages/pt-br.js A numeraljs/tests/languages/pt-pt.js A numeraljs/tests/languages/ru-UA.js A numeraljs/tests/languages/ru.js A numeraljs/tests/languages/sk.js A numeraljs/tests/languages/th.js A numeraljs/tests/languages/tr.js A numeraljs/tests/languages/uk-UA.js A numeraljs/tests/numeral/format.js A numeraljs/tests/numeral/manipulate.js A numeraljs/tests/numeral/misc.js A numeraljs/tests/numeral/unformat.js 130 files changed, 7,752 insertions(+), 596 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/src/bower_modules refs/changes/93/175493/1 -- To view, visit https://gerrit.wikimedia.org/r/175493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28595c28ab5d4a607295db58dc06cb2b3fadbdb3 Gerrit-PatchSet: 1
[MediaWiki-commits] [Gerrit] Big English header piece - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175055
Change subject: Big English header piece
..
Big English header piece
Change-Id: Ia3e7b9f928b7195a0a5a2b790960be90999f8c91
---
M src/app/startup.js
M src/components/app-content/app-content.html
A src/components/widgets/big-english/big-english-header.html
A src/components/widgets/big-english/big-english-header.js
4 files changed, 56 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/55/175055/1
diff --git a/src/app/startup.js b/src/app/startup.js
index eee8bf9..9fb395d 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -16,8 +16,7 @@
ko.components.register( 'date-pickers', { require:
'components/utils/date-pickers/date-pickers' });
//register individual widgets
-
-ko.components.register( 'big-english',{ require:
'components/widgets/big-english/big-english' });
+ko.components.register( 'big-english-header',{ require:
'components/widgets/big-english/big-english-header' });
ko.components.register( 'fraud-gauge',{ require:
'components/widgets/fraud-gauge/fraud-gauge' });
//fire up router
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 031f32f..8bb9718 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,6 +1,6 @@
div class=container-fluid
div class=row
- div data-bind=component: 'big-english'
class=col-md-12/div
+ div data-bind=component: 'big-english-header'
class=col-md-12/div
/div
div class=row
div data-bind=component: 'fraud-gauge'
class=col-md-4/div
diff --git a/src/components/widgets/big-english/big-english-header.html
b/src/components/widgets/big-english/big-english-header.html
new file mode 100644
index 000..32f82b8
--- /dev/null
+++ b/src/components/widgets/big-english/big-english-header.html
@@ -0,0 +1,28 @@
+div class=row
+ div class=col-md-4 titleCol
+ h2 style=display:inlineBig English Monitoring/h2
+ p data-bind=text: getTodaysDate/p
+ /div
+ div class=col-md-8 titleCol
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-default dropdown-toggle
data-toggle=modal data-target=#bigEsqlModali class=fa
fa-database/i/button
+ button type=button class=btn btn-default data-bind=click:
reloadBigEnglishi class=fa fa-refresh/i/button
+ /div
+ /div
+/div
+div class=modal fade id=bigEsqlModal
+div class=modal-dialog
+div class=modal-content
+div class=modal-header
+button type=button class=close data-dismiss=modalspan
aria-hidden=truetimes;/spanspan class=sr-onlyClose/span/button
+h4 class=modal-titleBig English SQL:/h4
+/div
+div class=modal-body
+ h4All December Hours:/h4
+ pselect count(*) as donations, sum(total_amount) as
usd_total, CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60) as minutes,
sum(total_amount)/CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60)/60 as usd_per_second, DAY(receive_date) as day,
HOUR(receive_date) as hour from civicrm_contribution WHERE MONTH(receive_date)
= 12 AND YEAR(receive_date) = 2013 AND total_amount 5000 GROUP BY
DAY(receive_date), HOUR(receive_date) ORDER BY day ASC, hour ASC;/p
+ h4All December Days:/h4
+ pselect count(*) as donations, sum(total_amount) as
usd_total, CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60) as minutes,
sum(total_amount)/CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60)/60 as usd_per_second, MONTH(receive_date) as month,
DAY(receive_date) as day from civicrm_contribution WHERE MONTH(receive_date) =
12 AND YEAR(receive_date) = 2013 AND total_amount 5000 GROUP BY
MONTH(receive_date), DAY(receive_date) ORDER BY month ASC, day ASC;/p
+/div
+/div!-- /.modal-content --
+/div!-- /.modal-dialog --
+/div!-- /.modal --
\ No newline at end of file
diff --git a/src/components/widgets/big-english/big-english-header.js
b/src/components/widgets/big-english/big-english-header.js
new file mode 100644
index 000..7270721
--- /dev/null
+++ b/src/components/widgets/big-english/big-english-header.js
@@ -0,0 +1,26 @@
+define( [
+'knockout',
+'text!components/widgets/big-english/big-english-header.html',
+'momentjs'
+], function( ko, template, moment ){
+
+
+function BigEnglishHeaderViewModel( params ){
+
+var self = this;
+
+// Get the date
+self.getTodaysDate = ko.computed( function(){
+
[MediaWiki-commits] [Gerrit] Show actual SQL instead of query string in db modal - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173632
Change subject: Show actual SQL instead of query string in db modal
..
Show actual SQL instead of query string in db modal
Change-Id: Ib6e2a70aaaed70d0c574c42b02ef9e08f4d2bbab
---
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/32/173632/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 1df020c..ed3ca18 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -115,7 +115,7 @@
button type=button class=close
data-dismiss=modalspan aria-hidden=truetimes;/spanspan
class=sr-onlyClose/span/button
h4 class=modal-titleFraud Gauge SQL:/h4
/div
-div class=modal-body data-bind=text:
queryString/div
+div class=modal-body data-bind=text:
queryStringSQL/div
/div!-- /.modal-content --
/div!-- /.modal-dialog --
/div!-- /.modal --
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index cc956f8..55e61be 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -47,7 +47,8 @@
self.gaugeValue = ko.observable(0);
self.filtersSelected = ko.observable(false);
self.gaugeIsSetUp = ko.observable(false);
-self.queryString = ko.observable('This widget hasn\'t been set up yet!');
+self.queryString = ko.observable('');
+self.queryStringSQL = ko.observable('This widget hasn\'t been set up
yet!');
//broken down data from above
self.filters = ko.observableArray($.map(self.data.filters, function(val,
i){return[val]}));
@@ -171,7 +172,7 @@
} else {
qs += filterObj[el];
}
-qs += ' and ';
+//qs += ' and ';
});
//convert time constraints
@@ -208,7 +209,7 @@
postQS = ds;
}
- return postQS;
+ return qs;
};
self.showSubfilters = function(stuff){
@@ -263,7 +264,8 @@
$.get( '/data/fraud?' + $.param({ '$filter': self.queryString()
}).replace(
/\+/g, '%20' ), function ( dataget ) {
self.gaugeIsSetUp(true);
- self.gaugeValue(parseFloat(dataget[0].fraud_percent).toFixed(2) );
+ self.gaugeValue(parseFloat(dataget[0][0].fraud_percent).toFixed(2) );
+ self.queryStringSQL(dataget[1]);
self.gauge = c3.generate({
bindto: '#FraudRiskScoreGauge',
@@ -288,7 +290,7 @@
color: {
pattern: ['#FF', '#F97600', '#F6C600', '#60B044'], //
the three color levels for the percentage values.
threshold: {
- values: [ 0, self.greenHighRange,
self.yellowRange().high, 100]
+ values: [ 0, self.greenHighRange, self.redLowRange, 100]
}
}
});
--
To view, visit https://gerrit.wikimedia.org/r/173632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6e2a70aaaed70d0c574c42b02ef9e08f4d2bbab
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] satisfy ruby lint - change (mediawiki...CentralNotice)
Ssmith has submitted this change and it was merged.
Change subject: satisfy ruby lint
..
satisfy ruby lint
Change-Id: Ia97212bc5f3e1bba43c43a0da095c607f957ebb7
---
M tests/browser/features/step_definitions/banner_steps.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/article_page.rb
3 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/tests/browser/features/step_definitions/banner_steps.rb
b/tests/browser/features/step_definitions/banner_steps.rb
index 86a736f..4cf57fe 100644
--- a/tests/browser/features/step_definitions/banner_steps.rb
+++ b/tests/browser/features/step_definitions/banner_steps.rb
@@ -3,7 +3,7 @@
end
When(/^I view an article$/) do
- params = { article_name: Special:Random }
+ params = { article_name: 'Special:Random' }
params[:query] = random=#{@override_random} if @override_random
visit(ArticlePage, using_params: params)
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
index 6bc910b..cd3d343 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -1,2 +1,2 @@
# Needed for cucumber --dry-run -f stepdefs
-require_relative env
+require_relative 'env'
diff --git a/tests/browser/features/support/pages/article_page.rb
b/tests/browser/features/support/pages/article_page.rb
index 78931c2..64a4791 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -1,7 +1,13 @@
+# Article page, potentially has a CentralNotice overlay
+#
+# Supports query parameters, which are used to override default
+# banner controller behaviors.
class ArticlePage
include PageObject
- page_url URL.url('%= params[:article_name] %%= ?#{params[:query]} if
params[:query] %')
+ url_template = '%= params[:article_name] %' \
+'%= ?#{params[:query]} if params[:query] %'
+ page_url URL.url(url_template)
- div(:banner_name, id: centralnotice_testbanner_name)
+ div(:banner_name, id: 'centralnotice_testbanner_name')
end
--
To view, visit https://gerrit.wikimedia.org/r/172947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia97212bc5f3e1bba43c43a0da095c607f957ebb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix range values - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173064
Change subject: Fix range values
..
Fix range values
WIP, textInput binding still not updating
Change-Id: Idad77687b7e7544efdeddf62f48012435b6bfe9d
---
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 13 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/64/173064/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 3839ade..ebd9a65 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -50,7 +50,7 @@
div class=col-md-4
col-sm-4 col-lg-4
labellow fraud
score: up to/label
div
class=input-group
- input type=text
class=form-control data-bind=textInput: yellowRange().low
+ input type=text
class=form-control data-bind=textInput: greenHighRange()
span
class=input-group-btn
button class=btn
btn-success percentBtn type=buttoni class=fa fa-refresh/i/button
/span
@@ -60,14 +60,14 @@
labelmid-level
score:/label
div
class=input-group
span
class=input-group-btn
-button class=btn
btn-warning percentBtn type=buttonspan data-bind=text:yellowRange().low +
'% to ' + yellowRange().high + '%'/button
+button class=btn
btn-warning percentBtn type=buttonspan data-bind=text:greenHighRange() +
'% to ' + redLowRange() + '%'/button
/span
/div
/div
div class=col-md-4
col-sm-4 col-lg-4
labelhigh fraud
score: from/label
div
class=input-group
-input type=text
class=form-control data-bind=textInput: yellowRange().high
+input type=text
class=form-control data-bind=textInput: redLowRange()
span
class=input-group-btn
button class=btn
btn-danger percentBtn type=buttoni class=fa fa-refresh/i/button
/span
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 995a690..c3632ed 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -38,9 +38,8 @@
});
//default range slider settings
-self.greenRange = ko.observable({ low: 0, high: 17 });
-self.yellowRange = ko.observable({ low: 17, high: 68 });
-self.redRange = ko.observable({ low: 68, high: 100 });
+self.greenHighRange = ko.observable(17);
+self.redLowRange = ko.observable(68);
//color selection inside modal
var canvas = $('#fraudPercentSlider')[0];
@@ -55,13 +54,13 @@
value: 90,
color: '#00'
},{
-value: 1.8 * (self.greenRange().high - self.greenRange().low),
+value: 1.8 * (self.greenHighRange()),
color: '#4cae4c'
},{
-value: 1.8 * (self.yellowRange().high - self.yellowRange().low),
+value: 1.8 * (self.redLowRange() - self.greenHighRange()),
color: '#eea236'
}, {
-value: 1.8 * (self.redRange().high - self.redRange().low),
+value: 1.8 * (100 - self.redLowRange()),
color: '#c9302c'
},{
value: 90,
@@ -71,26 +70,13 @@
new Chart(placeholderctx).Doughnut(ddata, {
animation: false,
segmentShowStroke: false,
+
onAnimationComplete: function() {
- function drawLine(color,left,top,bottom){
-placeholderctx.strokeStyle = color;
-placeholderctx.lineWidth = 1;
-
-placeholderctx.beginPath();
-
-
[MediaWiki-commits] [Gerrit] Extend ChartJS and make selection chart dynamic - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173190
Change subject: Extend ChartJS and make selection chart dynamic
..
Extend ChartJS and make selection chart dynamic
This should be the final fix.
Change-Id: Ied20aaf57a97f358ce419811d70b62e1e4443386
---
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 77 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/90/173190/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 4a27a99..0afe677 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -50,7 +50,7 @@
div class=col-md-4
col-sm-4 col-lg-4
labellow fraud
score: up to/label
div
class=input-group
- input type=text
class=form-control data-bind=textInput: greenHighRange
+ input type=text
class=form-control data-bind=textInput: greenHighRange, event: { mouseout:
renderGaugeChart }
span
class=input-group-btn
button class=btn
btn-success percentBtn type=buttoni class=fa fa-refresh/i/button
/span
@@ -67,7 +67,7 @@
div class=col-md-4
col-sm-4 col-lg-4
labelhigh fraud
score: from/label
div
class=input-group
-input type=text
class=form-control data-bind=textInput: redLowRange
+input type=text
class=form-control data-bind=textInput: redLowRange, event: { mouseout:
renderGaugeChart }
span
class=input-group-btn
button class=btn
btn-danger percentBtn type=buttoni class=fa fa-refresh/i/button
/span
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index c3632ed..1b1a004 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -6,6 +6,28 @@
'chartjs'
],
function( ko, template, datePickersTemplate, c3, chartjs ){
+ //extend the chart so we can flip the circle
+ Chart.types.Doughnut.extend({
+addData: function(segment, atIndex, silent){
+var index = atIndex || this.segments.length;
+this.segments.splice(index, 0, new this.SegmentArc({
+ value : segment.value,
+ outerRadius : (this.options.animateScale) ? 0 : this.outerRadius,
+ innerRadius : (this.options.animateScale) ? 0 : (this.outerRadius/100) *
this.options.percentageInnerCutout,
+ fillColor : segment.color,
+ highlightColor : segment.highlight || segment.color,
+ showStroke : this.options.segmentShowStroke,
+ strokeWidth : this.options.segmentStrokeWidth,
+ strokeColor : this.options.segmentStrokeColor,
+ startAngle : Math.PI * 2.5,
+ circumference : (this.options.animateRotate) ? 0 :
this.calculateCircumference(segment.value),
+ label : segment.label
+}));
+if (!silent){
+ this.reflow();
+ this.update();
+}
+ }});
function FraudGaugeViewModel( params ){
@@ -41,55 +63,65 @@
self.greenHighRange = ko.observable(17);
self.redLowRange = ko.observable(68);
-//color selection inside modal
-var canvas = $('#fraudPercentSlider')[0];
-var ctx = canvas.getContext('2d');
+self.renderGaugeChart = function(){
-var placeholder = document.createElement('canvas');
-placeholder.width = 200;
-placeholder.height = placeholder.width;
-var placeholderctx = placeholder.getContext('2d');
+ //color selection inside modal
+ var canvas = $('#fraudPercentSlider')[0];
+ var ctx = canvas.getContext('2d');
-var ddata = [{
-value: 90,
-color: '#00'
-},{
-value: 1.8 * (self.greenHighRange()),
-color: '#4cae4c'
-},{
-value: 1.8 * (self.redLowRange() - self.greenHighRange()),
-color: '#eea236'
-}, {
-value: 1.8 * (100 - self.redLowRange()),
-color: '#c9302c'
-},{
-value: 90,
-color: '#00'
-
[MediaWiki-commits] [Gerrit] Make navbar px-perfect - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173224
Change subject: Make navbar px-perfect
..
Make navbar px-perfect
It was bugging me
Change-Id: Ie5b712ef35b4bf3e25e6f944da255e3cfa3eecde
---
M src/components/nav-bar/nav-bar.html
M src/css/style.css
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/24/173224/1
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index f6967a0..2504971 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -1,12 +1,12 @@
div id=navContainer
div class=boxedIcon id=showNavMenu data-bind=click: showNavi
class=fa fa-th-list/i/div
div class=navWrapper
- div class=row text-center
+ div class=row text-center navRow
h2 class='titlebrand'Dash/h2
/div
- div class=row sidebar-nav
- div class=col-md-12
+ div class=row sidebar-nav navRow
+ div class=col-md-12 navRow
div class=row-fluid
ul
lispan
id=navDefaultBoardi class=fa fa-dashboard/span/i/li
diff --git a/src/css/style.css b/src/css/style.css
index 9a0e228..c5e90d9 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -23,6 +23,12 @@
padding-top: 50px;
}
+.navRow {
+width: 100px;
+padding:0;
+margin: 0;
+}
+
.navWrapper {
margin-left: -100px;
left: 100px;
@@ -47,7 +53,7 @@
.sidebar-nav li {
font-size: 24px;
display: inline-block;
-width: 48%;
+width: 48.5px;
text-align: center;
padding: .5em;
}
--
To view, visit https://gerrit.wikimedia.org/r/173224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5b712ef35b4bf3e25e6f944da255e3cfa3eecde
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Push working changes to github - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/172937 Change subject: Push working changes to github .. Push working changes to github Change-Id: I88a91d42983a2b7a6beb972cbafd8d7f6f41b91e --- D dist/css.manifest.json D dist/date-pickers-d41d8cd9.js M dist/index.html M dist/js.manifest.json D dist/scripts-9404b997.js A dist/scripts-96174ee6.js R dist/style-87d67a7a.css M routes/data.js M server.js M src/bower_modules M src/components/widgets/fraud-gauge/fraud-gauge.html M src/components/widgets/fraud-gauge/fraud-gauge.js 12 files changed, 173 insertions(+), 141 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/37/172937/1 -- To view, visit https://gerrit.wikimedia.org/r/172937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88a91d42983a2b7a6beb972cbafd8d7f6f41b91e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reset form when modal is reopened - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172938
Change subject: Reset form when modal is reopened
..
Reset form when modal is reopened
Change-Id: Ibf3e28ce978a3010920576a17a14a35d11daab4d
---
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 13 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/38/172938/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 777aacd..3839ade 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -40,7 +40,7 @@
/div
div class=modal-body
-form role=form
+form role=form class=fraudForm
div class=form-group
div class=well
label
for=fraudPercentSliderFraud Percent Ranges/label
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index fe2a07e..995a690 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -153,7 +153,7 @@
} else {
qs += filterObj[el];
}
-//qs += ' and ';
+qs += ' and ';
});
//convert time constraints
@@ -190,7 +190,7 @@
postQS = ds;
}
- return qs;
+ return postQS;
};
self.showSubfilters = function(stuff){
@@ -198,10 +198,19 @@
};
self.resetGaugeSettings = function(){
+
+ //reset gauge settings to defaults
self.greenRange({low: 0, high: 33});
self.yellowRange({low: 33, high: 66});
self.redRange({low: 66, high: 100});
- $('#timePeriodSelection').reset();
+
+ //reset datepicker
+ $(#timePeriodDropdown option:eq(0)).prop(selected, true);
+
+ //reset filters
+ $('.subfilterSubnav').addClass('hide');
+ $('input:checkbox').removeAttr('checked');
+
};
self.submitGaugeModifications = function(){
@@ -267,7 +276,6 @@
});
});
}
-
};
--
To view, visit https://gerrit.wikimedia.org/r/172938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf3e28ce978a3010920576a17a14a35d11daab4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add c3 library and update d3 - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/171877 Change subject: add c3 library and update d3 .. add c3 library and update d3 Change-Id: I6576a668440f62b10a5783f4c8f88f1a10d0463e --- A c3/Gruntfile.coffee A c3/LICENSE A c3/README.md A c3/bower.json A c3/c3.css A c3/c3.js A c3/c3.min.js A c3/c3.old.js A c3/component.json A c3/extensions/js/c3ext.js A c3/htdocs/css/bootstrap.min.css A c3/htdocs/css/c3.css A c3/htdocs/css/index.css A c3/htdocs/css/style.css A c3/htdocs/data/c3_test.csv A c3/htdocs/data/c3_test.json A c3/htdocs/data/c3_test2.csv A c3/htdocs/data/c3_test2_ts.csv A c3/htdocs/data/c3_test3.csv A c3/htdocs/data/c3_test_2.json A c3/htdocs/data/c3_test_3.json A c3/htdocs/data/c3_test_ts.csv A c3/htdocs/index.html A c3/htdocs/js/c3.js A c3/htdocs/js/c3.min.js A c3/htdocs/js/extensions A c3/htdocs/js/require.js A c3/htdocs/js/samples/plugin.js A c3/htdocs/js/samples/requirejs.js A c3/htdocs/js/samples/zoom_reduction.js A c3/htdocs/samples/api_axis_label.html A c3/htdocs/samples/api_axis_range.html A c3/htdocs/samples/api_category.html A c3/htdocs/samples/api_data_colors.html A c3/htdocs/samples/api_flow.html A c3/htdocs/samples/api_flow_timeseries.html A c3/htdocs/samples/api_legend.html A c3/htdocs/samples/api_transform.html A c3/htdocs/samples/api_xgrid_lines.html A c3/htdocs/samples/api_ygrid_lines.html A c3/htdocs/samples/area_zerobased.html A c3/htdocs/samples/axes_padding.html A c3/htdocs/samples/axes_range.html A c3/htdocs/samples/axes_x_localtime.html A c3/htdocs/samples/axes_x_range_timeseries.html A c3/htdocs/samples/axes_x_tick_culling.html A c3/htdocs/samples/axes_x_tick_fit.html A c3/htdocs/samples/axes_x_tick_rotate.html A c3/htdocs/samples/axes_y2.html A c3/htdocs/samples/bar_zerobased.html A c3/htdocs/samples/bindto.html A c3/htdocs/samples/categorized.html A c3/htdocs/samples/chart_area.html A c3/htdocs/samples/chart_area_spline.html A c3/htdocs/samples/chart_area_spline_stacked.html A c3/htdocs/samples/chart_area_stacked.html A c3/htdocs/samples/chart_area_step.html A c3/htdocs/samples/chart_area_step_stacked.html A c3/htdocs/samples/chart_bar.html A c3/htdocs/samples/chart_bar_stacked.html A c3/htdocs/samples/chart_combination.html A c3/htdocs/samples/chart_donut.html A c3/htdocs/samples/chart_gauge.html A c3/htdocs/samples/chart_pie.html A c3/htdocs/samples/chart_pie_sort.html A c3/htdocs/samples/chart_scatter.html A c3/htdocs/samples/chart_spline.html A c3/htdocs/samples/chart_step.html A c3/htdocs/samples/chart_step_category.html A c3/htdocs/samples/custom_x_categorized.html A c3/htdocs/samples/custom_x_scale.html A c3/htdocs/samples/custom_xs_scale.html A c3/htdocs/samples/data_columned.html A c3/htdocs/samples/data_hide.html A c3/htdocs/samples/data_json.html A c3/htdocs/samples/data_label.html A c3/htdocs/samples/data_label_format.html A c3/htdocs/samples/data_load.html A c3/htdocs/samples/data_load_timeseries.html A c3/htdocs/samples/data_region.html A c3/htdocs/samples/data_region_timeseries.html A c3/htdocs/samples/data_rowed.html A c3/htdocs/samples/data_url.html A c3/htdocs/samples/domain_y.html A c3/htdocs/samples/element.html A c3/htdocs/samples/emptydata.html A c3/htdocs/samples/grid_focus.html A c3/htdocs/samples/grid_x_lines.html A c3/htdocs/samples/grid_x_lines_timeseries.html A c3/htdocs/samples/grids.html A c3/htdocs/samples/grids_timeseries.html A c3/htdocs/samples/interaction_enabled.html A c3/htdocs/samples/legend.html A c3/htdocs/samples/padding.html A c3/htdocs/samples/padding_update.html A c3/htdocs/samples/plugin.html A c3/htdocs/samples/point_r.html A c3/htdocs/samples/regions.html A c3/htdocs/samples/requirejs.html A c3/htdocs/samples/selection.html A c3/htdocs/samples/simple.html A c3/htdocs/samples/subchart.html A c3/htdocs/samples/subchart_onbrush.html A c3/htdocs/samples/timeseries.html A c3/htdocs/samples/timeseries_date.html A c3/htdocs/samples/timeseries_descendent.html A c3/htdocs/samples/timeseries_raw.html A c3/htdocs/samples/tooltip_grouped.html A c3/htdocs/samples/tooltip_show.html A c3/htdocs/samples/zoom.html A c3/htdocs/samples/zoom_category.html A c3/htdocs/samples/zoom_onzoom.html A c3/htdocs/samples/zoom_reduction.html A c3/package.json A c3/spec/c3-spec.js A c3/src/api.axis.js A c3/src/api.category.js A c3/src/api.chart.js A c3/src/api.color.js A c3/src/api.data.js A c3/src/api.flow.js A c3/src/api.focus.js A c3/src/api.grid.js A c3/src/api.group.js A c3/src/api.legend.js A c3/src/api.load.js A c3/src/api.region.js A c3/src/api.selection.js A c3/src/api.show.js A c3/src/api.transform.js A c3/src/api.x.js A c3/src/api.zoom.js A c3/src/arc.js A c3/src/axis.js A c3/src/c3.axis.js A c3/src/cache.js A c3/src/category.js A c3/src/class.js A c3/src/clip.js A c3/src/color.js A c3/src/config.js A c3/src/core.js A c3/src/data.convert.js A c3/src/data.js A c3/src/data.load.js A c3/src/domain.js A c3/src/drag.js A c3/src/format.js A
