=== components/plugins/sidebars/serverstats/content.rhtml
==================================================================
--- components/plugins/sidebars/serverstats/content.rhtml	(/typo/trunk)	(revision 654)
+++ components/plugins/sidebars/serverstats/content.rhtml	(/typo/patchs/server_stats)	(revision 654)
@@ -0,0 +1,4 @@
+<h3>Server Stats</h3>
+<p class="stats">Uptime: <%= @uptime %><br />
+Load: <%= @server_load %></p>
+
=== components/plugins/sidebars/serverstats/configure.rhtml
==================================================================
--- components/plugins/sidebars/serverstats/configure.rhtml	(/typo/trunk)	(revision 654)
+++ components/plugins/sidebars/serverstats/configure.rhtml	(/typo/patchs/server_stats)	(revision 654)
@@ -0,0 +1,8 @@
+<%= form_tag({},{:id => 'configure_'+@sidebar.id.to_s, :class=>'configblock'}) %>
+  Nothing to configure
+<%= end_form_tag %>
+
+<%= observe_form "configure_"+@sidebar.id.to_s, 
+    :url => { :action => "save_config", :id=>@sidebar.id},
+    :with => 'value'
+ %>
=== components/plugins/sidebars/serverstats_controller.rb
==================================================================
--- components/plugins/sidebars/serverstats_controller.rb	(/typo/trunk)	(revision 654)
+++ components/plugins/sidebars/serverstats_controller.rb	(/typo/patchs/server_stats)	(revision 654)
@@ -0,0 +1,43 @@
+class Plugins::Sidebars::ServerstatsController < Sidebars::Plugin
+  def self.display_name
+    "Server Stats"
+  end
+
+  def self.description
+    "Display your server's uptime and load"
+  end
+
+  def self.default_config
+    { 'enabled' => true }
+  end
+
+  def content
+    # First create a string for the uptime
+    @uptime = String.new
+    # Make a REGEX to take the end of the string off
+    remove_uptime_end = /,\s*[0-9]*? user|users/
+    # Call uptime (Works on the ouput of `uptime` on Debian Sarge and OSX)
+    uptime = `uptime`
+    # Use the REGEX on the string and then set the Beginning part of the 
+    # string to temp (basically cut the tail off and assign the start to temp)
+    remove_uptime_end =~ uptime
+    temp = $`
+    # Make a new REGEX for the beginning of the remainder of the string
+    remove_uptime_start = /\s*(\d*:).*\sup /
+    # Now split the string with the REGEX
+    remove_uptime_start =~ temp
+    # Now call the part after the REGEX and assign it to @uptime
+    @uptime = $'
+    
+    ## Now for the average load
+    # Set the REGEX up
+    remove_load_start = /load average[s]*:/i
+    # Reuse the uptime command string and prefrom the REGEX on it
+    remove_load_start =~ uptime
+    # Save the string after the REGEX
+    @server_load = $'
+  end
+
+  def configure
+  end
+end
=== themes/azure/stylesheets/azure.css
==================================================================
--- themes/azure/stylesheets/azure.css	(/typo/trunk)	(revision 654)
+++ themes/azure/stylesheets/azure.css	(/typo/patchs/server_stats)	(revision 654)
@@ -392,3 +392,9 @@
 code {
   font-size:120%;
 }
+
+
+/* Server Stats Plugin CSS */
+p.stats {
+  color: #5189b5;
+}
\ No newline at end of file

Property changes on: 
___________________________________________________________________
Name: svk:merge
  6645f161-78fe-0310-8d33-a8248e50aba0:/typo/patchsets/tags:1121
  6645f161-78fe-0310-8d33-a8248e50aba0:/typo/patchsets/themeview:1295
  6645f161-78fe-0310-8d33-a8248e50aba0:/typo/trunk:1275
 +820eb932-12ee-0310-9ca8-eeb645f39767:/trunk:683
  8fc380a4-8bf6-0310-ba91-ca14f1d5e6a8:/typo/local:2937
  c64e5dbe-8bf6-0310-864a-9a43938b80cd:/typo/local:2701
  e93b0a62-8af6-0310-b38d-b2bec57c4c1e:/typo/local:4349