From e2f08d52cec65c138597a8dd383ceb5717585b15 Mon Sep 17 00:00:00 2001 From: alexfriesen Date: Wed, 8 Jun 2016 19:22:58 +0200 Subject: [PATCH] responsive playerlist use bootstrap table-class --- html/playerlist.html | 155 ++++++++++++++++++++++--------------------- js/playerlist.js | 24 +++---- rcon.css | 45 +------------ 3 files changed, 95 insertions(+), 129 deletions(-) diff --git a/html/playerlist.html b/html/playerlist.html index db35f53..d80d469 100644 --- a/html/playerlist.html +++ b/html/playerlist.html @@ -1,95 +1,100 @@ -
+
-
-
- +
+
+
-
- +
+
- - - - +
+
+
Actions
+ + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - + - + - + - + - + - - - - -
ActionsUsernameSteamidVoilationLevelXPAddressPingDuration
UsernameSteamidVoilationLevelXPAddressPingDuration
-
- - -
- 		+
+ + +
+ 		- {{line.DisplayName}} - + {{line.DisplayName}} + - {{line.SteamID}} - + {{line.SteamID}} + - {{line.VoiationLevel}} - + {{line.VoiationLevel}} + - {{line.CurrentLevel}} - + {{line.CurrentLevel}} + - {{line.UnspentXp}} - + {{line.UnspentXp}} + - {{line.Address}} - + {{line.Address}} + {{line.Ping}} + {{line.Ping}} + - {{line.ConnectedSeconds | SecondsToDuration}} -
+ + {{line.ConnectedSeconds | SecondsToDuration}} + + + + +
+
\ No newline at end of file diff --git a/js/playerlist.js b/js/playerlist.js index 820faea..013dfcb 100644 --- a/js/playerlist.js +++ b/js/playerlist.js @@ -14,20 +14,20 @@ function PlayerListController( $scope, rconService, $interval ) }); } - $scope.Order = function( o ) + $scope.Order = function( field ) { - if ( $scope.OrderBy == o ) + if ( $scope.OrderBy === field ) { - o = '-' + o; + field = '-' + field; } - $scope.OrderBy = o; + $scope.OrderBy = field; } - $scope.SortClass = function( o ) + $scope.SortClass = function( field ) { - if ( $scope.OrderBy == o ) return "active"; - if ( $scope.OrderBy == "-" + o ) return "active descending"; + if ( $scope.OrderBy === field ) return "sorting"; + if ( $scope.OrderBy === "-" + field ) return "sorting descending"; return null; } @@ -41,10 +41,10 @@ function PlayerListController( $scope, rconService, $interval ) rconService.InstallService( $scope, $scope.Refresh ) - var timer = $interval( function () - { - //$scope.Refresh(); - }.bind( this ), 1000 ); + // var timer = $interval( function () + // { + // //$scope.Refresh(); + // }.bind( this ), 1000 ); - $scope.$on( '$destroy', function () { $interval.cancel( timer ) } ) + //$scope.$on( '$destroy', function () { $interval.cancel( timer ) } ) } \ No newline at end of file diff --git a/rcon.css b/rcon.css index fa4be39..eb15691 100644 --- a/rcon.css +++ b/rcon.css @@ -21,19 +21,11 @@ a:hover text-decoration: none; } -.right -{ - text-align: right; -} - .center { text-align: center; } - -.float-left { float: left; } - #ConsoleController .Output { font-family: monospace; @@ -68,53 +60,22 @@ a:hover background-color: #428bca; } -table -{ - border-collapse: collapse; - border-spacing: 0; - width: 100%; -} - .fade { opacity: 0.5; } -th, td +.table > tbody > tr:hover { - padding: 5px 8px; - border-bottom: 1px solid #414758; + background-color: rgba( 255, 255, 255, 0.3 ); } -th.active +.table > thead > tr > th.sorting { color: #1bc98e; border-color: #1bc98e; } -th -{ - border-bottom: 2px solid #414758; - border-radius: 10px; -} - -th:first-child -{ - border-radius: 6px; -} - -th:last-child -{ - border-radius: 0 6px 0 0; -} - -th:only-child -{ - border-radius: 6px 6px 0 0; -} - - - .btn-default, .btn-default:active, .form-control { background: rgba( 255, 255, 255, 0.3 );