Commit 6c49450b23b09a9db32d4d981bc1c842992d60f3
Committed by
Antonio Terceiro
1 parent
55729b44
Exists in
master
and in
29 other branches
Submenu appears under highlights block
(ActionItem1744)
Showing
1 changed file
with
20 additions
and
2 deletions
Show diff stats
app/views/blocks/highlights.rhtml
| @@ -17,11 +17,29 @@ | @@ -17,11 +17,29 @@ | ||
| 17 | <p class="highlights-block-footer"></p> | 17 | <p class="highlights-block-footer"></p> |
| 18 | <script type="text/javascript"> | 18 | <script type="text/javascript"> |
| 19 | (function($) { | 19 | (function($) { |
| 20 | - var options = {fx: 'fade', fastOnEvent: 1, timeout: <%= block.interval * 1000 %>}; | 20 | + var options = { |
| 21 | + fx: 'custom', | ||
| 22 | + animIn : { | ||
| 23 | + opacity : 1 | ||
| 24 | + }, | ||
| 25 | + animOut : { | ||
| 26 | + opacity : 0 | ||
| 27 | + }, | ||
| 28 | + cssBefore : { | ||
| 29 | + zIndex : 1, | ||
| 30 | + opacity : 0, | ||
| 31 | + display : 'block' | ||
| 32 | + }, | ||
| 33 | + cssAfter : { | ||
| 34 | + zIndex : 0 | ||
| 35 | + }, | ||
| 36 | + fastOnEvent : 1, | ||
| 37 | + timeout : <%= block.interval * 1000 %> | ||
| 38 | + }; | ||
| 21 | <% if block.navigation %> | 39 | <% if block.navigation %> |
| 22 | options.pager = '#block-<%= block.id %> .highlights-block-pager'; | 40 | options.pager = '#block-<%= block.id %> .highlights-block-pager'; |
| 23 | <% end %> | 41 | <% end %> |
| 24 | - $('#block-<%= block.id %> .highlights-container').cycle(options); | 42 | + $('#block-<%= block.id %> .highlights-container').cycle(options); |
| 25 | })(jQuery); | 43 | })(jQuery); |
| 26 | </script> | 44 | </script> |
| 27 | <% else %> | 45 | <% else %> |