From e19cd34f7f96512b47d7befe096e48da077cb45a Mon Sep 17 00:00:00 2001 From: Francisco Marcelo de Araújo Lima Júnior Date: Wed, 30 Apr 2014 19:21:20 -0300 Subject: [PATCH] #community_dashboard: update theme --- public/javascripts/community_hub.js | 6 ++++-- public/style.css | 6 +++++- views/content_viewer/hub.rhtml | 31 ++++++++++++++++++------------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/public/javascripts/community_hub.js b/public/javascripts/community_hub.js index dd8141c..bb8d391 100644 --- a/public/javascripts/community_hub.js +++ b/public/javascripts/community_hub.js @@ -312,6 +312,7 @@ function update_live_stream(recursive) { update_live_stream(true); }, 5000); } + } function hub_left_tab_click() { @@ -326,17 +327,18 @@ function hub_right_tab_click() { jQuery("#left-tab").addClass('hide'); jQuery("#right-tab").removeClass('hide'); jQuery("#right-tab").addClass('show'); - jQuery(".hub #left-tab.hide").click(hub_left_tab_click); + jQuery(".hub #right-tab.show h1.live").click(hub_left_tab_click); } first_hub_load = true; jQuery(document).ready(function() { + jQuery("#live-posts").scroll(function() { live_scroll_position = jQuery("#live-posts").scrollTop(); }); - jQuery(".hub #right-tab.hide").click(hub_right_tab_click); + jQuery(".hub #left-tab.show h1.mediation").click(hub_right_tab_click); jQuery("body").addClass("loading"); diff --git a/public/style.css b/public/style.css index a02605e..6086a7b 100644 --- a/public/style.css +++ b/public/style.css @@ -242,7 +242,11 @@ text-align: center; top: 7px; line-height: 27px; - +} + +#content .main-block .hub div#left-tab.show h1.mediation, +#content .main-block .hub div#right-tab.show h1.live { + cursor: pointer; } #content .main-block .hub .live h1.mediation, diff --git a/views/content_viewer/hub.rhtml b/views/content_viewer/hub.rhtml index 075e2ad..d6edaa9 100644 --- a/views/content_viewer/hub.rhtml +++ b/views/content_viewer/hub.rhtml @@ -8,31 +8,36 @@
-
-

- <%= @page.title %><%= _("Live") %> -

+
-

- <%= _("Mediation") %> -

+

+ <%= @page.title %><%= _("Live") %> +

+ +

+ <%= _("Mediation") %> +

+ <%= check_box_tag 'auto_scrolling', 'yes', true %><%= _("Auto scrolling") %> +
-

- <%= @page.title %><%= _("Live") %> -

-

- <%= _("Mediation") %> -

+

+ <%= @page.title %><%= _("Live") %> +

+ +

+ <%= _("Mediation") %> +

+
<% if mediator?(@page) %> -- libgit2 0.21.2