webroar 0.4.0 → 0.5.0

data/src/admin_panel/app/views/admin/configuration.html.erb

@@ -17,50 +17,42 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<div id = 'container_data'>
+  <style>
+    form { margin:0px;display:inline;}
+  </style>
   <br/>
   <div id = "page_name"><%=image_tag("tit_configuration_ad.gif", :border => '0')%></div>
   <%port, min_worker, max_worker, log_level, ssl_support, ssl_port, certificate, key, access_log = ServerSpecification.get_fields %>	
-  <br/>
-  <div class = "text_align_center">
-    <table width = 95% cellpadding = "4">
+  <br/>  
+    <table width = 95% >
       <tr>
-        <td class = 'table_header' colspan = 3>Server Specifications</td>
+        <th  colspan = 3>Server Specifications</th>
       </tr>
       <tr>
-        <td width = 40% class = 'BG_dark_gray'> Port&nbsp;&nbsp;&nbsp;</td>	
-        <td width = 40% class = 'BG_dark_gray'><div id = 'port_div'><%=h(port)%></div></td>
-        <td width = 20% class = 'BG_dark_gray'><%=link_to_remote 'Edit', :update => 'port_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'port_div'}%></td>
+        <td width = 40% > Port</td>	
+        <td width = 40% ><div id = 'port_div'><%=h(port)%></div></td>
+        <td width = 20% ><%=link_to_remote 'Edit', :update => 'port_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'port_div'}%></td>
       </tr>
       <tr>
-        <td class = 'BG_white'>Minimum number of workers&nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('minworker')"%>
-          </span>
-          <br/> <div id = 'minworker' class = 'font_size_12'></div>
+        <td >Minimum number of workers&nbsp;&nbsp;&nbsp;
+            <%=link_to_function "Help", :onclick => "addHelp('minworker',event)"%>
         </td>
-        <td class = 'BG_white'><div id = 'min_pro_div'><%=h(min_worker)%></div></td>
-        <td class = 'BG_white'><%=link_to_remote 'Edit', :update => 'min_pro_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'min_pro_div'}%></td>
+        <td ><div id = 'min_pro_div'><%=h(min_worker)%></div></td>
+        <td ><%=link_to_remote 'Edit', :update => 'min_pro_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'min_pro_div'}%></td>
       </tr>
       <tr>
-        <td class = 'BG_dark_gray'>Maximum number of workers&nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('maxworker')"%>
-          </span>
-          <br/> <div id = 'maxworker' class = 'font_size_12'></div>
+        <td >Maximum number of workers&nbsp;&nbsp;&nbsp;
+            <%=link_to_function "Help", :onclick => "addHelp('maxworker',event)"%>
         </td>
-        <td class = 'BG_dark_gray'><div id = 'max_pro_div'><%=h(max_worker)%></td>
-        <td class = 'BG_dark_gray'><%=link_to_remote 'Edit', :update => 'max_pro_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'max_pro_div'}%></td>
+        <td ><div id = 'max_pro_div'><%=h(max_worker)%></div></td>
+        <td ><%=link_to_remote 'Edit', :update => 'max_pro_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'max_pro_div'}%></td>
       </tr>
       <tr>
-        <td class = 'BG_white'>Log Level&nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%=link_to_function "Help", :onclick => "addHelp('log_level')"%>
-          </span>
-          <br/> <div id = 'log_level' class = 'font_size_12'></div>
+        <td >Log Level&nbsp;&nbsp;&nbsp;
+            <%=link_to_function "Help", :onclick => "addHelp('log_level',event)"%>
         </td>
-        <td class = 'BG_white'><div id = 'log_div'><%=h(log_level)%></div></td>
-        <td class = 'BG_white'><%=link_to_remote 'Edit', :update => 'log_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'log_div'}%></td>
+        <td ><div id = 'log_div'><%=h(log_level)%></div></td>
+        <td ><%=link_to_remote 'Edit', :update => 'log_div', :url => {:controller => 'server_specification', :action => 'add_text_box', :div_id => 'log_div'}%></td>
       </tr>
     </table>
     <br/><br/>
@@ -73,15 +65,12 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
       <%else%>
         <%=render :partial => 'mail_specification/current_spec' %>    
       <%end%>  
-    </div>
-		<div id = 'headers_div'>
-			<%= render :partial => 'headers/headers_table' %>
-		</div>
-		<br/>
-		<br/>		
+    </div>   
+  	<div id = 'headers_div'>
+  		<%= render :partial => 'headers/headers_table' %>
+  	</div>
+  	<br/>
+  	<br/>		
     <div id = 'application_list_table'>
-      <%=render :partial => 'application_table', :locals => {:start => 0}%>
-    </div>
-  </div>
-  <br/><br/><br/>
-</div>
+      <%=render :partial => 'application_table'%>
+    </div>

data/src/admin_panel/app/views/admin/home.html.erb

@@ -17,61 +17,55 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
+<script>
+function loadDivs(arr) {
+  for ( i = 0 ; i < arr.length ; i=i+2) {
+    if(document.getElementById(arr[i]) != null){
+      document.getElementById(arr[i]).innerHTML = arr[i+1];
+    }
+  }
+}
+</script>
 
-<div id = 'container_data'>
-  <br/>
-  <div id = "page_name"><%=image_tag("tit_home_ad.gif")%></div>
-  <br/>
-  <div class = "text_align_center">
-    <table width = 95%  border = 0 cellpadding = "4">
+    <br/>
+    <div id = "page_name"><%=image_tag("tit_home_ad.gif")%></div>
+    <br/> 
+    <span id='update_data'></span> 
+    <table width = 95% >
       <tr>
-        <td  class = "table_header" colspan = 2> Server Snapshot </td>
+        <th colspan = 2>Server Snapshot </th>
       </tr>
       <tr>
-        <td  class = 'BG_dark_gray'>CPU Usage</td>
-        <td  class = 'BG_dark_gray'><span id = 'server_cpu_usage'><%=@server_resource_usage[0]%></span> %</td>
+        <td  >CPU Usage</td>
+        <td  ><span id = 'server_cpu_usage'><%="%.2f" % @server_resource_usage[0]%></span> %</td>
       </tr>
       <tr>
-        <td  class = 'BG_white'>Memory Usage</td>
-        <td  class = 'BG_white'><span id = 'server_memory_usage'><%=format("%.2f",@server_resource_usage[1]/1024.to_f)%></span> MB</td>
+        <td  >Memory Usage</td>
+        <td  ><span id = 'server_memory_usage'><%=format("%.2f",@server_resource_usage[1]/1024.to_f)%></span> MB</td>
       </tr>
     </table>
     <br/><br/>
-    <table width = 95%  border = 0 cellpadding = "4">
+    <table width = 95%>
       <%if @info and @info['Application Specification']%>						
         <tr>
-          <td  class = "table_header" colspan = 6>Deployed Applications</td>
+          <th colspan = 6>Deployed Applications</th>
         </tr>
         <tr>
-          <td class = "sub_header" width = "25%">Application Name</td>
-          <td class = "sub_header" width = "15%">CPU Usage</td>
-          <td class = "sub_header" width = "15%">Memory Usage</td>
-          <td class = "sub_header" width = "15%">Minimum Workers</td>
-          <td class = "sub_header" width = "15%">Maximum Workers</td>	
-          <td class = "sub_header" width = "15%">New Exceptions</td>	
+          <td class = "sub_header text_align_center" width = "25%">Application Name</td>
+          <td class = "sub_header text_align_center" width = "15%">CPU Usage</td>
+          <td class = "sub_header text_align_center" width = "15%">Memory Usage</td>
+          <td class = "sub_header text_align_center" width = "15%">Minimum Workers</td>
+          <td class = "sub_header text_align_center" width = "15%">Maximum Workers</td>	
+          <td class = "sub_header text_align_center" width = "15%">New Exceptions</td>	
         </tr> 	
         <%=application_list_home%>		
       <%else%>
         <tr>
-          <td  class = "table_header" colspan = 5>&nbsp;</td>
+          <th colspan = 5>&nbsp;</th>
         </tr>
         <tr>
-          <td colspan = 5 align = center class = 'header'><%=NO_DEPLOYED_APPLICATION_MESSAGE%><br/> Please use <%=link_to 'Configuration', :controller => 'admin', :action => 'configuration'%> tab to deploy applications.</td>
+          <td colspan = 5 align = center><%=NO_DEPLOYED_APPLICATION_MESSAGE%><br/> Please use <%=link_to 'Configuration', :controller => 'admin', :action => 'configuration'%> tab to deploy applications.</td>
         </tr>
       <%end%>
-    </table>
-  </div>
-</div>
-
-<% if (@info['Application Specification'])%>
-  <%i = 0%>
-  <%while(@info['Application Specification'][i])%>
-    <%= periodically_call_remote( :update => "#{@info['Application Specification'][i]['name']}_cpu", :url => { :controller => 'admin', :action => 'get_latest_app_cpu_usage', :app_name => @info['Application Specification'][i]['name']}, :frequency => 60)%>
-    <%= periodically_call_remote( :update => "#{@info['Application Specification'][i]['name']}_memory", :url => { :controller=>'admin',:action => 'get_latest_app_memory_usage', :app_name => @info['Application Specification'][i]['name']}, :frequency => 60)%>
-    <%= periodically_call_remote( :update => "#{@info['Application Specification'][i]['name']}_exception", :url => { :controller=>'exceptions',:action => 'get_exception',:app_name=>@info['Application Specification'][i]['name']},
-      :frequency => 60)%>
-    <%i += 1%>
-  <%end%>	
-<%end%>
-<%= periodically_call_remote( :update => 'server_cpu_usage', :url => { :controller => 'admin', :action => 'get_latest_server_cpu_usage'}, :frequency => 60)%>
-<%= periodically_call_remote( :update => 'server_memory_usage', :url =>{ :controller => 'admin', :action => 'get_latest_server_memory_usage'}, :frequency => 60)%>
+  </table>
+<%= periodically_call_remote( :update => 'update_data', :url =>{ :controller => 'admin', :action => 'get_latest_updates'}, :frequency => 60)%>

data/src/admin_panel/app/views/admin/index.html.erb

@@ -22,24 +22,21 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
   <div id = 'login_header'>Admin Panel</div>
   <div id = 'login_logo'></div>	
   <div id = 'login_form'>
-    <table width = 100%>
-      <%form_for(:user, :url => {:action => 'login'})do%>
+    <table>
+      <%form_for(:user, :url => {:action => 'login'},:html => { :onsubmit => 'return validate_user(this)'}) do%>
         <tr>
-          <th colspan = 2><span id = 'error_div'><%if(flash[:notice])%><%=h(flash[:notice])%><%end%></span></th>
+          <th colspan = 2 id = 'error_div' style="padding:0px;"><%if(flash[:notice])%><%=h(flash[:notice])%><%end%></th>
         </tr>
         <tr>
-          <td><b>&nbsp;&nbsp;&nbsp;User Name</b></td>
-          <td class = 'login_text'><%=text_field :user, :name, :size => 20, :tabindex => "1"%></td>
+          <td><b>User Name</b></td>
+          <td><%=text_field :user, :name, :size => 15, :tabindex => "1"%></td>
         </tr>
         <tr>
-          <td><b>&nbsp;&nbsp;&nbsp;Password</b></td>
-          <td class = 'login_text'><%=password_field :user, :password, :size => 20, :tabindex => "2"%></td>
+          <td><b>Password</b></td>
+          <td><%=password_field :user, :password, :size => 15, :tabindex => "2"%></td>
         </tr>
         <tr>
-          <th  colspan = 2>&nbsp;</th>
-        </tr>
-        <tr>
-          <th  colspan = 2 class = 'login_button'><b><%=submit_tag 'Login', :tabindex => "3"%></b></th>
+          <th  colspan = 2 align='center'><b><%=submit_tag 'Login', :tabindex => "3"%></b></th>
         </tr>
       <%end%>
     </table>

data/src/admin_panel/app/views/application_specification/_application_specification_form.html.erb

@@ -23,101 +23,80 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 <% else %>
   <% url = {:controller => 'application_specification', :action => 'add_application'} %>
 <% end %>
-<%form_remote_for :application_specification, :url => url, :before => "show_busy_div()", :complete => "hide_busy_div(request)", :update => "application_specification_form" do %>	
+<%form_remote_for :application_specification, :url => url, :html => { :onsubmit => 'if(!validate_application(this)){return false;}'} ,:before => "show_busy_div()", :complete => "hide_busy_div(request)", :update => "application_specification_form" do %>	
   <div class = "text_align_center">
-    <table width = 60% cellpadding = '4'>
+    <table width = 60% >
       <tr>
-        <th class = 'table_header' colspan = 2><%= type %> Application</th>
+        <th colspan = 2><%= type %> Application</th>
       </tr>
       <tr>
-        <th colspan = 2><div id = 'error_div'><%= error_messages_for 'application_specification' %></div></th>
+        <td colspan = 2 id = 'error_div' style="padding:0px;"><%= error_messages_for 'application_specification' %></td>
       </tr>
       <tr>
-        <td class = "BG_dark_gray"  style = "width:60%;">Application Name<span id = 'needed'>*</span></td>
+        <td>Application Name<span id = 'needed'>*</span></td>
         <% if controller.action_name == "edit_application_form" or controller.action_name == "edit_application" %>
-          <td class = "BG_dark_gray"> <%= @application_specification.name%><%=hidden_field :application_specification, :name %></td>
+          <td > <%= @application_specification.name%><%=hidden_field :application_specification, :name %></td>
         <% else %>     
-          <td class = "BG_dark_gray"><%= text_field :application_specification, :name, :size => 20, :tabindex => "1" %></td>
+          <td><%= text_field :application_specification, :name, :size => 20, :tabindex => "1" %></td>
         <% end %>
       </tr>
       <tr>
-        <td class = 'BG_white' style = "height:30px;">Resolver<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help",:onclick => "addHelp('resolver')" %>
-          </span>
-          <br/> <div id = 'resolver' class = 'font_size_12'></div>
+        <td>Resolver<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help",:onclick => "addHelp('resolver',event)" %>
         </td>
-        <td class = 'BG_white'><%= text_field :application_specification, :resolver, :size => 20, :tabindex => "2" %></td>
+        <td><%= text_field :application_specification, :resolver, :size => 20, :tabindex => "2" %></td>
       </tr>
       <tr>
-        <td class = "BG_dark_gray" style = "height:30px;">Path<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick=>"addHelp('path')" %>
-          </span>
-          <br/> <div id = 'path' class = 'font_size_12' ></div>
+        <td>Path<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help", :onclick=>"addHelp('path',event)" %>
         </td>
-        <td class = "BG_dark_gray"><%= text_field :application_specification, :path, :size => 20, :tabindex => "3" %></td>
+        <td ><%= text_field :application_specification, :path, :size => 20, :tabindex => "3" %></td>
       </tr>
       <tr>
-        <td class = 'BG_white' style = "height:30px;">RunAsUser<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick => "addHelp('runasuser')" %>
-          </span>
-          <br/> <div id = 'runasuser' class = 'font_size_12'></div>
+        <td>RunAsUser<span id = 'needed'>*</span> &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help", :onclick => "addHelp('runasuser',event)" %>
         </td>
-        <td class = 'BG_white'><%= text_field :application_specification, :run_as_user, :size=>20, :tabindex => "4" %></td>
+        <td><%= text_field :application_specification, :run_as_user, :size=>20, :tabindex => "4" %></td>
       </tr>
       <tr>
-        <td class = "BG_dark_gray" style = "height:30px;">Type &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick => "addHelp('type')" %>
-          </span>
-          <br/> <div id = 'type' class = 'font_size_12'></div>
+        <td>Type &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help", :onclick => "addHelp('type',event)" %>
         </td>
-        <td class = "BG_dark_gray"><%= select :application_specification, :type1,%w{Rails Rack}, {}, {:onChange => 'disableAnalytics(this.value);', :tabindex => "5"} %></td>
+        <td><%= select :application_specification, :type1,%w{Rails Rack}, {}, {:onChange => 'disableAnalytics(this.value);', :tabindex => "5"} %></td>
       </tr>
       <tr>
-        <td class = 'BG_white' style = "height:30px;">Analytics &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick => "addHelp('analytics')" %>
-          </span>
-          <br/> <div id = 'analytics' class = 'font_size_12'></div>
+        <td>Analytics &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help", :onclick => "addHelp('analytics',event)" %>
         </td>
-        <td class = 'BG_white'><%= select :application_specification, :analytics, @analytics, {}, {:tabindex => "6"} %></td>
+        <td><%= select :application_specification, :analytics, @analytics, {}, {:tabindex => "6"} %></td>
       </tr>
       <tr>
-        <td class = "BG_dark_gray" style = "height:30px;">Environment</td>
-        <td class = "BG_dark_gray"><%= text_field :application_specification, :environment, :size => 20, :tabindex => "7" %></td>
+        <td>Environment</td>
+        <td><%= text_field :application_specification, :environment, :size => 20, :tabindex => "7" %></td>
       </tr>
       <tr>
-        <td class = 'BG_white' style = "height:30px;">Minimum number of workers &nbsp;&nbsp;&nbsp;			
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick => "addHelp('app_minworker')" %>
-          </span>
-          <br/> <div id = 'app_minworker' class = 'font_size_12'></div>
+        <td>Minimum number of workers &nbsp;&nbsp;&nbsp;			
+            <%= link_to_function "Help", :onclick => "addHelp('app_minworker',event)" %>
         </td>
-        <td class = 'BG_white'><%=text_field :application_specification, :min_worker, :size=>20, :tabindex => "8"%></td>
+        <td ><%=text_field :application_specification, :min_worker, :size=>20, :tabindex => "8"%></td>
       </tr>
       <tr>
-        <td class = "BG_dark_gray" style = "height:30px;">Maximum number of workers &nbsp;&nbsp;&nbsp;
-          <span class = 'help_link'>
-            <%= link_to_function "Help", :onclick => "addHelp('app_maxworker')" %>
-          </span>
-          <br/> <div id = 'app_maxworker' class = 'font_size_12'></div>
+        <td>Maximum number of workers &nbsp;&nbsp;&nbsp;
+            <%= link_to_function "Help", :onclick => "addHelp('app_maxworker',event)" %>
         </td>
-        <td class = "BG_dark_gray"><%=text_field :application_specification, :max_worker, :size => 20, :tabindex => "9"%></td>
+        <td ><%=text_field :application_specification, :max_worker, :size => 20, :tabindex => "9"%></td>
       </tr>
       <tr>
         <%if type == "Edit"%>
-          <th class = 'BG_white' colspan = 2><%= hidden_field :application_specification, :app_id, :size => 20 %><br/>
-          <%= submit_tag 'Save and Restart', :tabindex => "10" %></th>
+          <td colspan = 2 align='center'><%= hidden_field :application_specification, :app_id %>
+          <%= submit_tag 'Save and Restart', :tabindex => "10" %></td>
         <%else%>			
-          <th class = 'BG_white' colspan = 2><%=hidden_field :application_specification, :app_id, :size => 20%><br/>
-          <%= submit_tag 'Deploy', :tabindex => "10" %></th>
+          <td colspan = 2 align='center'><%=hidden_field :application_specification, :app_id %>
+          <%= submit_tag 'Deploy', :tabindex => "10" %></td>
         <%end%>	
       </tr>	
       <tr>
-        <td colspan = 2 class = "BG_dark_gray"><%= link_to 'Back', configuration_path, :tabindex => "11" %></td>
+        <td colspan = 2 ><%= link_to 'Back', configuration_path, :tabindex => "11" %></td>
       </tr>	
     </table>
   </div>

data/src/admin_panel/app/views/application_specification/add_application_form.html.erb

@@ -18,12 +18,9 @@ You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<div id = 'container_data' class = "link"> 	
-  <br/>
-  
+  <br/>  
   <div id = "page_name"><%=image_tag("tit_configuration_ad.gif", :border => '0')%></div>
   <br/>
   <div id = "application_specification_form">	
     <%=render :partial => 'application_specification_form', :locals => { :type => 'Add' }%>
   </div>
-</div>

data/src/admin_panel/app/views/application_specification/edit_application_form.html.erb

@@ -17,12 +17,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
-<div id = 'container_data' class = "link"> 	
+ 	
   <br/>
   <div id = "page_name"><%=image_tag("tit_configuration_ad.gif", :border => '0')%></div>
   <br/>
   <div id = "application_specification_form">	
     <%=render :partial => 'application_specification_form', :locals => { :type  => 'Edit' } %>
-  </div>
-</div>                        
+  </div>                     

data/src/admin_panel/app/views/exceptions/_add_and_list_exception_classes.html.erb

@@ -0,0 +1,53 @@
+<!--
+WebROaR - Ruby Application Server - http://webroar.in/
+Copyright (C) 2009  Goonj LLC
+
+This file is part of WebROaR.
+
+WebROaR is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+WebROaR is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<%remote_form_for :data, :update => "add_and_list_exception_classes", :after => "exception_class.value=''", :url => {:controller => 'exceptions', :action => 'save_exception_class',:app_name => app_name}do%>
+  <table width="65%">  
+    <tr>
+     <th width="30%">Exception Class&nbsp;&nbsp;&nbsp;<%=link_to_function "Help", :onclick => "addHelp('exception_class',event)"%></th>
+     <td><%=text_field :exception, :class ,:size =>"20" %>
+       <% if flash[:notice] %>
+        <span class='error'><%= flash[:notice] %> </span>
+       <% end %>
+     </td>
+     <td width="10%"><%=submit_tag 'Add'%></td>
+    </tr>
+  </table>
+<%end%>
+<% if not @exception_classes.empty? %>  
+  <table width="65%">
+    <tr>      
+      <th>
+        Exception Classes
+      </th>        
+    </tr>
+    <% @exception_classes.each do |cls| %>   
+    <tr>
+      <td>
+        <%= cls %>
+      </td>
+      <td>
+        <%=link_to_remote image_tag('close.gif', :size => '15x15', :border => 0,:title => 'delete'), {:url => {:controller => 'exceptions', :action=>'delete_exception_class', :exception_class => cls ,:app_name => app_name},:update => "add_and_list_exception_classes"}%>
+      </td>
+    </tr>
+    <% end %>
+  </table>
+<% else %>
+  No exception class found
+<% end %>

data/src/admin_panel/app/views/exceptions/_add_exception_class_form.html.erb

@@ -0,0 +1,25 @@
+<!--
+WebROaR - Ruby Application Server - http://webroar.in/
+Copyright (C) 2009  Goonj LLC
+
+This file is part of WebROaR.
+
+WebROaR is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+WebROaR is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<div class='text_align_right'>
+  <%=link_to_remote 'Back',:url =>{:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => app_name, :status_name => 'permanently-ignored'}%>  
+</div>
+<div id="add_and_list_exception_classes">
+  <%=render :partial => 'add_and_list_exception_classes', :locals => {:app_name => app_name} %> 
+</div>

data/src/admin_panel/app/views/exceptions/_exception_list_partial.html.erb

@@ -17,33 +17,38 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
 <%if @exceptions.size >0 %>
 <% if current_status == OPEN_EXCEPTION %>
   <h3><center> Open Exceptions</center></h3>
 <% elsif current_status == CLOSED_EXCEPTION %>
   <h3><center> Closed Exceptions</center></h3>
 <% elsif current_status == IGNORED_EXCEPTION %>
-  <h3><center> Ignored Exceptions</center></h3> 
-<% end %> 
-<% form_tag '', :id => 'form_exception_list' do -%>
-<table width = 90% cellpadding = 5px>
+  <h3><center> Ignored Exceptions</center></h3>
+<% elsif current_status == PERMANENTLY_IGNORED_EXCEPTION %>
+  <div class='text_align_right'>
+    <%=link_to_remote 'Exception Classes', :update => 'data_div', :url => {:controller => 'exceptions', :action => 'save_exception_class_form' , :app_name => @application_name}%>
+  </div>
+  <h3><center> Permanently Ignored Exceptions</center></h3>
+<% end %>
+<span class='error'><%= flash[:notice] if flash[:notice] %></span>
+<% form_tag '', :id => 'form_exception_list',:name => 'form_exception_list' do -%>
+<table width = 90%>
     <tr>
-    	<td class = 'table_header' width = 1%> <%= check_box_tag 'check_all', 'check_all', false, :onclick =>'checkall(this)' %> </td>
-      <td class = 'table_header' width = 39%>Exception</td>
-      <td class = 'table_header' width = 20%>Class</td>
-      <td class = 'table_header' width = 20%>URL</td>  
-      <td class = 'table_header' width = 2%>Occurrences</td>
-      <td class = 'table_header' width = 18%>Time</td>      
+    	<th  width = 1%> <%= check_box_tag 'check_all', 'check_all', false, :onclick =>"checkAll(this,document.form_exception_list.exception_ids_)" %> </td>
+      <th  width = 39%>Exception</td>
+      <th  width = 20%>Class</td>
+      <th  width = 20%>URL</td>  
+      <th  width = 2%>Occurrences</td>
+      <th  width = 18%>Time</td>      
     </tr>
   <%@exceptions.each do |exception|%>
     <tr id="exception_<%= exception.id %>">
-    	<td> <%= check_box_tag 'exception_ids[]', exception.id %> </td>
+    	<td> <%= check_box_tag 'exception_ids[]', exception.id,false, :onclick => "uncheckMain(this)" %> </td>
       <td><%= link_to_remote "#{h truncate(exception.exception_message, :length => 80)}", :update => 'data_div', :url => {:controller => 'exceptions', :action => 'show', :id => exception.id, :app_name => @application_name, :status_name => status_name, :page => @exceptions.current_page} %> </td>
       <td><%=h exception.exception_class%></td>
-      <td><%=h exception.controller%>/<%=exception.method%></td>
-      <td><%=h exception.count%></td>
-      <td><%=h exception.wall_time.strftime("%d-%b-%Y %H:%M:%S")%></td>
+      <td><%=h exception.latest_detail.controller%>/<%=exception.latest_detail.method%></td>
+      <td><%=h exception.exceptions_count%></td>
+      <td><%=h exception.latest_detail.wall_time.strftime("%d-%b-%Y %H:%M:%S")%></td>
     </tr>
   <%end%>
 <% end -%>
@@ -51,22 +56,35 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
     	<td colspan = 6>
     		<b>Take Action:</b>
 				<% unless current_status == OPEN_EXCEPTION %>
-				  <b><%=link_to_remote 'Reopen', :condition => "checkMarked()", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "open", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
+				  <b><%=link_to_remote 'Reopen', :condition => "checkMarked('Reopen')", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "open", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
 				<% end %>
 				<% unless current_status == CLOSED_EXCEPTION %> 
-				  <b><%=link_to_remote 'Close', :condition => "checkMarked()", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "close", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
+				  <b><%=link_to_remote 'Close', :condition => "checkMarked('Close')", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "close", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
 			  <% end %>
 				<% unless current_status == IGNORED_EXCEPTION %>
-				<b><%=link_to_remote 'Ignore', :condition => "checkMarked()", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "ignore", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
+				<b><%=link_to_remote 'Ignore', :condition => "checkMarked('Ignore')", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "ignore", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %></b>
 				<% end %>
+				<span style='margin-left:21%;'>
+				  ( <%= @exceptions.offset + 1 %> to <%= @exceptions.size + @exceptions.offset %> of <%= @exceptions.total_entries %> )
+				</span>
 				<%#=link_to_remote 'Delete', :condition => "checkMarked('delete')", :url => {:controller => 'exceptions', :action => 'change_status', :status_name => "delete", :current_status => status_name, :app_name => @application_name, :page => @exceptions.current_page }, :submit => 'form_exception_list', :method => :put  %>
     	</td>
 	  </tr>
+	  <% if will_paginate @exceptions %>
+      <tr>
+        <td colspan = 6>
+          <%= will_paginate @exceptions, :params => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => @application_name, :status_name => status_name ,:per_page => session[:per_page]} %>
+        </td>
+      </tr>
+    <% end %>
     <tr>
-      <td colspan = 6>        	
-      	<%= will_paginate @exceptions, :params => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => @application_name, :status_name => status_name} %>
-      </td>
-    </tr>    
+      <th colspan='6'>
+        <div class='text_align_right'>
+          Size : <%=select 'per', 'page',%w{5 10 15 20 25 30},:selected => params[:per_page] || session[:per_page]%>
+          <%= observe_field 'per_page',:url => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => @application_name, :status_name => status_name}, :with => 'per_page'%>
+        </div>
+      </th>
+    </tr>
   </table>
 
 <%else%>
@@ -76,5 +94,10 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 	  No closed exceptions currently for this application.
 	<% elsif current_status == IGNORED_EXCEPTION %>
 	  No ignored exceptions currently for this application.
+	<% elsif current_status == PERMANENTLY_IGNORED_EXCEPTION %>
+    <div class='text_align_right'>
+      <%=link_to_remote 'Exception Classes', :update => 'data_div', :url => {:controller => 'exceptions', :action => 'save_exception_class_form' , :app_name => @application_name}%>
+    </div>
+    No permanently-ignored exceptions currently for this application.
 	<% end %> 
 <%end%>

data/src/admin_panel/app/views/exceptions/_exceptions_listing_partial.html.erb

@@ -19,9 +19,9 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
   <br/>
-  <div id='reload'>Select Status:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%=select :status,:name,%w{Open Closed Ignored}%></div>
+  <div class='text_align_right'>Select Status : <%=select :status,:name,%w{Open Closed Ignored Permanently-Ignored}%></div>
   <hr/>
-  <div style="font-weight:bold;font-size:14;">Application Name : <%=@application_name%>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+  <div class="app_name">Application Name : <%=@application_name%></div>
   <hr/>
   <br/>
   <div id='data_div'>