Download as
Browse Code »

Commit e19cd34f7f96512b47d7befe096e48da077cb45a

Authored by Francisco Marcelo de Araújo Lima Júnior
1 parent 8c653191
Exists in master

#community_dashboard: update theme

Showing 3 changed files with 27 additions and 16 deletions   Show diff stats
public/javascripts/community_hub.js
  Diff comments   View file @e19cd34
... ... @@ -312,6 +312,7 @@ function update_live_stream(recursive) {
312 312 update_live_stream(true);
313 313 }, 5000);
314 314 }
  315 +
315 316 }
316 317  
317 318 function hub_left_tab_click() {
... ... @@ -326,17 +327,18 @@ function hub_right_tab_click() {
326 327 jQuery("#left-tab").addClass('hide');
327 328 jQuery("#right-tab").removeClass('hide');
328 329 jQuery("#right-tab").addClass('show');
329   - jQuery(".hub #left-tab.hide").click(hub_left_tab_click);
  330 + jQuery(".hub #right-tab.show h1.live").click(hub_left_tab_click);
330 331 }
331 332  
332 333 first_hub_load = true;
333 334  
334 335 jQuery(document).ready(function() {
  336 +
335 337 jQuery("#live-posts").scroll(function() {
336 338 live_scroll_position = jQuery("#live-posts").scrollTop();
337 339 });
338 340  
339   - jQuery(".hub #right-tab.hide").click(hub_right_tab_click);
  341 + jQuery(".hub #left-tab.show h1.mediation").click(hub_right_tab_click);
340 342  
341 343 jQuery("body").addClass("loading");
342 344  
... ...
public/style.css
  Diff comments   View file @e19cd34
... ... @@ -242,7 +242,11 @@
242 242 text-align: center;
243 243 top: 7px;
244 244 line-height: 27px;
245   -
  245 +}
  246 +
  247 +#content .main-block .hub div#left-tab.show h1.mediation,
  248 +#content .main-block .hub div#right-tab.show h1.live {
  249 + cursor: pointer;
246 250 }
247 251  
248 252 #content .main-block .hub .live h1.mediation,
... ...
views/content_viewer/hub.rhtml
  Diff comments   View file @e19cd34
... ... @@ -8,31 +8,36 @@
8 8  
9 9 <br />
10 10  
11   -<div id="left-tab" class="live content-tab show">
12   - <h1 class="live">
13   - <span class="title"><%= @page.title %></span><span class="on-air"><%= _("Live") %></span>
14   - </h1>
  11 + <div id="left-tab" class="live content-tab show">
15 12  
16   - <h1 class="mediation">
17   - <span class="title"><%= _("Mediation") %><span class="expand"><!--&#9660;--></span></span>
18   - </h1>
  13 + <h1 class="live">
  14 + <span class="title"><%= @page.title %></span><span class="on-air"><%= _("Live") %></span>
  15 + </h1>
  16 +
  17 + <h1 class="mediation">
  18 + <span class="title"><%= _("Mediation") %></span>
  19 + </h1>
19 20  
20 21 <ul id="live-posts">
21 22 </ul>
  23 +
22 24 <span><%= check_box_tag 'auto_scrolling', 'yes', true %><%= _("Auto scrolling") %></span>
  25 +
23 26 </div>
24 27  
25 28 <div id="right-tab" class="mediation content-tab hide">
26   - <h1 class="live">
27   - <span class="title"><%= @page.title %></span><span class="on-air"><%= _("Live") %></span>
28   - </h1>
29 29  
30   - <h1>
31   - <span class="title"><%= _("Mediation") %><span class="expand"><!--&#9660;--></span></span>
32   - </h1>
  30 + <h1 class="live">
  31 + <span class="title"><%= @page.title %></span><span class="on-air"><%= _("Live") %></span>
  32 + </h1>
  33 +
  34 + <h1>
  35 + <span class="title"><%= _("Mediation") %></span>
  36 + </h1>
33 37  
34 38 <ul id="mediation-posts">
35 39 </ul>
  40 +
36 41 </div>
37 42  
38 43 <% if mediator?(@page) %>
... ...