From a09001933a4c48610c1b39ff40f056a2e77ed226 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 7 Jun 2017 15:39:27 +0100 Subject: [PATCH] git status --- src/components/structures/ModularWidgets.js | 6 ++++++ src/components/views/dialogs/AddAppDialog.js | 4 ++-- src/components/views/elements/AppIconTile.js | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/structures/ModularWidgets.js b/src/components/structures/ModularWidgets.js index 306a645a6f..4e59fd9cfd 100644 --- a/src/components/structures/ModularWidgets.js +++ b/src/components/structures/ModularWidgets.js @@ -12,6 +12,12 @@ class ModularWidgets { name: 'Grafana', description: 'Graph and monitor all the things!', }, + { + type: 'custom', + icon: 'http://localhost:8000/static/blocks.png', + name: 'Custom Widget', + description: 'Add your own custom widget', + }, ]; } export default ModularWidgets; diff --git a/src/components/views/dialogs/AddAppDialog.js b/src/components/views/dialogs/AddAppDialog.js index 0d24c641a6..6d722365e8 100644 --- a/src/components/views/dialogs/AddAppDialog.js +++ b/src/components/views/dialogs/AddAppDialog.js @@ -68,7 +68,7 @@ export default React.createClass({ >
{appCards} - {/*
+
Or enter the URL of the widget to add.
-
*/} +
); diff --git a/src/components/views/elements/AppIconTile.js b/src/components/views/elements/AppIconTile.js index 9e9dbe6d41..282a33743c 100644 --- a/src/components/views/elements/AppIconTile.js +++ b/src/components/views/elements/AppIconTile.js @@ -18,9 +18,15 @@ limitations under the License. import React from 'react'; class AppIconTile extends React.Component { + render() { + const contentClasses = ['mx_AppIconTile']; + // if(this.props.type == 'custom') { + // contentClasses.push('mx_AppIconTile_active'); + // } + return ( -
+
{this.props.name}