Download as
Browse Code »

Commit 49e8f6bf22f7241a99495ea6e208475bb31eb17f

Authored by Aurelio A. Heckert
Committed by Daniela Feitosa
1 parent a4a71f2f
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1070: removed the end comma. msie sux! and i also add the favicon tag too.

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @49e8f6b
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 <%= meta_tags_for_article(@page) %> 5 <%= meta_tags_for_article(@page) %>
6 <!--<meta http-equiv="refresh" content="1"/>--> 6 <!--<meta http-equiv="refresh" content="1"/>-->
7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  8 + <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/imgs/favicon.ico' %>" type="image/x-icon" />
8 <%= noosfero_javascript %> 9 <%= noosfero_javascript %>
9 <%= import_blocks_stylesheets %> 10 <%= import_blocks_stylesheets %>
10 <%= import_controller_stylesheets %> 11 <%= import_controller_stylesheets %>
app/views/layouts/slideshow.rhtml
  Diff comments   View file @49e8f6b
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 12
13 <%= stylesheet_import "slideshow" %> 13 <%= stylesheet_import "slideshow" %>
14 <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose' %> 14 <%= javascript_include_tag 'jquery-latest', 'sliderjs', 'pikachoose' %>
15 - <script language="javascript">  
16 - <!-- 15 + <script type="text/javascript">
17 $(document).ready(function (){ 16 $(document).ready(function (){
18 $("#slideshow").PikaChoose({ 17 $("#slideshow").PikaChoose({
19 buttons: { play: <%= _("Play").to_json %>, stop: <%= _("Stop").to_json %>, previous: <%= _("Previous").to_json %>, next: <%= _("Next").to_json %> } 18 buttons: { play: <%= _("Play").to_json %>, stop: <%= _("Stop").to_json %>, previous: <%= _("Previous").to_json %>, next: <%= _("Next").to_json %> }
@@ -23,10 +22,9 @@ @@ -23,10 +22,9 @@
23 window_height: 55, 22 window_height: 55,
24 list_width: 832, 23 list_width: 832,
25 pikachoose: true, 24 pikachoose: true,
26 - auto_play: false, 25 + auto_play: false
27 }); 26 });
28 }); 27 });
29 - -->  
30 </script> 28 </script>
31 </head> 29 </head>
32 <body> 30 <body>