Changed class name to Tf2Server, fixed item titles for Tf2Servers and…

… Streams

app/controllers/home_controller.rb

@@ -12,7 +12,7 @@ def index
     @uploads = Upload.find(:all, :limit => 3, :include => :user, :order => 'uploads.updated_at desc')
     @users = User.find(:all, :limit => 3, :order => 'profile_updated_at desc')
     @streams = Stream.find(:all, :order => 'viewers desc', :conditions => {:live => true})
-    @tfservers = Tfserver.find(:all, :order => 'players desc', :conditions => ["players > 0"])
+    @tf2_servers = Tf2Server.find(:all, :order => 'players desc', :conditions => ["players > 0"])
   end
 
   def help

app/controllers/tf2_servers_controller.rb

@@ -0,0 +1,50 @@
+class Tf2ServersController < ApplicationController
+
+  before_filter :require_login, :except => [:index, :show]
+  before_filter :can_edit, :only => [:edit, :update, :destroy]
+
+  def index
+    @tf2_servers = Tf2Server.paginate(:page => params[:page], :order => 'players desc, updated_at desc')
+    @tf2_servers_count = Tf2Server.count
+  end
+
+  def show
+    @tf2_server = Tf2Server.find(params[:id])
+  end
+
+  def new
+    @tf2_server = Tf2Server.new
+  end
+
+  def create
+	@tf2_server = current_user.tf2_servers.new(params[:tf2_server])
+    if @tf2_server.save
+      redirect_to @tf2_server
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @tf2_server = Tf2Server.find(params[:id])
+  end
+
+  def update
+    @tf2_server = Tf2Server.find(params[:id])
+    if @tf2_server.update_attributes(params[:tf2_server])
+      redirect_to @tf2_server
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    @tf2_server = Tf2Server.find(params[:id])
+    @tf2_server.destroy
+    redirect_to tf2_servers_path
+  end 
+
+  def confirm_delete
+    @tf2_server = Tf2Server.find(params[:id])
+  end
+end

app/helpers/application_helper.rb

@@ -31,7 +31,7 @@ def theme_css
   end
 
   def page_title
-    item = [@article, @category, @event, @forum, @header, @message, @topic, @user].compact.first if %w(show edit).include?(current_action)
+    item = [@article, @category, @event, @forum, @header, @message, @topic, @user, @tf2_server, @stream].compact.first if %w(show edit).include?(current_action)
     page = request.env['PATH_INFO'].delete('/').sub('new','').capitalize unless request.env['PATH_INFO'].nil?
     page = @settings.tagline if current_controller == 'home'
     "#{@settings.title}: #{item || page}"

app/models/stream.rb

@@ -39,5 +39,9 @@ def perform
       end
     end
   end
+
+  def to_s
+  	return title
+  end
 
 end

app/models/tfserver.rb → app/models/tf2_server.rb

@@ -1,6 +1,6 @@
-class Tfserver < ActiveRecord::Base
+class Tf2Server < ActiveRecord::Base
 
-	attr_accessible :title, :servertitle, :ip, :port, :gametype, :players, :players_list, :max_players, :map
+	attr_accessible :title, :ip, :port, :gametype, :players, :players_list, :max_players, :map
 	belongs_to :user
 	validates_presence_of :title, :ip
 
@@ -12,7 +12,7 @@ def perform
 			new_players = server.players.length
 			new_maxplayers = serverinfo["max_players"]
 			new_map = serverinfo["map_name"]
-			new_servertitle = serverinfo["server_name"]
+			new_title = serverinfo["server_name"]
 
 			playersList = ""
 			for player in server.players.keys
@@ -31,8 +31,11 @@ def perform
 			logger.error e
 		ensure
 			logger.info "#{ title }: #{ new_players }"
-			self.update_attributes(:players => new_players, :max_players => new_maxplayers, :map => new_map, :servertitle => new_servertitle, :players_list => playersList, :gametype => new_type)
+			self.update_attributes(:players => new_players, :max_players => new_maxplayers, :map => new_map, :title => new_title, :players_list => playersList, :gametype => new_type)
 		end
 	end
+	def to_s
+		return title
+	end
 end
 

app/models/user.rb

@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
   has_many :uploads, :dependent => :destroy, :order => 'created_at desc'
   has_one :current_avatar, :class_name => 'Avatar', :foreign_key => 'current_user_id', :dependent => :nullify
   has_many :streams, :dependent => :destroy, :order => 'created_at desc'
-  has_many :tfservers, :dependent => :destroy, :order => 'created_at desc'
+  has_many :tf2_servers, :dependent => :destroy, :order => 'created_at desc'
 
   has_many :subscriptions, :dependent => :destroy do
     def toggle(topic_id)

app/views/home/index.html.erb

@@ -11,7 +11,7 @@
   <%= render :file => 'articles/list' if enabled?('blog') %>
   <%= render :partial => 'events/mini' if enabled?('events') %>
   <%= render :file => 'streams/index' if enabled?('streams') %>
-  <%= render :file => 'tfservers/index' if enabled?('tfservers') %>
+  <%= render :file => 'tf2_servers/index' if enabled?('tf2_servers') %>
   <%= render :file => 'uploads/index' if enabled?('files') %>
   <%= render :file => 'headers/list' if enabled?('headers') %>
   <%= render :file => 'users/index' if enabled?('users') %>

app/views/shared/nav.html.erb

@@ -27,7 +27,7 @@
         <% elsif current_controller == 'uploads' %><%= link_to I18n.t(:upload_a_new_file), new_upload_path %>
         <% elsif current_controller == 'users' %><%= link_to I18n.t(:register_a_new_user), new_user_path %>
         <% elsif current_controller == 'streams' %><%= link_to I18n.t(:add_a_new_stream), new_stream_path %>
-        <% elsif current_controller == 'tfservers' %><%= link_to I18n.t(:add_a_new_tfserver), new_tfserver_path %>
+        <% elsif current_controller == 'tf2_servers' %><%= link_to I18n.t(:add_a_new_tf2_server), new_tf2_server_path %>
         <% end %>
       <% end %>
       &nbsp; <%= link_to I18n.t(:search), search_path(:type => current_controller) %>

app/views/shared/nav2.html.erb

@@ -310,14 +310,14 @@
     <% end %>
   </div>
 <% end %>
-<% if current_controller == 'tfservers' and current_action == 'show' %>
+<% if current_controller == 'tf2_servers' and current_action == 'show' %>
   <div class="info-left">
     <%= link_to I18n.t(:home), root_path %> &raquo; 
-    <%= link_to I18n.t(:tfservers), tfservers_path %> &raquo; <%=h @tfserver.title %>
+    <%= link_to I18n.t(:tf2_servers), tf2_servers_path %> &raquo; <%=h @tf2_server.title %>
   </div>
   <div class="info-right">
-    <% if can_edit?(@tfserver) %>
-      &nbsp; <%= link_to I18n.t(:edit_tfserver), edit_tfserver_path(@tfserver) %>
+    <% if can_edit?(@tf2_server) %>
+      &nbsp; <%= link_to I18n.t(:edit_tf2_server), edit_tf2_server_path(@tf2_server) %>
     <% end %>
   </div>
 <% end %>

app/views/shared/tabs.html.erb

@@ -8,5 +8,5 @@
   <% if enabled? "headers" %><li id="tab-headers" class="tab <%= tab('headers') %>"><%= link_to I18n.t(:headers), headers_path %></li><% end %>
   <% if enabled? "users" %><li id="tab-users" class="tab <%= tab('users') %>"><%= link_to I18n.t(:users), users_path %></li><% end %>
   <% if enabled? "streams" %><li id="tab-streams" class="tab <%= tab('streams') %>"><%= link_to I18n.t(:streams), streams_path %></li><% end %>
-  <% if enabled? "tfservers" %><li id="tab-tfservers" class="tab <%= tab('tfservers') %>"><%= link_to I18n.t(:tfservers), tfservers_path %></li><% end %>
+  <% if enabled? "tf2_servers" %><li id="tab-tf2_servers" class="tab <%= tab('tf2_servers') %>"><%= link_to I18n.t(:tf2_servers), tf2_servers_path %></li><% end %>
 </ul>

app/views/tf2_servers/edit.html.erb

@@ -0,0 +1,24 @@
+<%= render "shared/error_messages", :target => @tf2_server %>
+<%= form_for @tf2_server do |f| -%>
+  <div class="box" id="box-tf2_servers-edit">
+    <span class="top"><%=t :edit_tf2_server %></span>
+    <p class="label">
+      <label for="tf2_server_title"><%=t :title %></label>
+    </p>
+    <p><%= f.text_field :title, :style => "width:31%" %></p>
+    <p class="label">
+      <label for="tf2_server_ip">IP</label>
+    </p>
+    <p><%= f.text_field :ip, :style => "width:31%" %></p>
+    <p class="label">
+      <label for="tf2_server_port"><%=t :port %></label>
+    </p>
+    <p><%= f.text_field :port, :style => "width:31%" %></p>
+
+	<p>
+      <%= submit_tag I18n.t(:save_changes), :disable_with => I18n.t(:save_changes) %>&nbsp; 
+      <%= link_to I18n.t(:delete), @tf2_server, :confirm => I18n.t(:are_you_sure), :method => :delete %> &nbsp;
+      <%= link_to I18n.t(:cancel), @tf2_server %>
+    </p>
+  </div>
+<% end %>

app/views/tf2_servers/index.html.erb

@@ -0,0 +1,45 @@
+<% if current_controller == 'tf2_servers' %>
+  <div class="info-left">
+    <span class="title"><%=t :tf2_servers %></span>
+    <span class="detail">&nbsp;| &nbsp;<%= pluralize((@tf2_servers_count || 0), t(:tf2_server)) %></span>
+  </div>
+  <div class="info-right">
+    <span class="title">&nbsp;</span>
+  </div>
+  <div class="clear"> </div>
+
+
+<% end %>
+
+<% unless @tf2_servers.blank? %>
+  <table cellspacing="0">
+    <thead>
+      <tr>
+        <th class="tcl"><%= link_to I18n.t(:tf2_servers), tf2_servers_path %></th>
+        <th class="tcm"><%=t :players %></th>
+        <% unless current_controller == 'home' %>
+          <th class="tcl"><%=t :ip %></th>
+          <th class="tcl"><%=t :map %></th>
+          <th class="tcr"><%=t :last_updated %></th>
+        <% end %>
+      </tr>
+    </thead>
+    <tbody>
+      <% for tf2_server in @tf2_servers %>
+        <tr>
+          <td class="tcl"><%= link_to h(tf2_server.title), tf2_server %><% if current_controller == 'home' %> <%= server_connect_link(tf2_server) %><% end %></td>
+          <td class="tcm"><%= tf2_server.players %> / <%= tf2_server.max_players %></td>
+          <% unless current_controller == 'home' %>
+            <td class="tcl"><%= tf2_server.ip %>:<%= tf2_server.port %> <%= server_connect_link(tf2_server) %></td>
+          	<td class="tcl"><%= tf2_server.map %>
+			<% if not tf2_server.gametype.blank? %>
+				(<%=h tf2_server.gametype %>)
+			<% end %>
+			</td>
+            <td class="tcr"><%= time_ago_or_time_stamp(tf2_server.updated_at) %></td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

app/views/tfservers/new.html.erb → app/views/tf2_servers/new.html.erb

@@ -1,9 +1,9 @@
-<%= render "shared/error_messages", :target => @tfserver %>
-<%= form_for @tfserver do |f| %>
-  <div class="box" id="box-tfservers-new">
-    <span class="top"><%=t :new_tfserver %></span>
+<%= render "shared/error_messages", :target => @tf2_server %>
+<%= form_for @tf2_server do |f| %>
+  <div class="box" id="box-tf2_servers-new">
+    <span class="top"><%=t :new_tf2_server %></span>
     <p class="label">
-      <label for="tfserver_title"><%=t :title %></label>
+      <label for="tf2_server_title"><%=t :title %></label>
     </p>
     <p><%= f.text_field :title, :style => "width:31%", :class => 'text-field' %></p>
     <p class="label">
@@ -15,8 +15,8 @@
     </p>
     <p><%= f.text_field :port, :style => "width:31%", :class => 'text-field' %></p>
     <p>
-      <%= submit_tag I18n.t(:add_tfserver), :disable_with => I18n.t(:add_tfserver) %>&nbsp;
-      <%= link_to I18n.t(:cancel), tfservers_path %>
+      <%= submit_tag I18n.t(:add_tf2_server), :disable_with => I18n.t(:add_tf2_server) %>&nbsp;
+      <%= link_to I18n.t(:cancel), tf2_servers_path %>
     </p>
   </div>
 <% end %>

app/views/tf2_servers/show.html.erb

@@ -0,0 +1,22 @@
+<div class="box" id="box-users-show">
+  <span class="top"><%=t :tf2_server %> <%= server_connect_link(@tf2_server) %></span>
+  <div style="margin-top:10px;">
+    <span class="profile-title"><%=h @tf2_server.title %></span>
+  </div>
+
+  <p style="margin-top:20px">
+  	Map: <%= @tf2_server.map %>  	
+	<% if !@tf2_server.gametype.blank? %>
+		(<%=h @tf2_server.gametype %>)
+	<% end %>
+	<br /><br />
+  	Players: <%=h @tf2_server.players %> / <%=h @tf2_server.max_players %><br />
+	<% unless @tf2_server.players_list.blank? %>
+		<% for player in @tf2_server.players_list.split("%") %>
+			<%= player %> <br />
+		<% end %>
+	<% end %>
+  </p>
+  <div class="clear"> </div>  
+
+</div>