ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-10 15:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Standardise vote action width

Browse source
This commit is contained in:
Chris Blanchard 2015-09-20 14:50:59 +01:00
parent d69e6efbf7
commit 4b2cfa6f0f
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/react/gather.jsx
View file

@ -389,14 +389,14 @@ var VoteButton = React.createClass({
return ( return (
<button <button
onClick={this.cancelVote} onClick={this.cancelVote}
className="btn btn-xs btn-success">Voted className="btn btn-xs btn-success vote-button">Voted
</button> </button>
); );
} else { } else {
return ( return (
<button <button
onClick={this.vote} onClick={this.vote}
className="btn btn-xs btn-primary" className="btn btn-xs btn-primary vote-button"
value={this.props.candidate.id}>Vote value={this.props.candidate.id}>Vote
</button> </button>
); );
@ -671,27 +671,28 @@ var Gatherers = React.createClass({
alt={gatherer.user.country} />); alt={gatherer.user.country} />);
}; };
var skill = gatherer.user.profile.skill || "Not Available"; let skill = gatherer.user.profile.skill || "Not Available";
var abilities = []; let lifeform;
for (let attr in gatherer.user.profile.abilities) { let abilities = gatherer.user.profile.abilities;
if (gatherer.user.profile.abilities[attr]) abilities.push(_.capitalize(attr)); if (abilities.length) {
lifeform = abilities.map(ability => {return _.capitalize(ability)}).join(", ");
} else {
lifeform = "None Specified";
} }
var lifeform = (abilities.length) ? abilities.join(", ") : "None Specified"; let hiveStats = [];
var hiveStats = [];
if (gatherer.user.hive.skill) hiveStats.push(`${gatherer.user.hive.skill} ELO`); if (gatherer.user.hive.skill) hiveStats.push(`${gatherer.user.hive.skill} ELO`);
if (gatherer.user.hive.playTime) { if (gatherer.user.hive.playTime) {
hiveStats.push(`${Math.floor(gatherer.user.hive.playTime / 3600)} Hours`); hiveStats.push(`${Math.floor(gatherer.user.hive.playTime / 3600)} Hours`);
} }
var hive = (hiveStats.length) ? hiveStats.join(", ") : "Not Available"; let hive = (hiveStats.length) ? hiveStats.join(", ") : "Not Available";
var team = (gatherer.user.team) ? gatherer.user.team.name : "None"; let team = (gatherer.user.team) ? gatherer.user.team.name : "None";
var action; let action;
if (self.props.gather.state === "election") { if (self.props.gather.state === "election") {
var votes = self.props.gather.gatherers.reduce((acc, voter) => { var votes = self.props.gather.gatherers.reduce((acc, voter) => {
if (voter.leaderVote === gatherer.id) acc++; if (voter.leaderVote === gatherer.id) acc++;
@ -718,7 +719,7 @@ var Gatherers = React.createClass({
if (gatherer.leader) { if (gatherer.leader) {
action = (<span className="label label-default">Leader</span>); action = (<span className="label label-default">Leader</span>);
} else if (gatherer.team !== "lobby") { } else if (gatherer.team !== "lobby") {
action = (<span className="label label-primary">{gatherer.team}</span>); action = (<span className="label label-primary">{_.capitalize(gatherer.team)}</span>);
} }
} }
} }

4
public/css/app.css
View file

@ -127,3 +127,7 @@ html, body {
.panel-light-background { .panel-light-background {
background-color: #d9edf7; background-color: #d9edf7;
} }
.vote-button {
min-width: 60px;
}