Styled the stats page.

cykod · Sep 10, 2010 · 555bc3e · 555bc3e
1 parent 512cbf8
commit 555bc3e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb
@@ -276,11 +276,12 @@ def custom(options = {},&block )
     # This class usually isn't instantiated directly, see CmsHelper#ajax_tabs for usage
     class AjaxTabBuilder
       include ActionView::Helpers::TextHelper
-      def initialize(view,tab_cnt,selected) # :nodoc:
+      def initialize(view,tab_cnt,selected,opts={}) # :nodoc:
         @view = view
         @tab_num = 0
         @selected = selected
-        @tab_cnt = tab_cnt		
+        @tab_cnt = tab_cnt
+        @opts = opts
       end
 
       # Creates a tab inside of the ajax_tabs
@@ -367,7 +368,7 @@ def ajax_tabs(options,selected,&block)   # :yields: ActionTabBuilder.new
        concat("<td #{opt==selected ? 'class="selected"' : 'class="normal"'}> <a class='ajax_link' onclick='SCMS.select_tab(this); #{js}' href='javascript:void(0);'>#{opt.t}</a></td>")
      end
      concat("<td class='extra'> &nbsp; </td>	</tr>")
-     yield AjaxTabBuilder.new(self,options.length,selected_id)
+     yield AjaxTabBuilder.new(self,options.length,selected_id) if block_given?
      concat("</table>")
    end
 

diff --git a/app/views/emarketing/stats.html.erb b/app/views/emarketing/stats.html.erb
@@ -1,30 +1,31 @@
 <hr/>
-<div class="clearfix admin_content" style="width:1210px;">
 
-<div style="float:left; width:530px; padding-left:10px;">
+<div class="clearfix admin_content" style="width:1240px;">
+
+<div style="float:left;">
+<div class="visitor_container" style="width:540px;">
   <div class="real-time-stats">
     <div class="stats headers clearfix">
       <div class="who">Who</div>
       <div class="when">When</div>
       <div class="page">Where / <em>Actions</em></div>
     </div>
   </div>
+  <div class="visitor_container_body">
   <div id="real_time_stats" class="real-time-stats real-time-stats-block">
   </div>
+  </div>
+</div>
 </div>
 
-<div style="float:left; width:660px; padding-left:10px;">
-  <% ajax_tabs [ ['5 Minutes', 'RealTimeStatsViewer.changeChartRange(5);'], [ '30 Minutes', 'RealTimeStatsViewer.changeChartRange(30);' ],['60 Minutes', 'RealTimeStatsViewer.changeChartRange(60);'] ], '5 Minutes' do |t| -%>
-    <% t.tab do -%>
-    <% end -%>
-    <% t.tab do -%>
-    <% end -%>
-    <% t.tab do -%>
-    <% end -%>
-  <% end -%>
+<div style="float:left; width:660px;">
+<div class="visitor_container">
+  <% ajax_tabs [ ['5 Minutes', 'RealTimeStatsViewer.changeChartRange(5);'], [ '30 Minutes', 'RealTimeStatsViewer.changeChartRange(30);' ],['60 Minutes', 'RealTimeStatsViewer.changeChartRange(60);'] ], '5 Minutes' -%>
+  <div class="visitor_container_body" style="padding-right:10px;">
   <div id="real_time_charts"></div>
+  </div>
+</div>
 </div>
-
 </div>
 
 <script>

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -111,8 +111,8 @@ SCMS = {
 		var row = selected_td.parentNode;
 		var tbody = row.parentNode;
 
-		var tabs = getChildElements(row); // 0, T1-Tn, Extra
-		var contents = getChildElements(tbody); // Header, T1-Tn
+		var tabs = row ? getChildElements(row) : []; // 0, T1-Tn, Extra
+		var contents = tbody ? getChildElements(tbody) : []; // Header, T1-Tn
 
 		var i=0;
 		for(i=1;i<contents.length;i++) {
@@ -125,11 +125,12 @@ SCMS = {
 			}
 			else {
 				tabs[i-1].className = 'selected';
-				Element.show(contents[i]);
+                                if(contents.length > i ) {
+                                  Element.show(contents[i]);
+                                }
 			}
 
 		}
-
 	},
 
 

diff --git a/public/themes/standard/stylesheets/admin_framework.css b/public/themes/standard/stylesheets/admin_framework.css
@@ -1011,7 +1011,11 @@ table.display_table td.field {
 .visitor_container_body {
   background-color:white;
   padding:12px 0px 12px 8px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
+  -moz-border-radius-bottomleft: 10px;
+  -moz-border-radius-bottomright: 10px;
+  -moz-border-radius-topright: 10px;
+  -webkit-border-radius-bottomleft: 10px;
+  -webkit-border-radius-bottomright: 10px;
+  -webkit-border-radius-topright: 10px;
   overflow:hidden;
 }