glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

reworked logged in homepage

Browse source
This commit is contained in:
Connor Turland 2014-03-03 00:25:47 -08:00
parent 7f5269bb84
commit 19df96cb77
2 changed files with 46 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/main_controller.rb
View file

@ -10,10 +10,16 @@ class MainController < ApplicationController
# home page
def home
@maps = Map.find_all_by_featured(true).shuffle!
@maps = @maps.slice(0,3)
@current = current_user
respond_with(@maps)
if !authenticated?
@maps = Map.find_all_by_featured(true).shuffle!
@maps = @maps.slice(0,3)
elsif authenticated?
@maps = Map.order("updated_at DESC").limit(3)
end
respond_with(@maps, @current)
end
# /request

57
app/views/main/home.html.erb
View file

@ -15,31 +15,48 @@
<div class="home_content">
<div class="home_desc">
<div class="welcomeTo">Welcome to Metamaps</div>
<img id="homeMapImage" src="/assets/metamap128x128.png" width="128" height="128" />
<div class="metamapsIs">
a home on the web for <span class="swapWord">
<ul class="texts">
<li>building shared knowledge</li>
<li>learning</li>
<li>visioning</li>
<li>conversing</li>
<li>collaborating</li>
<li>sensemaking</li>
<li>innovating</li>
<li>designing</li>
<li>playing</li>
<li>exploring</li>
</ul>
</span>
<div class="welcomeTo">
<% if !authenticated? %>
Welcome to Metamaps
<% elsif authenticated? %>
Welcome back, <%= @current.name.split[0...1][0] %>!
<% end %>
</div>
<img id="homeMapImage" src="/assets/metamap128x128.png" width="128" height="128" />
<% if !authenticated? %>
<div class="metamapsIs">
a home on the web for <span class="swapWord">
<ul class="texts">
<li>building shared knowledge</li>
<li>learning</li>
<li>visioning</li>
<li>conversing</li>
<li>collaborating</li>
<li>sensemaking</li>
<li>innovating</li>
<li>designing</li>
<li>playing</li>
<li>exploring</li>
</ul>
</span>
</div>
<% end %>
</div>
<div class="clearfloat"></div>
<p class="contact">
<a href="/request" class="request button">Request Invite</a>
<a href="#" class="learnmore button openLightbox" data-open="about">Learn More</a>
<div class="featuredMaps">explore featured maps from our community</div>
<% if !authenticated? %>
<a href="/request" class="request button">Request Invite</a>
<a href="#" class="learnmore button openLightbox" data-open="about">Learn More</a>
<% end %>
<div class="featuredMaps">
<% if !authenticated? %>
explore featured maps from our community
<% elsif authenticated? %>
explore recently active maps
<% end %>
</div>
</p>
<div class="centeredProfile">