Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/marcofognog/programadorpo…
Browse files Browse the repository at this point in the history 
…liglota into marcofognog-master
  • Loading branch information
@lucasas
lucasas committed Dec 17, 2010
2 parents e62d31f + a553565 commit 920fa3d
Show file tree
Hide file tree
Showing 15 changed files with 1,630 additions and 128 deletions.
8 changes: 7 additions & 1 deletion app/controllers/home_controller.rb
View file
@@ -1,9 +1,10 @@
class HomeController < ApplicationController
caches_page :index, :support

before_filter :load_tag_groups, :only=> [:support,:index]

def index
page = 1
@tag_groups = TagGroup.all
@tweets = {}
@links = {}
@retweeted_users = {}
Expand Down Expand Up @@ -40,4 +41,9 @@ def load_tweets_and_links_for(tag_groups, page)
def retrieve_tweets_for(tag_group, page)
Tweet.last_tweets_for tag_group, :page=> page
end

def load_tag_groups
@tag_groups = TagGroup.all
@tag_g = @tag_groups.sort {|a,b| a[:name].length <=> b[:name].length} #organiza pelo comprimento do nome para caber no cabeçalho do site.
end
end
53 changes: 53 additions & 0 deletions app/controllers/home_controller.rb~
View file
@@ -0,0 +1,53 @@
class HomeController < ApplicationController
caches_page :index, :support

before_filter :load_tag_groups

def index
page = 1
@tag_groups = TagGroup.all
@tag_g = @tag_groups.sort {|a,b| a[:name].length <=> b[:name].length} #organiza pelo comprimento do nome para caber no cabeçalho do site.
@tweets = {}
@links = {}
@retweeted_users = {}
load_tweets_and_links_for @tag_groups, page
end

def see_more
@page = params[:page].to_i ||= 1
@tag_group = TagGroup.find(params[:tag_group].to_i)
@tweets = retrieve_tweets_for @tag_group, @page
has_more_pages(@tag_group)

render :layout => false
end

def support
@tag_groups = TagGroup.all
@tag_g = @tag_groups.sort {|a,b| a[:name].length <=> b[:name].length} #organiza pelo comprimento do nome para caber no cabeçalho do site.
end

private

def has_more_pages(tag_group)
total_tweets = Tweet.amount_of_tweets_for @tag_group
@has_more_pages = (total_tweets > @page * Tweet::TWEETS_PER_PAGE)
end

def load_tweets_and_links_for(tag_groups, page)
tag_groups.each do |tag_group|
@tweets[tag_group.name] = retrieve_tweets_for tag_group, page
@retweeted_users[tag_group.name] = RetweetedUser.most_retweeted_for(tag_group)
@links[tag_group.name] = Link.most_popular_for tag_group
end
end

def retrieve_tweets_for(tag_group, page)
Tweet.last_tweets_for tag_group, :page=> page
end

def load_tag_groups
@tag_groups = TagGroup.all
@tag_g = @tag_groups.sort {|a,b| a[:name].length <=> b[:name].length} #organiza pelo comprimento do nome para caber no cabeçalho do site.
end
end
98 changes: 43 additions & 55 deletions app/views/home/index.html.erb
View file
@@ -1,56 +1,44 @@
<div id="contentPP" class="size1">
<% @tag_groups.each do |tag_group| %>
<div class="size3 bSpace01 fLeft lang0<%=tag_group.id %>">
<h2 class="headerLang"><%=tag_group.name%></h2>
<div class="shapeLang">
<div class="linkLang">
<h3>Top links</h3>
<ul>
<% @links[tag_group.name].each do |l| %>
<li style="min-height:30px;">
<a target="blank" href="<%= l.url %>"><%= truncate(l.title, :length=>80, :separator=>' ') %></a>
</li>
<% end%>
</ul>
</div>
<ul class="newsLang">
<% @tweets[tag_group.name].each do |t| %>
<%= render :partial=>'tweet_information', :locals=>{:tweet => t} %>
<% end %>
</ul>
<div class='bloco_ver_mais'>
<%= next_page_link(1, tag_group.id) %>
</div>
<div class="retweetedPeopleLang">
<h3>Mais retweetados em <%=tag_group.name %></h3>
<% @retweeted_users[tag_group.name].each do |ru| %>
<a target="blank" href="http://www.twitter.com/<%=ru.user.twitter_id%>">
<%= image_tag image_url_of(ru.user), :class=>'twitter_photo' %>
</a>
<% end %>
</div>
</div>
</div>
<% end %>
<a class="moreLangOptions size1_null" href="http://twitter.com/?status=@progpoliglota"><span>Alguma linguagem faltando? Solicite mais linguagens.</span></a>
<div class="center1">
<div id="contentPP" class="size1">
<% @tag_groups.each do |tag_group| %>
<div class="dragWrap" id="wraplang0<%=tag_group.id %>">
<div class="size3 bSpace01 fLeft lang0<%=tag_group.id %>" id="lang0<%=tag_group.id %>">
<h2 class="headerLang"><%=tag_group.name%></h2>
<div class="shapeLang">
<div id="hideLang"><a href="#" title="Esconder esta linguagem" class="hide">
<img src="images/hide_button.gif" alt="Botão de esconder linguagem"/></a>
</div>
<div class="linkLang">
<p class="dragBar">::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::</p>
<h3>Top links</h3>
<ul>
<% @links[tag_group.name].each do |l| %>
<li style="min-height:30px;">
<a target="blank" href="<%= l.url %>"><%= truncate(l.title, :length=>80, :separator=>' ') %></a>
</li>
<% end%>
</ul>
</div>
<ul class="newsLang">
<% @tweets[tag_group.name].each do |t| %>
<%= render :partial=>'tweet_information', :locals=>{:tweet => t} %>
<% end %>
</ul>
<div class='bloco_ver_mais'>
<%= next_page_link(1, tag_group.id) %>
</div>
<div class="retweetedPeopleLang">
<h3>Mais retweetados em <%=tag_group.name %></h3>
<% @retweeted_users[tag_group.name].each do |ru| %>
<a target="blank" href="http://www.twitter.com/<%=ru.user.twitter_id%>">
<%= image_tag image_url_of(ru.user), :class=>'twitter_photo' %>
</a>
<% end %>
</div>
</div>
</div>
</div>
<% end %>
</div>
<a class="moreLangOptions size1_null" href="http://twitter.com/?status=@progpoliglota"><span>Alguma linguagem faltando? Solicite mais linguagens.</span></a>
</div>
<script type="text/javascript">
$(function() {
registerEvent();
});

function registerEvent() {
$(".ver_mais").click(function() {
elemento = $(this);
url = $(this).attr('href');
$.get(url, function(data) {
div = elemento.parent().parent();
div.find('.ver_mais').remove();
div.find('.bloco_ver_mais').remove();
div.find('.newsLang').replaceWith(data);
registerEvent();
});
return false;
});
}
</script>
44 changes: 44 additions & 0 deletions app/views/home/index.html.erb~
View file
@@ -0,0 +1,44 @@
<div class="center">
<div id="contentPP" class="size1">
<% @tag_groups.each do |tag_group| %>
<div class="dragWrap" id="wraplang0<%=tag_group.id %>">
<div class="size3 bSpace01 fLeft lang0<%=tag_group.id %>" id="lang0<%=tag_group.id %>">
<h2 class="headerLang"><%=tag_group.name%></h2>
<div class="shapeLang">
<div id="hideLang"><a href="#" title="Esconder esta linguagem" class="hide">
<img src="images/hide_button.gif" alt="Botão de esconder linguagem"/></a>
</div>
<div class="linkLang">
<p class="dragBar">::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::</p>
<h3>Top links</h3>
<ul>
<% @links[tag_group.name].each do |l| %>
<li style="min-height:30px;">
<a target="blank" href="<%= l.url %>"><%= truncate(l.title, :length=>80, :separator=>' ') %></a>
</li>
<% end%>
</ul>
</div>
<ul class="newsLang">
<% @tweets[tag_group.name].each do |t| %>
<%= render :partial=>'tweet_information', :locals=>{:tweet => t} %>
<% end %>
</ul>
<div class='bloco_ver_mais'>
<%= next_page_link(1, tag_group.id) %>
</div>
<div class="retweetedPeopleLang">
<h3>Mais retweetados em <%=tag_group.name %></h3>
<% @retweeted_users[tag_group.name].each do |ru| %>
<a target="blank" href="http://www.twitter.com/<%=ru.user.twitter_id%>">
<%= image_tag image_url_of(ru.user), :class=>'twitter_photo' %>
</a>
<% end %>
</div>
</div>
</div>
</div>
<% end %>
</div>
<a class="moreLangOptions size1_null" href="http://twitter.com/?status=@progpoliglota"><span>Alguma linguagem faltando? Solicite mais linguagens.</span></a>
</div>
12 changes: 10 additions & 2 deletions app/views/layouts/application.html.erb
View file
Expand Up @@ -4,7 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Programador Poliglota</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js' %>
<%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js',
'jquery.cookie.js','https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/jquery-ui.min.js','application.js' %>
<%= csrf_meta_tag %>
</head>
<body>
Expand All @@ -17,6 +18,13 @@
<li><a id="menuHomePP" href="<%= root_url %>"><span>Programador <br /> Poliglota</span></a></li>
<li><a id="menuApoiePP" href="<%= support_url %>"><span>Apoie o <br />movimento</span></a></li>
</ul>
<div>
<ul id="menuLang">
<% @tag_g.each do |tag_group| %>
<li ><a id="<%=tag_group.id %>" href="#" class="linkLang" title="Mostra linguagem"> #<%= tag_group.name %> </a></li>
<%end%>
</ul>
</div>
<h1 id="logoPP" >
<a href="./" title="retornar a pagina principal"><span>Programador Poliglota</span></a>
</h1><!-- logo site-->
Expand Down Expand Up @@ -44,7 +52,7 @@
</div><!-- footerPP-->
<script type="text/javascript">

var _gaq = _gaq || [];
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18141997-1']);
_gaq.push(['_trackPageview']);

Expand Down
70 changes: 70 additions & 0 deletions app/views/layouts/application.html.erb~
View file
@@ -0,0 +1,70 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Programador Poliglota</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js','application.js',
'jquery.cookie.js','https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/jquery-ui.min.js' %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="headerWrap">
<a id="twitterPageTurn" href="http://twitter.com/progpoliglota" target="_blank">
<span>Siga-nos no twitter!</span>
</a>
<div id="headerPP" class="size1">
<ul id="menu">
<li><a id="menuHomePP" href="<%= root_url %>"><span>Programador <br /> Poliglota</span></a></li>
<li><a id="menuApoiePP" href="<%= support_url %>"><span>Apoie o <br />movimento</span></a></li>
</ul>
<div>
<ul id="menuLang">
<% @tag_g.each do |tag_group| %>
<li ><a id="<%=tag_group.id %>" href="#" class="linkLang" title="Mostra linguagem"> #<%= tag_group.name %> </a></li>
<%end%>
</ul>
</div>
<h1 id="logoPP" >
<a href="./" title="retornar a pagina principal"><span>Programador Poliglota</span></a>
</h1><!-- logo site-->
</div>
</div>
<div id="contentWrap">
<%= yield %>
</div>

<div id="footerWrap">
<div id="footerPP" class="size1">

<ul id="menuFooter">
<li><a id="menuFooterHomePP" href="<%= root_url %>"><span>Programador <br /> Poliglota</span></a></li>
<li><a id="menuFooterApoiePP" href="<%= support_url %>"><span>Apoie o <br /> movimento</span></a></li>
</ul>

<div id="socialFooter">
<p><span>Siga essa causa:</span>
<a id="twitterFooter" href="http://www.twitter.com/progpoliglota" target="_blank"> <span>@progpoliglota</span></a>
<iframe src="http://www.facebook.com/plugins/like.php?href=www.programadorpoliglota.com.br&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=100" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:21px;" allowTransparency="true"></iframe>
</p>
</div><!-- social icons-->

</div><!-- footerPP-->
<script type="text/javascript">

var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-18141997-1']);
_gaq.push(['_trackPageview']);

(function() {
var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();

</script>
</body>
</html>
0 config/database.yml.example → config/database.yml~
View file
File renamed without changes.
Binary file added public/images/hide_button.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 920fa3d

Please sign in to comment.