ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2025-02-20 18:52:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Report gather name

Browse source
This commit is contained in:
Chris Blanchard 2016-03-18 14:48:17 +00:00
parent 356bd7fe85
commit b898ece653
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascripts/components/gather.js
View file

@ -608,7 +608,7 @@ const Gather = exports.Gather = React.createClass({
return (
<div>
<div className="panel panel-primary add-bottom">
<div className="panel-heading">Current Gather</div>
<div className="panel-heading">{gather.name}</div>
<div className="panel-body">
<GatherProgress gather={gather} />
<GatherActions gather={gather} user={user} thisGatherer={thisGatherer}
@ -625,7 +625,7 @@ const Gather = exports.Gather = React.createClass({
return (
<div>
<div className="panel panel-primary add-bottom">
<div className="panel-heading">Current Gather</div>
<div className="panel-heading">{gather.name}</div>
</div>
<Gatherers gather={gather} user={user} thisGatherer={thisGatherer}
socket={socket} soundController={soundController}/>
@ -891,7 +891,7 @@ const Gatherers = React.createClass({
<div className="panel-body text-center join-hero">
<button
onClick={this.joinGather}
className="btn btn-success btn-lg">Start a Gather</button>
className="btn btn-success btn-lg">Start Gather</button>
</div>
</div>
);

4
app/javascripts/components/main.js
View file

@ -454,10 +454,6 @@ const GatherPage = React.createClass({
</section>
</aside>
<div className="content-wrapper" style={{"minHeight": "916px"}}>
<section className="content-header">
<h1>Public Gather</h1>
<p>6 v 6 - No player requirements</p>
</section>
<section className="content">
<div className="row">
<div className="col-lg-8">