Fix views

melkor217 · Jun 1, 2016 · f8db469 · f8db469
1 parent b4392ac
commit f8db469
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
@@ -19,7 +19,7 @@
         <li class="<%=cp(countries_path)%>"><a href="<%= countries_path %>">Countries</a></li>
         <li class="<%=cp(weapons_path)%>"><a href="<%= weapons_path %>">Weapons</a></li>
         <li class="<%=cp(frags_path)%>"><a href="<%= frags_path %>">Frags</a></li>
-        <li class="dropdown">
+<!--        <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
           <ul class="dropdown-menu">
             <li><a href="#">Action</a></li>
@@ -30,7 +30,7 @@
             <li role="separator" class="divider"></li>
             <li><a href="#">One more separated link</a></li>
           </ul>
-        </li>
+        </li>-->
       </ul>
       <%#
       <form class="navbar-form navbar-left" role="search">
@@ -39,19 +39,19 @@
         </div>
         <button type="submit" class="btn btn-default">Submit</button>
       </form> %>
-      <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">Link</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="#">Action</a></li>
-            <li><a href="#">Another action</a></li>
-            <li><a href="#">Something else here</a></li>
-            <li role="separator" class="divider"></li>
-            <li><a href="#">Separated link</a></li>
-          </ul>
-        </li>
-      </ul>
+      <!--      <ul class="nav navbar-nav navbar-right">
+              <li><a href="#">Link</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Action</a></li>
+                  <li><a href="#">Another action</a></li>
+                  <li><a href="#">Something else here</a></li>
+                  <li role="separator" class="divider"></li>
+                  <li><a href="#">Separated link</a></li>
+                </ul>
+              </li>
+            </ul>-->
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
diff --git a/app/views/players/_playertable.html.erb b/app/views/players/_playertable.html.erb
@@ -1,7 +1,6 @@
 <table id="table" class="fixed player-table"
        data-toggle="table"
        data-show-refresh="true"
-       data-show-toggle="true"
        data-show-columns="true"
        data-flat="true"
        data-url="<%= players_path(format: :json, countryId: params[:countryId]) %>"

diff --git a/app/views/players/index.html.erb b/app/views/players/index.html.erb
@@ -1,6 +1,4 @@
 <p id="notice"><%= notice %></p>
 
-
-<h1>Listing Players</h1>
 <%= render 'players/playertable' %>
 <br>
diff --git a/app/views/servers/_show.json.jbuilder b/app/views/servers/_show.json.jbuilder
@@ -4,3 +4,4 @@ json.extract! server, :id, :name, :publicaddress, :kills, :headshots, :act_map,
 json.livestats_players server.livestats_players.count
 json.url server_path(server, format: :json)
 json.path server_path(server)
+json.map_started Time.at(Time.now - server.map_started).utc.strftime("%H:%M:%S")
diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-6">
+  <div class="container">
     <%= react_component 'ServerList', {url: servers_path(format: :json)} %>
   </div>
 </div>