webroar 0.4.0 → 0.5.0

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

@@ -18,156 +18,156 @@ 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 = 'reload'><%=link_to_remote 'Back', :url => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => app_name, :status_name => status_name, :page => page }%></div>
-  <table width = 90% cellpadding = 5px style = "word-wrap: break-word;">
+  <div class='text_align_right'><%=link_to_remote 'Back', :url => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => app_name, :status_name => status_name, :page => page }%></div>
+  <table width = 90% style = "word-wrap: break-word;">
     <tr>
-      <td width = 15%><b>Exception:-</b></td>
-      <td><%=h @excep.exception_message%></td>
+      <td width = 15%><b>Exception</b></td>
+      <td><%=h @exception.exception_message%></td>
     </tr>
     <tr>
-      <td><b>Class :-</b></td>
-      <td><%=h @excep.exception_class%></td>
+      <td><b>Class </b></td>
+      <td><%=h @exception.exception_class%></td>
     </tr>
     <tr>
-      <td><b>URL :-</b></td>
-      <td><%=h @excep.controller%>/<%=h @excep.method%></td>
+      <td><b>URL </b></td>
+      <td><%=h @exception.latest_detail.controller%>/<%=h @exception.latest_detail.method%></td>
     </tr>
     <tr>
-      <td><b>Occurrences :-</b></td>
-      <td><%=h @exceptions.size%></td>
+      <td><b>Occurrences </b></td>
+      <td><%=h @exception.exceptions_count%></td>
     </tr>
-    <%@exceptions.each do |exception|%>
+    <%@exception.occurrences.each do |occurrence|%>
     <tr>
       <td>&nbsp;</td>
-      <td><%=h exception.wall_time.strftime("%d-%b-%Y %H:%M:%S")%></td>
+      <td><%=h occurrence.wall_time.strftime("%d-%b-%Y %H:%M:%S")%></td>
     </tr>
     <%end%>
     <tr>
-      <td  colspan = 2><b>Backtrace :-</b> </td>
+      <td  colspan = 2><b>Backtrace </b> </td>
     </tr>
     <tr>
-      <td  colspan = 2><%= @excep.exception_backtrace.gsub(/\n/, '<br>')%></td>
+      <td  colspan = 2><%= @exception.latest_detail.exception_backtrace.gsub(/\n/, '<br>')%></td>
     </tr>
     <tr>
-      <td  colspan = 2><b>Environment :-</b> </td>
+      <td  colspan = 2><b>Environment </b> </td>
     </tr>
     <tr>
-      <td><b>CHUNKED :-</b></td>
-      <td  colspan = 2><%=h @excep.chunked%></td>
+      <td><b>CHUNKED </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.chunked%></td>
     </tr>
     <tr>
-      <td><b>CONTENT_LENGTH :-</b></td>
-      <td  colspan = 2><%=h @excep.content_length%></td>
+      <td><b>CONTENT_LENGTH </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.content_length%></td>
     </tr>
     <tr>
-      <td><b>HTTP_ACCEPT :-</b></td>
-      <td  colspan = 2><%=h @excep.http_accept%></td>
+      <td><b>HTTP_ACCEPT </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_accept%></td>
     </tr>
     <tr>
-      <td><b>HTTP_ACCEPT_CHARSET :-</b></td>
-      <td  colspan = 2><%=h @excep.http_accept_charset%></td>
+      <td><b>HTTP_ACCEPT_CHARSET </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_accept_charset%></td>
     </tr>
     <tr>
-      <td><b>HTTP_ACCEPT_ENCODING :-</b></td>
-      <td  colspan = 2><%=h @excep.http_accept_encoding%></td>
+      <td><b>HTTP_ACCEPT_ENCODING </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_accept_encoding%></td>
     </tr>
     <tr>
-      <td><b>HTTP_CONNECTION :-</b></td>
-      <td  colspan = 2><%=h @excep.http_connection%></td>
+      <td><b>HTTP_CONNECTION </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_connection%></td>
     </tr>
     <tr>
-      <td><b>HTTP_COOKIE :-</b></td>
-      <td  colspan = 2><div style="width:650px;overflow-x:auto;"><%=h @excep.http_cookie%></div></td>
+      <td><b>HTTP_COOKIE </b></td>
+      <td  colspan = 2><div style="width:650px;overflow-x:auto;"><%=h @exception.latest_detail.http_cookie%></div></td>
     </tr>
     <tr>
-      <td><b>HTTP_HOST :-</b></td>
-      <td  colspan = 2><%=h @excep.http_host%></td>
+      <td><b>HTTP_HOST </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_host%></td>
     </tr>
     <tr>
-      <td><b>HTTP_KEEP_ALIVE :-</b></td>
-      <td  colspan = 2><%=h @excep.http_keep_alive%></td>
+      <td><b>HTTP_KEEP_ALIVE </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_keep_alive%></td>
     </tr>
     <tr>
-      <td><b>HTTP_USER_AGENT :-</b></td>
-      <td  colspan = 2><%=h @excep.http_user_agent%></td>
+      <td><b>HTTP_USER_AGENT </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_user_agent%></td>
     </tr>
     <tr>
-      <td><b>HTTP_VERSION :-</b></td>
-      <td  colspan = 2><%=h @excep.http_version%></td>
+      <td><b>HTTP_VERSION </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.http_version%></td>
     </tr>
     <tr>
-      <td><b>PATH_INFO :-</b></td>
-      <td  colspan = 2><%=h @excep.path_info%></td>
+      <td><b>PATH_INFO </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.path_info%></td>
     </tr>
     <tr>
-      <td><b>QUERY_STRING :-</b></td>
-      <td  colspan = 2><%=h @excep.query_string%></td>
+      <td><b>QUERY_STRING </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.query_string%></td>
     </tr>
     <tr>
-      <td><b>REMOTE_ADDR :-</b></td>
-      <td  colspan = 2><%=h @excep.remote_addr%></td>
+      <td><b>REMOTE_ADDR </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.remote_addr%></td>
     </tr>
     <tr>
-      <td><b>REQUEST_METHOD :-</b></td>
-      <td  colspan = 2><%=h @excep.request_method%></td>
+      <td><b>REQUEST_METHOD </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.request_method%></td>
     </tr>
     <tr>
-      <td><b>REQUEST_PATH :-</b></td>
-      <td  colspan = 2><%=h @excep.request_path%></td>
+      <td><b>REQUEST_PATH </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.request_path%></td>
     </tr>
     <tr>
-      <td><b>REQUEST_URI :-</b></td>
-      <td  colspan = 2><%=h @excep.request_uri%></td>
+      <td><b>REQUEST_URI </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.request_uri%></td>
     </tr>
     <tr>
-      <td><b>SCRIPT_NAME :-</b></td>
-      <td  colspan = 2><%=h @excep.script_name%></td>
+      <td><b>SCRIPT_NAME </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.script_name%></td>
     </tr>
     <tr>
-      <td><b>SERVER_NAME :-</b></td>
-      <td  colspan = 2><%=h @excep.server_name%></td>
+      <td><b>SERVER_NAME </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.server_name%></td>
     </tr>
     <tr>
-      <td><b>SERVER_PORT :-</b></td>
-      <td  colspan = 2><%=h @excep.server_port%></td>
+      <td><b>SERVER_PORT </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.server_port%></td>
     </tr>
     <tr>
-      <td><b>SERVER_PROTOCOL :-</b></td>
-      <td  colspan = 2><%=h @excep.server_protocol%></td>
+      <td><b>SERVER_PROTOCOL </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.server_protocol%></td>
     </tr>
     <tr>
-      <td><b>SERVER_SOFTWARE :-</b></td>
-      <td  colspan = 2><%=h @excep.server_software%></td>
+      <td><b>SERVER_SOFTWARE </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.server_software%></td>
     </tr>
     <tr>
-      <td><b>rack.errors :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_errors%></td>
+      <td><b>rack.errors </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_errors%></td>
     </tr>
     <tr>
-      <td><b>rack.input :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_input%></td>
+      <td><b>rack.input </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_input%></td>
     </tr>
     <tr>
-      <td><b>rack.multiprocess :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_multiprocess%></td>
+      <td><b>rack.multiprocess </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_multiprocess%></td>
     </tr>
     <tr>
-      <td><b>rack.multithread :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_multithread%></td>
+      <td><b>rack.multithread </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_multithread%></td>
     </tr>
     <tr>
-      <td><b>rack.run_once :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_run_once%></td>
+      <td><b>rack.run_once </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_run_once%></td>
     </tr>
     <tr>
-      <td><b>rack.url_scheme :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_url_scheme%></td>
+      <td><b>rack.url_scheme </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_url_scheme%></td>
     </tr>
     <tr>
-      <td><b>rack.version :-</b></td>
-      <td  colspan = 2><%=h @excep.rack_version%></td>
+      <td><b>rack.version </b></td>
+      <td  colspan = 2><%=h @exception.latest_detail.rack_version%></td>
     </tr>
   </table>
   <br/>
   <br/>
-  <div id = 'reload'><%=link_to_remote 'Back', :url => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => app_name, :status_name => status_name, :page => page }%></div>
+  <div class='text_align_right'><%=link_to_remote 'Back', :url => {:controller => 'exceptions', :action => 'list_statuswise_exceptions', :app_name => app_name, :status_name => status_name, :page => page }%></div>

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

@@ -18,20 +18,18 @@ 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_graphs_data'>
 	<br/>
 	<div id = "page_name"><%=image_tag("tit_exceptions_ad.gif")%></div>
 	<br/>
   <%if @application_name.nil?%>
-    <div id = 'exceptions_listing_div' style = "min-height:590px;">
+    <div id = 'exceptions_listing_div'>
       <%=NO_DEPLOYED_APPLICATION_MESSAGE%><br/> Please use <%=link_to 'Configuration',:controller=>'admin',:action=>'configuration'%> tab to deploy applications.
     </div>  
   <%else%>
-	  <center><div id = 'reload'>Select Application: <%=select :application, :name, @apps, :selected => @application_name%></div></center>
+	  <div class="text_align_right">Select Application : <%=select :application, :name, @apps, :selected => @application_name%></div>
 	  <div id = 'exceptions_listing_div'>
 		   <%=render :partial => 'exceptions_listing_partial'%>
 	  </div>
 	  <br>
 	  <%= observe_field 'application_name', :update => 'exceptions_listing_div', :url => {:controller => 'exceptions', :action => 'list' }, :with => 'application_name'%>
   <%end%>
-</div>

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

@@ -18,13 +18,16 @@ You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <%= render :partial => 'query_date', :locals => {:graph_id => 1, :update_div => 'database_usage_graph', :submit_action => 'database_usage_graph'} %>
-
+<% if flash[:notice] %>
+  <%= flash[:notice] %>
+<% else%>
 <%app_id = @app_id || 0 %>
 <%=render :partial => 'javascript_partial', :locals=> {:count => 'first', :start_hour => @start_hour, :end_hour => @end_hour, :app_id => app_id, :type => "percentage_db_usage_graph"}%>
 
 <%# this section is for Ploting % of time spent in Data Base Layer by an application%>
-<div id = 'percentage_db_usage_graph' class = 'graph_div'>
+<div id = 'percentage_db_usage_graph'>
 	<%=@percentage_db_usage_graph%>
 </div>
 <br/><br/>
 <%=render :partial=>'slider_partial',:locals=>{:count=>'first'}%>
+<% end %>

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

@@ -22,16 +22,16 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 <%app_id = @app_id || 0 %>
 <%=render :partial => 'javascript_partial', :locals => {:count => 'first', :start_hour => @start_hour, :end_hour => @end_hour, :app_id => app_id, :type => "app_cpu_usage_graph"}%>
 <%=render :partial => 'javascript_partial', :locals => {:count => 'second', :start_hour => @start_hour, :end_hour => @end_hour, :app_id => app_id, :type => "app_memory_usage_graph"}%>
-<div id = 'app_cpu_usage_graph' class = 'graph_div'>
+<div id = 'app_cpu_usage_graph'>
 	<%=@app_cpu_usage_graph%>
 </div>
-<br/><br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'first'}%>
 <hr>	
 <br/>
 <%# this section is for Ploting memory Usage Graph for an application%>
-<div id = 'app_memory_usage_graph' class = 'graph_div'>
+<div id = 'app_memory_usage_graph'>
 	<%=@app_memory_usage_graph%>
 </div>
-<br/><br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'second'}%>

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

@@ -23,20 +23,16 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
 <%= render :partial => 'query_date', :locals => {:graph_id => 4, :update_div => 'resource_usage_graph_server', :submit_action => 'resource_usage_graph_server'} %>
 <%# this section is for Ploting CPU Usage of server%>
-<div id = 'server_cpu_usage_graph' class = 'graph_div'>
+<div id = 'server_cpu_usage_graph' >
     <%=@server_cpu_usage_graph%> 
 </div>
-<br/>
-<br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'first'}%>
-
 <hr>	
 <br/>
 <%# this section is for Ploting Memory Usage of server%>
-
-<div id = 'server_memory_usage_graph' class = 'graph_div'>
+<div id = 'server_memory_usage_graph' >
 	<%=@server_memory_usage_graph%>
 </div>
-<br/>
-<br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'second'}%>

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

@@ -17,23 +17,26 @@ 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/>.
 -->
+
+<%= render :partial => 'query_date', :locals => {:graph_id => 3, :update_div => 'throughput_graph', :submit_action => 'throughput_graph'} %>
+<% if flash[:notice] %>
+  <%= flash[:notice] %>
+<% else%>
 <%app_id = @app_id || 0 %>
 <%=render :partial => 'javascript_partial', :locals => {:count => 'first', :start_hour => @start_hour, :end_hour => @end_hour,:app_id => app_id, :type => "avg_res_time_graph"}%>
 <%=render :partial => 'javascript_partial', :locals => {:count => 'second', :start_hour => @start_hour, :end_hour => @end_hour, :app_id => app_id, :type => "app_throughput_graph"}%>
-<%= render :partial => 'query_date', :locals => {:graph_id => 3, :update_div => 'throughput_graph', :submit_action => 'throughput_graph'} %>
-
 <%# this section is for Ploting average response time Graph for an application%>
-<div id = 'avg_res_time_graph' class = 'graph_div'>
+<div id = 'avg_res_time_graph' >
 	<%=@avg_res_time_graph%>
 </div>
-<br/><br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'first'}%>
-
 <hr>	
 <br/>
 <%# this section is for Ploting throughput Graph for an application%>
-<div id='app_throughput_graph' class='graph_div'>
+<div id='app_throughput_graph' >
 	<%=@app_throughput_graph%>
 </div>
-<br/><br/>
+<br/><br/><br>
 <%=render :partial => 'slider_partial', :locals => {:count => 'second'}%>
+<% end %>

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

@@ -21,14 +21,11 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 <%= render :partial => 'query_period', :locals => {:update_div => 'pie_graphs_div', :submit_action => 'url_breakup_graph'} %>
 
 <%if @urls.size > 0%>
-	<div id = 'reload'>Select URL:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%=select :url, :name, @urls%></div>
-	 <%= observe_field 'url_name',
-		     :update => 'pie_graphs',
-     		     :url    => { :action => 'get_url_breakdown',:id=>@app_id,:start_time=>@start_time, :end_time => @end_time, :urls=>@urls},
-     		    :with   => 'url_name' %>
-
-
+	<div class='text_align_right'>Select URL : <%=select :url, :name, @urls, {},
+    :onchange => remote_function(:update => 'pie_graphs', :method => "put", :with => "'url_name=' + value + '&index=' + this.selectedIndex",
+    :url => {:action => 'get_url_breakdown',:id=>@app_id,:start_time=>@start_time, :end_time => @end_time}) %></div>	 
 <%end%>
+
 <div id = 'pie_graphs'>
 	<%=render :partial => 'pie' %>
 </div>

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

@@ -18,45 +18,44 @@ You should have received a copy of the GNU General Public License
 along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <%= render :partial => 'query_period', :locals => {:update_div => 'url_calls_graph', :submit_action => 'url_calls_graph'} %>
-
+<% if flash[:notice] %>
+  <%= flash[:notice] %>
+<% else%>
 <%# this section is for Ploting Most Time Consuming url bar Graph for an application%>
-<div id = 'time_consuming_url_graph' class = 'graph_div'>
+<div id = 'time_consuming_url_graph'>
   <%=@time_consuming_url_graph%>
 </div>
-<div style="width:80%;text-align:right;"><%=link_to_function "Help",:class=>"calendar_link",:onclick=>"addHelp('most')"%></div>
-<div id='most' class='font_size_12'></div>
+<div class='text_align_right'><%=link_to_function "Help",:onclick=>"addHelp('most',event)"%></div>
 <br/>
 <br/>
 <hr>	
 <br/>
 <br/>
 <%# this section is for Ploting Url Hits bar Graph for an application%>
-<div id = 'url_hits_graph' class = 'graph_div'>
+<div id = 'url_hits_graph'>
   <%=@url_hits_graph%>
 </div>
-<div style="width:80%;text-align:right;"><%=link_to_function "Help",:class=>"calendar_link",:onclick=>"addHelp('hits')"%></div>
-<div id='hits' class='font_size_12'></div>
+<div class='text_align_right'><%=link_to_function "Help",:onclick=>"addHelp('hits',event)"%></div>
 <br/>
 <br/>
 <hr>
 <br/>
 <br/>
 <%# this section is for Ploting Slowest Url bar Graph for an application%>
-<div id = 'slowest_url_graph' class = 'graph_div'>
+<div id = 'slowest_url_graph'>
   <%=@slowest_url_graph%>
 </div>
-<div style="width:80%;text-align:right;"><%=link_to_function "Help",:class=>"calendar_link",:onclick=>"addHelp('slowest')"%></div>
-<div id='slowest' class='font_size_12'></div>
+<div class='text_align_right'><%=link_to_function "Help",:onclick=>"addHelp('slowest',event)"%></div>
 <br/>
 <br/>
 <hr>
 <br/>
 <br/>
 <%# this section is for Ploting Top DataBase Using Urls Usage for an application%>
-<div id = 'db_consuming_url_graph' class = 'graph_div'>
+<div id = 'db_consuming_url_graph'>
   <%=@db_consuming_url_graph%>
 </div>
-<div style="width:80%;text-align:right;"><%=link_to_function "Help",:class=>"calendar_link",:onclick=>"addHelp('db')"%></div>
-<div id='db' class='font_size_12'></div>
+<div class='text_align_right'><%=link_to_function "Help",:onclick=>"addHelp('db',event)"%></div>
 <br/>
 <br/>
+<% end %>

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

@@ -19,35 +19,25 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <br/>
-<%if flash[:notice]%>
+<%if @application_name != SERVER_NAME%>
+<div class='text_align_right'>Select Graph : <%=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>
+	<div class='app_name'>Application Name : <%=@application_name%></div>
+  <% unless ApplicationSpecification.analytics_enabled?(@application_name) %>
+  <span class='error'>Analytics for this application is currently disabled. You can still view the reports on captured data.</span>
+  <% end %>
 	<hr/>
-	<div style = "width:100%;color:red"><%=flash[:notice]%></div>
+	<div id = 'graphs'>
+		<%=render :partial => get_partial(session[:graph_type])%>
+	</div>
+	 <%=observe_field 'graph_name',:update => 'graphs',:url => {:action => 'get_next_graph', :id => @app_id, :time_slot => ""}, :with => 'graph_name' %>
 <%else%>
-	<%if @application_name != SERVER_NAME%>
-	<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])%>
-		</div>
-		 <%=observe_field 'graph_name',:update => 'graphs',:url => {:action => 'get_next_graph', :id => @app_id, :time_slot => ""}, :with => 'graph_name' %>
-	<%else%>
-		<hr/>
-		<div style = "font-weight:bold;font-size:14;">Application Name : <%=@application_name%>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-		<hr/>
-		<div id = 'graphs'>
-			<%=render :partial => 'resource_usage_graph_server'%>
-		</div>
-	<%end%>
-	<br/>
-	<br/>
+	<hr/>
+	<div class='app_name'>Application Name : <%=@application_name%></div>
+	<hr/>
+	<div id = 'graphs'>
+		<%=render :partial => 'resource_usage_graph_server'%>
+	</div>
 <%end%>
-
-
-		
+<br/>
+<br/>	

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

@@ -22,7 +22,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 		<%=flash[:notice]%>	
 	<%else%>	
 		<%if @url_rank%>
-			<div id = 'reload'><span style = "color:red"><%=@url_rank%><%=@suffix%> in the most time consuming urls list.</span></div>
+			<div class='text_align_right error'><%=@url_rank%><%=@suffix%> in the most time consuming urls list.</div>
 		<%end%>
 		<%= @url_breakup_graph%>
 		<br/>
@@ -67,9 +67,7 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 				<tr>
 					<td>III</td>
 					<td colspan = 2><b>Remaining Time</b>&nbsp;&nbsp;&nbsp;
-      			<span class = 'help_link'>
-			      	<%=link_to_function "Help", :onclick => "addHelp('remaining_time')"%>
-			      </span>
+			      	<%=link_to_function "Help", :onclick => "addHelp('remaining_time',event)"%>
       			<br/> <div id = 'remaining_time' class = 'font_size_12'></div></td>
 					<td><b><%=format("%.2f", @data_y[@data_x.size - 1].to_f)%>%</b></td>
 					<td><b><%=format("%.2f", @data_actual_time[@data_x.size - 1].to_f)%></b></td>
@@ -83,6 +81,6 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 			</div>
 		  <%end%>	
 		<%else%>
-			<%=NO_URL_HITS%> 
+			<%=NO_DATA_FOUND%> 
 		<%end%>
 	<%end%>

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

@@ -19,10 +19,10 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <div id = 'err_msg_div'></div>
-<div id = "query_date" style = "position:relative;text-align:right;width:920px;">
+<div class='text_align_right'>
 
 	<%form_remote_tag :update => {:failure => 'err_msg_div', :success => update_div}, :url=>{:controller=>'graph', :action=> submit_action , :app_id=>@app_id} do%>
-		Date: <%= calendar_date_select_tag "date",
+		Date : <%= calendar_date_select_tag "date",
                                  session[:start_time].strftime("%B %d, %Y"),
 	                             :year_range => 3.years.ago..0.years.ago,
 						         :valid_date_check => "date <= (new Date()).stripTime()"
@@ -32,7 +32,6 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
 		<%=submit_tag 'Get Data'%>
 	
-	<%end%>	
-	<div ID = "calender_div" STYLE = "position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></div>	
+	<%end%>			
 </div>	
 <br/>

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

@@ -18,7 +18,7 @@ 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 = 'err_msg_div'></div>
-<div id = "query_period" style = "position:relative;text-align:right;width:920px;">
+<div class='text_align_right'>
 <%form_remote_tag :update => {:failure => 'err_msg_div', :success => update_div}, :url=>{:controller=>'graph', :action=> submit_action , :app_id=>@app_id} do%>
 	From : <%= calendar_date_select_tag "from_date",
                                  session[:from_date].strftime("%B %d, %Y"), 
@@ -35,6 +35,5 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 	<%=submit_tag 'Get Data'%>
 
 <%end%>	
-<div ID = "calender_div" STYLE = "position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></div>	
 </div>	
 <br/>

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

@@ -18,9 +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 style = "width:100%;text-align:-webkit-center;">
+<div id='slider_div'>
 	<div id = "slider_new_<%=count%>" style = "width:420px"></div>
 	<br/>	
-	<div style = "width:465px;text-align:left;color:#666666;"><span>00:00</span><span style = "margin-left:45px">04:00</span><span style = "margin-left:35px">08:00</span><span style = "margin-left:40px">12:00</span><span style = "margin-left:35px">16:00</span><span style = "margin-left:40px">20:00</span><span style = "margin-left:35px">23:59</span></div>
+	<div style = "width:465px;color:#666666;"><span>00:00</span><span style = "margin-left:45px">04:00</span><span style = "margin-left:35px">08:00</span><span style = "margin-left:40px">12:00</span><span style = "margin-left:35px">16:00</span><span style = "margin-left:40px">20:00</span><span style = "margin-left:35px">23:59</span></div>	
 </div>
 <br/>

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

@@ -19,15 +19,15 @@ along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <%= calendar_date_select_includes "red" %>
 <% CalendarDateSelect.format = :natural %>
-<div id = 'container_graphs_data'>
 	<br/>
 	<div id = "page_name">
 		<%=image_tag("tit_analytics_ad.gif", :border => '0')%>
 	</div>
-	<div id = 'reload'>Select Application: <%=select :application, :name, @apps, :selected => @application_name%></div>
+	<div class='text_align_right'>Select Application : <%=select :application, :name, @apps, :selected => @application_name%><br>
 	<%if @apps.size == 1%>
-		<div style = "width:98%;color:#3C5C97;text-align:right;"><%=NO_APPLICATION_FOR_ANALYTICS%></div>
+		<span class='error'><%=NO_APPLICATION_FOR_ANALYTICS%></span>
 	<%end%>
+	</div>
 	<div id = 'graph_div'>
 		 <%=render :partial=>'graph_page'%>
 	</div>