Download as
Browse Code »

Commit b6d443cb003565221f06432e1acd00662b13e68c

Authored by Francisco Marcelo de Araújo Lima Júnior
1 parent 019bbf17
Exists in master and in 22 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, template_mirror_block, tests, tests_fixies

adjust infra to embed track block

Showing 3 changed files with 15 additions and 25 deletions   Show diff stats
app/controllers/embed_controller.rb
  Diff comments   View file @b6d443c
1 class EmbedController < ApplicationController 1 class EmbedController < ApplicationController
2 2
3 - def embed_block 3 + def index
4 block = Block.find(params[:id]) 4 block = Block.find(params[:id])
5 source = params[:source] 5 source = params[:source]
6 6
app/views/layouts/embed.rhtml
  Diff comments   View file @b6d443c
@@ -19,13 +19,19 @@ @@ -19,13 +19,19 @@
19 content.respond_to?(:call) ? content.call : content 19 content.respond_to?(:call) ? content.call : content
20 end.join("\n") 20 end.join("\n")
21 %> 21 %>
22 -  
23 - <div id="wrap-1">  
24 - <div id="wrap-2">  
25 - <div id="content">  
26 - <div id="content-inner">  
27 - <%= yield %>  
28 - <br style="clear: both" /> 22 + <div id="embed">
  23 + <div id="wrap-1">
  24 + <div id="wrap-2">
  25 + <div id="content">
  26 + <div id="content-inner">
  27 + <div class="boxes" id="boxes">
  28 + <div class="box box-1" id="box-1">
  29 + <div class="blocks">
  30 + <%= yield %>
  31 + </div>
  32 + </div>
  33 + </div>
  34 + </div>
29 </div> 35 </div>
30 </div> 36 </div>
31 </div> 37 </div>
@@ -37,21 +43,5 @@ @@ -37,21 +43,5 @@
37 }); 43 });
38 </script> 44 </script>
39 45
40 - <!-- Piwik -->  
41 - <script type="text/javascript">  
42 - var _paq = _paq || [];  
43 - _paq.push(["trackPageView"]);  
44 - _paq.push(["enableLinkTracking"]);  
45 -  
46 - (function() {  
47 - var u="http://estatisticas.presidencia.gov.br/";  
48 - _paq.push(["setTrackerUrl", u+"piwik.php"]);  
49 - _paq.push(["setSiteId", "14"]);  
50 - var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";  
51 - g.defer=true; g.async=true; g.src="/javascripts/piwik.js"; s.parentNode.insertBefore(g,s);  
52 - })();  
53 - </script>  
54 - <!-- End Piwik Code -->  
55 -  
56 </body> 46 </body>
57 </html> 47 </html>
config/routes.rb
  Diff comments   View file @b6d443c
@@ -32,7 +32,7 @@ ActionController::Routing::Routes.draw do |map| @@ -32,7 +32,7 @@ ActionController::Routing::Routes.draw do |map|
32 map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing' 32 map.connect 'user_themes/*stuff', :controller => 'not_found', :action => 'nothing'
33 33
34 # embed controller 34 # embed controller
35 - map.embed_block 'embed/block/:id', :controller => 'embed', :action => 'embed_block', :id => /.+/ 35 + map.embed_block 'embed/block/:id', :controller => 'embed', :action => 'index', :id => /.+/
36 36
37 # online documentation 37 # online documentation
38 map.doc 'doc', :controller => 'doc', :action => 'index' 38 map.doc 'doc', :controller => 'doc', :action => 'index'