diff --git a/bemani/frontend/static/controllers/bishi/allplayers.react.js b/bemani/frontend/static/controllers/bishi/allplayers.react.js index 6c0383e..4dfd9a1 100644 --- a/bemani/frontend/static/controllers/bishi/allplayers.react.js +++ b/bemani/frontend/static/controllers/bishi/allplayers.react.js @@ -57,7 +57,7 @@ var all_players = React.createClass({ }.bind(this), }, { - name: 'Play Count', + name: 'Total Rounds', render: function(userid) { var player = this.state.players[userid]; return player.plays; diff --git a/bemani/frontend/static/controllers/bishi/player.react.js b/bemani/frontend/static/controllers/bishi/player.react.js index 713ec33..d3bae0e 100644 --- a/bemani/frontend/static/controllers/bishi/player.react.js +++ b/bemani/frontend/static/controllers/bishi/player.react.js @@ -59,13 +59,13 @@ var profile_view = React.createClass({
{player.extid} - + - + - + {player.plays}回
diff --git a/bemani/frontend/static/controllers/ddr/allplayers.react.js b/bemani/frontend/static/controllers/ddr/allplayers.react.js index 028df15..c2e918e 100644 --- a/bemani/frontend/static/controllers/ddr/allplayers.react.js +++ b/bemani/frontend/static/controllers/ddr/allplayers.react.js @@ -57,7 +57,7 @@ var all_players = React.createClass({ }.bind(this), }, { - name: 'Play Count', + name: 'Total Rounds', render: function(userid) { var player = this.state.players[userid]; return player.sp + player.dp; diff --git a/bemani/frontend/static/controllers/ddr/player.react.js b/bemani/frontend/static/controllers/ddr/player.react.js index 29eaf97..433f622 100644 --- a/bemani/frontend/static/controllers/ddr/player.react.js +++ b/bemani/frontend/static/controllers/ddr/player.react.js @@ -59,16 +59,16 @@ var profile_view = React.createClass({
{player.extid} - + - + - + {player.sp}回 - + {player.dp}回
diff --git a/bemani/frontend/static/controllers/ddr/records.react.js b/bemani/frontend/static/controllers/ddr/records.react.js index c221f82..176bcc2 100644 --- a/bemani/frontend/static/controllers/ddr/records.react.js +++ b/bemani/frontend/static/controllers/ddr/records.react.js @@ -210,8 +210,10 @@ var network_records = React.createClass({ if (paginate && curpage != this.state.subtab) { return null; } return ( - - { this.state.versions[-songid] } + + { + !paginate ? this.state.versions[-songid] : "Song / Artist / Difficulties" + } SP Beginner SP Basic SP Difficult @@ -491,165 +493,167 @@ var network_records = React.createClass({ renderBySongIDList: function(songids, showplays) { return ( - - - - - - - - - - - - - - - - - {songids.map(function(songid, index) { - if (index < this.state.offset || index >= this.state.offset + this.state.limit) { - return null; - } - - var records = this.state.records[songid]; - if (!records) { - records = {}; - } - - var difficulties = this.state.songs[songid].difficulties; - var plays = this.getPlays(records); - return ( - - - - - - - - - - - - - ); - }.bind(this))} - - - - + + + + + + + + + + + + ); + }.bind(this))} + + + + + + +
SongSP BeginnerSP BasicSP DifficultSP ExpertSP ChallengeDP BasicDP DifficultDP ExpertDP Challenge
-
- -
{ this.state.songs[songid].name }
-
{ this.state.songs[songid].artist }
-
-
-
- SP - {this.renderDifficulty(songid, 0)} - / - {this.renderDifficulty(songid, 1)} - / - {this.renderDifficulty(songid, 2)} - / - {this.renderDifficulty(songid, 3)} - / - {this.renderDifficulty(songid, 4)} -
-
- DP - {this.renderDifficulty(songid, 6)} - / - {this.renderDifficulty(songid, 7)} - / - {this.renderDifficulty(songid, 8)} - / - {this.renderDifficulty(songid, 9)} -
- { showplays ?
#{index + 1} - {plays}{plays == 1 ? ' play' : ' plays'}
: null } -
0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - - 0 ? "" : "nochart"}> - -
- { this.state.offset > 0 ? - : null +
+ + + + + + + + + + + + + + + + + {songids.map(function(songid, index) { + if (index < this.state.offset || index >= this.state.offset + this.state.limit) { + return null; } - { (this.state.offset + this.state.limit) < songids.length ? - = songids.length) { return } - this.setState({offset: page}); - }.bind(this)}/> : - null + + var records = this.state.records[songid]; + if (!records) { + records = {}; } - - - -
Song / Artist / DifficultiesSP BeginnerSP BasicSP DifficultSP ExpertSP ChallengeDP BasicDP DifficultDP ExpertDP Challenge
+ + var difficulties = this.state.songs[songid].difficulties; + var plays = this.getPlays(records); + return ( +
+
+ +
{ this.state.songs[songid].name }
+
{ this.state.songs[songid].artist }
+
+
+
+ SP + {this.renderDifficulty(songid, 0)} + / + {this.renderDifficulty(songid, 1)} + / + {this.renderDifficulty(songid, 2)} + / + {this.renderDifficulty(songid, 3)} + / + {this.renderDifficulty(songid, 4)} +
+
+ DP + {this.renderDifficulty(songid, 6)} + / + {this.renderDifficulty(songid, 7)} + / + {this.renderDifficulty(songid, 8)} + / + {this.renderDifficulty(songid, 9)} +
+ { showplays ?
#{index + 1} - {plays}{plays == 1 ? ' play' : ' plays'}
: null } +
0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + + 0 ? "" : "nochart"}> + +
+ { this.state.offset > 0 ? + : null + } + { (this.state.offset + this.state.limit) < songids.length ? + = songids.length) { return } + this.setState({offset: page}); + }.bind(this)}/> : + null + } +
+ ); }, diff --git a/bemani/frontend/static/controllers/ddr/rivals.react.js b/bemani/frontend/static/controllers/ddr/rivals.react.js index ba1c1be..a8b0e10 100644 --- a/bemani/frontend/static/controllers/ddr/rivals.react.js +++ b/bemani/frontend/static/controllers/ddr/rivals.react.js @@ -298,7 +298,7 @@ var rivals_view = React.createClass({ return ( - + { rival.active ?
active
: null diff --git a/bemani/frontend/static/controllers/ddr/scores.react.js b/bemani/frontend/static/controllers/ddr/scores.react.js index 05aba33..306abbf 100644 --- a/bemani/frontend/static/controllers/ddr/scores.react.js +++ b/bemani/frontend/static/controllers/ddr/scores.react.js @@ -85,8 +85,8 @@ var network_scores = React.createClass({ { window.shownames ? Name : null } Timestamp - Song - Chart + Song / Artist + Difficulty Score diff --git a/bemani/frontend/static/controllers/ddr/topscores.react.js b/bemani/frontend/static/controllers/ddr/topscores.react.js index a33f674..732e914 100644 --- a/bemani/frontend/static/controllers/ddr/topscores.react.js +++ b/bemani/frontend/static/controllers/ddr/topscores.react.js @@ -180,7 +180,7 @@ var top_scores = React.createClass({ }, { name: 'Grade', - render: function(topscore) { return topscore.rank; }, + render: function(topscore) { return {topscore.rank}; }, }, { name: 'Score', diff --git a/bemani/frontend/static/themes/dark/section.css b/bemani/frontend/static/themes/dark/section.css index 0f8c6d7..9b7b55c 100644 --- a/bemani/frontend/static/themes/dark/section.css +++ b/bemani/frontend/static/themes/dark/section.css @@ -104,7 +104,7 @@ div.score span.score { padding-right: 3px; } -div.score span.grade { +div.score span.grade, table.topscores span.grade { font-weight: bold; padding-right: 3px; } @@ -114,7 +114,7 @@ div.songname { font-size: large; } -div.songartist, div.songgenre, div.songdifficulty, div.songplays { +div.songartist, div.songgenre, div.songdifficulty, div.songdifficulties, div.songplays { font-size: small; } @@ -152,9 +152,9 @@ span.loading { } span.raised { - font-style: italic; - font-size: small; + font-size: smaller; font-weight: bold; + text-transform: uppercase; } dl { diff --git a/bemani/frontend/static/themes/dark/table.css b/bemani/frontend/static/themes/dark/table.css index ed28893..4e8c95e 100644 --- a/bemani/frontend/static/themes/dark/table.css +++ b/bemani/frontend/static/themes/dark/table.css @@ -29,6 +29,10 @@ table.list tbody td, table.add tbody td { vertical-align: top; } +table.list tr.header td { + vertical-align: middle ! important; +} + table.list tbody td { border: 1px solid #6a6a6a; padding: 10px; diff --git a/bemani/frontend/static/themes/default/section.css b/bemani/frontend/static/themes/default/section.css index 0f8c6d7..9b7b55c 100644 --- a/bemani/frontend/static/themes/default/section.css +++ b/bemani/frontend/static/themes/default/section.css @@ -104,7 +104,7 @@ div.score span.score { padding-right: 3px; } -div.score span.grade { +div.score span.grade, table.topscores span.grade { font-weight: bold; padding-right: 3px; } @@ -114,7 +114,7 @@ div.songname { font-size: large; } -div.songartist, div.songgenre, div.songdifficulty, div.songplays { +div.songartist, div.songgenre, div.songdifficulty, div.songdifficulties, div.songplays { font-size: small; } @@ -152,9 +152,9 @@ span.loading { } span.raised { - font-style: italic; - font-size: small; + font-size: smaller; font-weight: bold; + text-transform: uppercase; } dl { diff --git a/bemani/frontend/static/themes/default/table.css b/bemani/frontend/static/themes/default/table.css index 0047543..204e70a 100644 --- a/bemani/frontend/static/themes/default/table.css +++ b/bemani/frontend/static/themes/default/table.css @@ -29,6 +29,10 @@ table.list tbody td, table.add tbody td { vertical-align: top; } +table.list tr.header td { + vertical-align: middle ! important; +} + table.list tbody td { border: 1px solid #e0e0e0; padding: 10px;