Skip to content

Commit

Permalink
Remove usage of IDs except for modals (#58)
Browse files Browse the repository at this point in the history
* Remove usage of IDs except for modals

* Fix issue with modals not showing

* Version
  • Loading branch information
andycate authored Feb 18, 2019
1 parent 976a721 commit f3501fe
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 44 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/static/javascript/widget-components.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class WidgetContainer extends React.Component {

render() {
return (
<div className='card m-1' style={{width: this.props.widgetConfig.width, height: this.props.widgetConfig.height, display:'inline-block'}} id={this.props.widgetConfig.id + '_card'}>
<div className='card m-1' style={{width: this.props.widgetConfig.width, height: this.props.widgetConfig.height, display:'inline-block'}}>
<div className='card-header p-1'>
<h4 className='m-0 d-inline'>{this.props.widgetConfig.title}</h4>
<button className='btn btn-light float-right d-inline p-0 m-1' type='button' data-toggle='modal' data-target={'#' + this.props.widgetConfig.id + '_modal'}><h5 className='fas fa-cog m-0'></h5></button>
Expand Down Expand Up @@ -91,7 +91,7 @@ export class WidgetContainer extends React.Component {
export class WidgetBody extends React.Component {
render() {
return (
<div className={'card-body p-2 show'} id={this.props.id + '_widget'}>
<div className={'card-body p-2 show'}>
{this.props.children}
</div>
);
Expand All @@ -105,7 +105,7 @@ export class WidgetSettings extends React.Component {
<div className='modal-dialog modal-dialog-centered' role='document'>
<div className='modal-content'>
<div className='modal-header'>
<h5 className='modal-title' id={this.props.id + '_modal_title'}>{this.props.title} Settings</h5>
<h5 className='modal-title'>{this.props.title} Settings</h5>
<button type='button' className='close' data-dismiss='modal' aria-label='Close'>
<span aria-hidden='true'>&times;</span>
</button>
Expand Down
40 changes: 0 additions & 40 deletions src/main/resources/widgets.html

This file was deleted.

0 comments on commit f3501fe

Please sign in to comment.