webroar 0.3.1 → 0.4.0

data/src/admin_panel/app/helpers/admin_helper.rb

@@ -183,89 +183,4 @@ module AdminHelper
     end
     return block
   end
-  
-  #To help the configuration page to display the mail configuration.
-  def mail_config_block()
-    if File.exist?(MAIL_FILE_PATH) and info = YAML::load_file(MAIL_FILE_PATH)      
-      if info['smtp']
-        block = "<table width = 95%>
-                    <tr>
-                      <td class = 'table_header_link' width = 50% colspan = 2><b>Mail Settings :- SMTP</b>&nbsp;&nbsp;&nbsp;
-                    			<span class = 'help_link'>
-                      				#{link_to_function('Help', :onclick => 'addHelp("mail");')}
-                    			</span>
-                    			<br/> <div id = 'mail' class = 'font_size_12'></div>
-                      </td>
-                      <td class = 'table_header_link' width = 25%>#{link_to_remote 'Sendmail', :update => 'mail_div', :url =>  {:controller => 'mail_specification', :action => 'sendmail_form'}}</td>
-                      <td class = 'table_header_link' width = 25%>#{link_to_remote 'Edit', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'edit_smtp', :smtp => info['smtp']}}</td>
-                    </tr>
-                      <tr>
-                            <td class = 'BG_dark_gray' width = 25%>Server</td>
-                            <td class = 'BG_dark_gray' width = 25%>#{info['smtp']['address']}</td>
-                            <td class = 'BG_dark_gray' width = 25%>Port</td>
-                            <td class = 'BG_dark_gray' width = 25%>#{info['smtp']['port']}</td>
-                      </tr>
-                      <tr>
-                            <td class = 'BG_white'>Domain</td>
-                            <td class = 'BG_white'>#{info['smtp']['domain']}</td>
-                            <td class = 'BG_white'>Authenitcation</td>
-                            <td class = 'BG_white'>#{info['smtp']['authentication']}</td>
-                      </tr>
-                      <tr>
-                            <td class = 'BG_dark_gray'>User Name</td>
-                            <td class = 'BG_dark_gray'>#{info['smtp']['user_name']}</td>
-                            <td class = 'BG_dark_gray'>Password</td>
-                            <td class = 'BG_dark_gray'>**************</td>
-                      </tr>
-                      <tr>
-                            <td class = 'BG_white'>Sender's Email Address</td>
-                            <td class = 'BG_white'>#{info['smtp']['from']}</td>
-                            <td class = 'BG_white'>Recipient Email Addresses</td>
-                            <td class = 'BG_white'>#{info['smtp']['recipients']}</td>
-                      </tr>
-                      <tr>
-                      </tr>
-                </table><br/><br/>"
-      elsif info['sendmail']
-        block = "<table width = 95%>
-                    <tr>
-                      <td class = 'table_header_link' width = 50%><b>Mail Settings :- Sendmail</b>&nbsp;&nbsp;&nbsp;
-                    			<span class = 'help_link'>
-                      				#{link_to_function('Help', :onclick => 'addHelp("mail");')}
-                    			</span>
-                    			<br/> <div id = 'mail' class = 'font_size_12'></div>
-                      </td>
-                      <td class = 'table_header_link' width = 25%>#{link_to_remote 'SMTP', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'smtp_form'}}</td>
-                      <td class = 'table_header_link' width = 25%>#{link_to_remote 'Edit', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'edit_sendmail', :sendmail => info['sendmail']}}</td>
-                    </tr>
-                      <tr>
-                            <td class = 'BG_dark_gray' width = 50%>Location</td>
-                            <td colspan = 2 class = 'BG_dark_gray'width = 50%>#{info['sendmail']['location']}</td>
-                      </tr>
-                      <tr>
-                            <td class = 'BG_white'>Sender's Email Address</td>
-                            <td colspan = 2 class = 'BG_white'>#{info['sendmail']['from']}</td>
-                      </tr>
-                      <tr>
-                            <td class = 'BG_dark_gray'>Recipient Email Addresses</td>
-                            <td colspan = 2 class = 'BG_dark_gray'>#{info['sendmail']['recipients']}</td>
-                      </tr>
-                </table><br/><br/>"
-      end
-    else
-      block  = "<table width = 95%>
-                <tr>
-                    <td class = 'table_header_link' width = 80%><b>Mail Settings</b>&nbsp;&nbsp;&nbsp;
-                    			<span class = 'help_link'>
-                      				#{link_to_function('Help', :onclick => 'addHelp("mail");')}
-                    			</span>
-                    			<br/> <div id = 'mail' class = 'font_size_12'></div>
-                    </td>
-                    <td class = 'table_header_link' width = 10%>#{link_to_remote 'SMTP', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'smtp_form'}}</td>
-                    <td class = 'table_header_link' width = 10%>#{link_to_remote 'Sendmail', :update => 'mail_div', :url => {:controller => 'mail_specification', :action => 'sendmail_form'}}</td>
-                </tr>
-          </table><br/><br/>"
-    end
-    return block
-  end
 end

data/src/admin_panel/app/models/app.rb

@@ -76,7 +76,7 @@ class App < ActiveRecord::Base
     begin
       reply, err_log = ctl.restart
     rescue Exception => e
-      reply = "An error occurred while sending 'stop' request for application '#{app_name}'. Please refer the '/var/log/webroar/#{app_name}.log' file for details."
+      reply = "An error occurred while sending 'restart' request for application '#{app_name}'. Please refer the '/var/log/webroar/#{app_name}.log' file for details."
     end
     return reply, err_log
   end    

data/src/admin_panel/app/models/application_specification.rb

@@ -42,25 +42,19 @@ class ApplicationSpecification < PseudoModel
   #  validates_format_of :baseuri, :with => /^\/[A-Za-z0-9_\-\/]*$/i, :message => "must start with '/' and contains characters A-Z, a-z, 0-9 , _ , -  and /."
 
   def write
-    server_specification = ServerSpecification.get_hash
-    info= YAML::load_file(CONFIG_FILE_PATH) rescue nil
-    if info 
-      if info['Application Specification']
-        i = info['Application Specification'].size
-        info['Application Specification'][i] = obj_to_hash
-        data = info['Application Specification']
-      else
-        data = Array[obj_to_hash]
-      end
-    else
-      data = Array[obj_to_hash]
+    
+    info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
+    if not (info and info['Application Specification'])
+      info['Application Specification'] = Array.new
     end
-    info = Hash['Server Specification' => server_specification, 'Application Specification' => data]
-    YAMLWriter.write(info, CONFIG_FILE_PATH, "config")
+    
+    info['Application Specification'].push(obj_to_hash)
+    
+    YAMLWriter.write(info, CONFIG_FILE_PATH, YAMLConfig::CONFIG)
+  
   end
 
   def self.remove(app_name)
-    server_specification = ServerSpecification.get_hash
     info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
     
     if info and info['Application Specification']
@@ -69,12 +63,10 @@ class ApplicationSpecification < PseudoModel
           info['Application Specification'].delete(x)
         end
       end
-      
-      info = Hash['Server Specification' => server_specification] if info['Application Specification'].length == 0
-
+      info.delete('Application Specification') if info['Application Specification'].length == 0
     end
 
-    YAMLWriter.write(info, CONFIG_FILE_PATH, "config")
+    YAMLWriter.write(info, CONFIG_FILE_PATH, YAMLConfig::CONFIG)
   end
 
   def remove
@@ -92,7 +84,7 @@ class ApplicationSpecification < PseudoModel
   def update(app_id)
     info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
     info['Application Specification'][app_id] = obj_to_hash	
-    YAMLWriter.write(info, CONFIG_FILE_PATH, "config")
+    YAMLWriter.write(info, CONFIG_FILE_PATH, YAMLConfig::CONFIG)
   end
   
   #this method is used to validate the various fields of the apps model.
@@ -304,10 +296,9 @@ class ApplicationSpecification < PseudoModel
       info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
       app_name = info['Application Specification'][app_id]["name"]
       info['Application Specification'].delete_at(app_id)
-      if(info['Application Specification'].length == 0)
-        info.delete('Application Specification')
-      end	
-      YAMLWriter.write(info,CONFIG_FILE_PATH,"config")
+      info.delete('Application Specification') if info['Application Specification'].length == 0 
+
+      YAMLWriter.write(info,CONFIG_FILE_PATH, YAMLConfig::CONFIG)
       return app_name
     end
     
@@ -360,6 +351,23 @@ class ApplicationSpecification < PseudoModel
           i +=1
         end  
         return i
-    end  
+    end
+    
+    def analytics_enabled?(application_name)
+      info = YAML::load_file(CONFIG_FILE_PATH) rescue nil
+      i = 0 
+      while info['Application Specification']
+        if info['Application Specification'][i]['name'] == application_name
+          if info['Application Specification'][i]['analytics'].downcase == "enabled".downcase
+            return true 
+          else
+            return false
+          end
+        end
+        i +=1
+      end
+      false
+    end
+    
   end
 end

data/src/admin_panel/app/models/headers.rb

@@ -0,0 +1,116 @@
+#--
+# 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/>.
+#++
+
+class Headers < PseudoModel
+  class << self
+    
+    def get_expires_value
+      @conf = YAML::load_file(CONFIG_FILE_PATH)
+      if @conf['Headers'] and @conf['Headers']['expires']
+        @conf['Headers']['expires']
+      else
+        "Off"
+      end
+    end
+    
+    def get_expires_by_type_array
+      @conf = YAML::load_file(CONFIG_FILE_PATH)     
+      return @conf['Headers']['expires_by_type'] if @conf['Headers'] and @conf['Headers']['expires_by_type'] and @conf['Headers']['expires_by_type'].length > 0
+      []
+    end
+    
+    def delete_expires_by_type(index)
+      @conf = YAML::load_file(CONFIG_FILE_PATH)
+      if @conf['Headers'] and @conf['Headers']['expires_by_type']
+        @conf['Headers']['expires_by_type'].delete_at(index)
+      end
+      @conf['Headers'].delete('expires_by_type') if @conf['Headers']['expires_by_type'].empty?
+      @conf.delete('Headers') if @conf['Headers'].empty?
+      YAMLWriter.write(@conf, CONFIG_FILE_PATH, YAMLConfig::CONFIG) 
+    end
+    
+    def validate_and_write_expires_value(old_value, data)
+      expires = old_value
+      error_message = ""
+      data = data.strip
+      if data.empty?
+        error_message = EMPTY_STRING
+        return expires, error_message
+      end      
+      
+      if data.to_s.downcase == 'off'
+        expires = 'Off'
+        write_expires_value("Off")
+      elsif data =~ /^\d+$/ and data.to_i > 0
+        expires = data.to_i
+        write_expires_value(expires)        
+      else
+        error_message = EXPIRES_VALIDATION        
+      end
+      return expires, error_message
+    end
+    
+    def validate_and_write_expires_by_type(ext, expires)
+      ext = ext.strip
+      expires = expires.strip
+      err_msg = nil
+      if ext.empty?
+        err_msg = "<ul>"
+        err_msg += "<li>File extensions can not be empty.</li>"
+      end
+      if expires.empty?
+        err_msg += "<li>Expires value can not be empty</li>"
+      end
+      unless expires =~ /^\d+$/ and expires.to_i > 0
+        err_msg += "<li>Possible value for expires is no. of seconds</li>"
+      end
+      if err_msg
+        err_msg += "</ul>"
+        return err_msg
+      end
+      write_expires_by_type_value(ext, expires.to_i)
+      return ''
+    end
+    
+    def write_expires_by_type_value(ext, expires)
+      @conf = YAML::load_file(CONFIG_FILE_PATH)
+      @conf['Headers'] = Hash.new unless @conf['Headers']
+      @conf['Headers']['expires_by_type'] = Array.new unless @conf['Headers']['expires_by_type']
+      @conf['Headers']['expires_by_type'].push(Hash['ext' => ext, 'expires' => expires])
+      YAMLWriter.write(@conf, CONFIG_FILE_PATH, YAMLConfig::CONFIG)
+    end
+    
+    def write_expires_value(expires)
+      @conf = YAML::load_file(CONFIG_FILE_PATH)
+      if expires.to_s.downcase == 'off'        
+        if @conf['Headers'] and @conf['Headers']['expires']
+          @conf['Headers'].delete('expires')
+          @conf.delete('Headers') if @conf['Headers'].empty?
+        end
+      else
+        @conf['Headers'] = Hash.new unless @conf['Headers']
+        @conf['Headers']['expires'] = expires
+      end
+            
+      YAMLWriter.write(@conf, CONFIG_FILE_PATH, YAMLConfig::CONFIG)      
+    end
+    
+  end  
+end

data/src/admin_panel/app/models/mail_specification.rb

@@ -50,8 +50,8 @@ class MailSpecification
     
     def save_sendmail_specification(sendmail)
       data = sendmail_specification_hash(sendmail) 
-      data = {'sendmail' => data}
-      YAMLWriter.write(data, MAIL_FILE_PATH, "sendmail")
+      data = {'sendmail' => data, 'email_notification' => 'enabled'}
+      YAMLWriter.write(data, MAIL_FILE_PATH, YAMLConfig::SENDMAIL)
     end
     
     def sendmail_specification_hash(sendmail=nil)
@@ -106,8 +106,8 @@ class MailSpecification
     
     def save_smtp_specification(smtp)
       data = smtp_specification_hash(smtp) 
-      data = {'smtp' => data}
-      YAMLWriter.write(data, MAIL_FILE_PATH, "smtp")
+      data = {'smtp' => data, 'email_notification' => 'enabled'}
+      YAMLWriter.write(data, MAIL_FILE_PATH, YAMLConfig::SMTP)
     end
     
     def smtp_specification_hash(smtp=nil)
@@ -134,6 +134,21 @@ class MailSpecification
             'recipients' => ""
             ]
       end
-    end 
+    end
+    
+    def update_notification_status(status)
+      @notification_conf = YAML::load_file(MAIL_FILE_PATH)      
+      case status
+        when :enable
+          @notification_conf['email_notification'] = 'enabled'
+        when :disable
+          @notification_conf['email_notification'] = 'disabled'          
+      end      
+      yaml_obj = YAML::dump(@notification_conf)
+      File.open(MAIL_FILE_PATH, 'w') do |f|
+        f.puts yaml_obj
+      end
+    end
+    
   end
 end

data/src/admin_panel/app/models/server_specification.rb

@@ -91,13 +91,8 @@ class ServerSpecification
     
     #Method is use to write server specification into the config file
     def write(info, server_specification)
-      if info and info['Application Specification']
-        application_specification = info['Application Specification']
-        data = Hash['Server Specification' => server_specification, 'Application Specification' => application_specification]
-      else
-        data = Hash['Server Specification' => server_specification]
-      end
-      YAMLWriter.write(data,CONFIG_FILE_PATH, "config")
+      info['Server Specification'] = server_specification
+      YAMLWriter.write(info, CONFIG_FILE_PATH, YAMLConfig::CONFIG)
     end
   
     def get_fields

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

@@ -30,7 +30,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
       <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 => {:action => 'add_text_box', :div_id => '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>
       </tr>
       <tr>
         <td class = 'BG_white'>Minimum number of workers&nbsp;&nbsp;&nbsp;
@@ -40,7 +40,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
           <br/> <div id = 'minworker' class = 'font_size_12'></div>
         </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 => {:action => 'add_text_box', :div_id => 'min_pro_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>
       </tr>
       <tr>
         <td class = 'BG_dark_gray'>Maximum number of workers&nbsp;&nbsp;&nbsp;
@@ -50,7 +50,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
           <br/> <div id = 'maxworker' class = 'font_size_12'></div>
         </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 => {:action => 'add_text_box', :div_id => 'max_pro_div'}%></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>
       </tr>
       <tr>
         <td class = 'BG_white'>Log Level&nbsp;&nbsp;&nbsp;
@@ -60,7 +60,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
           <br/> <div id = 'log_level' class = 'font_size_12'></div>
         </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 => {:action => 'add_text_box', :div_id => 'log_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>
       </tr>
     </table>
     <br/><br/>
@@ -71,9 +71,14 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
       <%elsif flash[:smtp_errors]%>
         <%=render :partial => 'mail_specification/smtp_form'%>
       <%else%>
-        <%=mail_config_block()%>    
+        <%=render :partial => 'mail_specification/current_spec' %>    
       <%end%>  
     </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>

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

@@ -49,15 +49,15 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 <% end -%>
     <tr>
     	<td colspan = 6>
-    		Take Action:
+    		<b>Take Action:</b>
 				<% unless current_status == OPEN_EXCEPTION %>
-				  <%=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><%=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>
 				<% end %>
 				<% unless current_status == CLOSED_EXCEPTION %> 
-				  <%=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><%=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>
 			  <% end %>
 				<% unless current_status == IGNORED_EXCEPTION %>
-				<%=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><%=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>
 				<% end %>
 				<%#=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>

data/src/admin_panel/app/views/graph/_graph_page.html.erb

@@ -29,6 +29,9 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 	<div id = 'reload'>Select Graph:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%=select :graph,:name,%w{URL-Breakup URL-Calls Database-Usage Throughput Resource-Usage},:selected=>session[:graph_type]%></div>
 		<hr/>
 		<div style = "font-weight:bold;font-size:14;">Application Name : <%=@application_name%>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+    <% unless ApplicationSpecification.analytics_enabled?(@application_name) %>
+    <span style = "color:red">Analytics for this application is currently disabled. You can still view the reports on captured data.</span>
+    <% end %>
 		<hr/>
 		<div id = 'graphs'>
 			<%=render :partial => get_partial(session[:graph_type])%>

data/src/admin_panel/app/views/headers/_add_expires_text_box.html.erb

@@ -0,0 +1,35 @@
+<!--
+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/>.
+-->
+
+<%old_value = Headers.get_expires_value()%>  
+
+<div  id = 'div_add_expires_text_box'>
+  <span style = "height:20px;float:left">
+    <%remote_form_for :data, :update => params[:div_id], :url => {:controller => 'headers', :action => 'save_expires_value', :div_id => params[:div_id], :old_value => old_value}do%>
+      <%=text_field :data, :value, :size => '10', :value => h(old_value)%> 
+    <%=submit_tag 'Save'%>
+    <%end%> 
+  </span>
+  <span style = "height:20px;float:left;">
+    <%remote_form_for :cancel, :update => params[:div_id], :url => {:controller => 'headers', :action => 'cancel_expires_value_edit', :div_id => params[:div_id], :old_value => old_value} do%>
+      <%=submit_tag 'Cancel'%>
+    <%end%> 
+  </span>
+</div>

data/src/admin_panel/app/views/headers/_expires_by_type_form.html.erb

@@ -0,0 +1,65 @@
+<!--
+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, :url => {:controller => 'headers', :action => 'save_expires_by_type_value' } do %>
+
+  <table width = 95% cellpadding = "4"> 
+	   <% if @error_message %>
+	     <tr>
+	     <td colspan = 3 class = 'BG_white'><span id='error_div'><%= @error_message %></td>	</span>			
+			 </tr>				
+	   <% end%> 
+		<tr>
+      <td width = 40% class = 'BG_white'>
+      	<span style = "height:20px;float:left">
+        Extension&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires_by_type_ext')" %></span>
+				&nbsp;&nbsp;&nbsp;
+				<%=text_field :data, :ext, :size => '20' %>
+				</span>
+            <br/>
+            <div id = 'expires_by_type_ext' class = 'font_size_12'>
+            </div>
+			
+      </td>
+      <td width = 40% class = 'BG_white'>
+      	<span style = "height:20px;float:left">
+        Expires&nbsp;&nbsp;&nbsp;<span class = 'help_link'><%=link_to_function "Help", :onclick => "addHelp('expires_by_type_expires_value')" %></span>
+				&nbsp;&nbsp;&nbsp;
+				<%=text_field :data, :expires, :size => '10' %>
+				</span>
+            <br/>
+            <div id = 'expires_by_type_expires_value' class = 'font_size_12'>
+            </div>
+      </td>
+      <td width = 20% class = 'BG_white'>
+      	<span style = "height:20px;float:left">
+        <%=submit_tag 'Save' %>
+			 <%=button_to_remote 'Cancel', :update => 'expires_by_type_form', :url => {:controller => 'headers', :action => 'cancel_expires_by_type_value'} %>	    
+        <%end %>  
+				</span>
+      </td>
+    </tr>
+	</table>	
+
+    
+	
+    
+