diff --git a/build.gradle b/build.gradle index 1b9bc20..b3a3732 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ dependencies { } group = 'org.team5499' -version = '0.4.1' /* Change this when deploying a new version */ +version = '0.4.2' /* Change this when deploying a new version */ task sourcesJar(type: Jar) { from sourceSets.main.allJava diff --git a/src/main/resources/static/javascript/widget-components.jsx b/src/main/resources/static/javascript/widget-components.jsx index 5852276..d463c7a 100644 --- a/src/main/resources/static/javascript/widget-components.jsx +++ b/src/main/resources/static/javascript/widget-components.jsx @@ -44,7 +44,7 @@ export class WidgetContainer extends React.Component { render() { return ( -
+

{this.props.widgetConfig.title}

@@ -91,7 +91,7 @@ export class WidgetContainer extends React.Component { export class WidgetBody extends React.Component { render() { return ( -
+
{this.props.children}
); @@ -105,7 +105,7 @@ export class WidgetSettings extends React.Component {
-
{this.props.title} Settings
+
{this.props.title} Settings
diff --git a/src/main/resources/widgets.html b/src/main/resources/widgets.html deleted file mode 100644 index 78f7ea8..0000000 --- a/src/main/resources/widgets.html +++ /dev/null @@ -1,40 +0,0 @@ - -{% macro variableEditorMain(title, id, width, height, vars, nonVars, kwargs) %} - - -{% endmacro %} -{% macro variableEditorSettings(title, id, width, height, vars, nonVars, kwargs) %} - -{% endmacro %} - - - - -{% macro widgetOutline(page, widgets, type, title, id, width, height, vars, non_vars, kwargs) %} -
-
-

{{ title }}

-
-
-
- - {% comment %} {% endcomment %} - {{ widgets[type + "Main"](title, id, width, height, vars, non_vars, kwargs) }} -
-
- -
- - - {{ widgets[type + "Settings"](title, id, width, height, vars, non_vars, kwargs) }} - -
-
-
-{% endmacro %}