Diff
Modified: branches/event_logging/app/views/home/_announcements.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_announcements.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_announcements.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -1,13 +1,13 @@
<!-- Site Announcements -->
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
<%= feed_icon_tag "Site Announcements", formatted_announcements_path(:rss) %>
Site Announcements
</div>
<div class="content">
<% cache(:controller => 'home_cache', :action ="" 'announcements') do -%>
- <% unless (announcements = Announcement.latest).empty? %>
+ <% unless (announcements = Announcement.latest(10)).empty? %>
<ul class="announcements">
<% announcements.each do |a| %>
<li>
Modified: branches/event_logging/app/views/home/_latest_comments.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_latest_comments.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_latest_comments.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -2,7 +2,7 @@
<% cache(:controller => 'home_cache', :action ="" 'latest_comments', :id => (logged_in? ? current_user.id : 0)) do -%>
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
Latest Comments
</div>
<div class="content">
Modified: branches/event_logging/app/views/home/_latest_groups.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_latest_groups.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_latest_groups.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -2,23 +2,12 @@
<% cache(:controller => 'home_cache', :action ="" 'latest_groups', :id => (logged_in? ? current_user.id : 0)) do -%>
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
Latest Groups
</div>
<div class="content">
- <% unless (groups = Network.recently_created).empty? %>
- <ul class="list" style="font-size: 85%;">
- <% groups.each do |g| %>
- <% if thing_authorized?('show', g) %>
- <li>
- <%= icon('network', nil, nil, 'group icon', '') %>
- <b><%= link_to g.title, group_path(g) %></b>
- by <b><%= contributor(g.user_id, 'User') %></b>
- (<%= timeago_fuzzy g.created_at %>)
- </li>
- <% end %>
- <% end %>
- </ul>
+ <% unless (groups = Network.recently_created(10)).empty? %>
+ <%= render :partial => "networks/table", :locals => { :collection => groups } %>
<% else %>
<p class="none_text">None</p>
<% end %>
Modified: branches/event_logging/app/views/home/_latest_reviews.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_latest_reviews.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_latest_reviews.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -2,7 +2,7 @@
<% cache(:controller => 'home_cache', :action ="" 'latest_reviews', :id => (logged_in? ? current_user.id : 0)) do -%>
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
Latest Reviews
</div>
<div class="content">
@@ -21,7 +21,11 @@
</span>
<div class="box_standout" style="font-size: 85%; margin: 0.4em 2em; padding: 0.2em 0.5em;">
<p>
- <b><%= link_to h(r.title), review_url(r.reviewable, r) -%></b>
+ <% unless r.title.blank? %>
+ <b><%= link_to h(r.title), review_url(r.reviewable, r) -%></b>
+ <% else %>
+ <span class="none_text">No title</span>
+ <% end %>
<br/>
<span style="color: #666666;">
<% if (rating = r.associated_rating) -%>
Modified: branches/event_logging/app/views/home/_latest_tags.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_latest_tags.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_latest_tags.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -2,7 +2,7 @@
<% cache(:controller => 'home_cache', :action ="" 'latest_tags', :id => (logged_in? ? current_user.id : 0)) do -%>
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
Latest Tags
</div>
<div class="content">
Modified: branches/event_logging/app/views/home/_new_users.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_new_users.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_new_users.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -1,14 +1,12 @@
<!-- New Users -->
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
New Users
</div>
<div class="content">
- <% unless (users = User.most_recent(6)).empty? %>
- <div style="font-size: 93%;">
- <%= render :partial => "users/hlist", :locals => { :collection => users, :size => 60 } %>
- </div>
+ <% unless (users = User.most_recent(10)).empty? %>
+ <%= render :partial => "users/table", :locals => { :collection => users } %>
<% else %>
<p class="none_text">None</p>
<% end %>
Modified: branches/event_logging/app/views/home/_news.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_news.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_news.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -1,7 +1,7 @@
<!-- News -->
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
My News
</div>
<div class="content">
Modified: branches/event_logging/app/views/home/_updated_items.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/_updated_items.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/_updated_items.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -2,11 +2,11 @@
<% cache(:controller => 'home_cache', :action ="" 'updated_items', :id => (logged_in? ? current_user.id : 0)) do -%>
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
- <div class="title">
+ <div class="box_title">
Updated Items
</div>
<div class="content">
- <% unless (contributions = Contribution.last_updated(15)).empty? %>
+ <% unless (contributions = Contribution.last_updated(25)).empty? %>
<ul class="list">
<% contributions.each do |c| %>
<% if thing_authorized?('show', c) %>
Modified: branches/event_logging/app/views/home/index.rhtml (1911 => 1912)
--- branches/event_logging/app/views/home/index.rhtml 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/app/views/home/index.rhtml 2008-10-31 14:26:19 UTC (rev 1912)
@@ -1,19 +1,63 @@
<div id="home_container">
- <%= render :partial => 'stats' %>
- <div class="left">
- <%= render :partial => "announcements" %>
- <%= render :partial => "latest_groups" %>
- <%= render :partial => "latest_tags" %>
+ <div id="tabsContainer" class="tabsContainer" style="margin-top: 2em;"></div>
+
+ <div class="tabContainer">
+ <div class="tabTitle"><b>Home</b></div>
+ <div class="tabContent">
+ <%= render :partial => 'stats' %>
+ <div style="margin-top: 1.5em;">
+ <div class="left">
+ <%= render :partial => "announcements" %>
+ </div>
+ <div class="right">
+ <%= render :partial => "news" %>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+ </div>
</div>
- <div class="right">
- <%= render :partial => "news" %>
- <%= render :partial => "updated_items" %>
- <%= render :partial => "new_users" %>
- <%= render :partial => "latest_reviews" %>
- <%= render :partial => "latest_comments" %>
+ <div class="tabContainer">
+ <div class="tabTitle"><b>New Users</b></div>
+ <div class="tabContent">
+ <%= render :partial => "new_users" %>
+ <div class="clearer"> </div>
+ </div>
</div>
- <div class="clearer"> </div>
-</div>
+ <div class="tabContainer">
+ <div class="tabTitle"><b>Latest Groups</b></div>
+ <div class="tabContent">
+ <%= render :partial => "latest_groups" %>
+ <div class="clearer"> </div>
+ </div>
+ </div>
+
+ <div class="tabContainer">
+ <div class="tabTitle"><b>Updated Items</b></div>
+ <div class="tabContent">
+ <div class="left">
+ <%= render :partial => "latest_tags" %>
+ </div>
+ <div class="right">
+ <%= render :partial => "updated_items" %>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+ </div>
+
+ <div class="tabContainer">
+ <div class="tabTitle"><b>User Opinions</b></div>
+ <div class="tabContent">
+ <div style="float: left; width: 49%;">
+ <%= render :partial => "latest_reviews" %>
+ </div>
+ <div style="float: right; width: 50%;">
+ <%= render :partial => "latest_comments" %>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
Modified: branches/event_logging/public/stylesheets/styles.css (1911 => 1912)
--- branches/event_logging/public/stylesheets/styles.css 2008-10-31 13:28:51 UTC (rev 1911)
+++ branches/event_logging/public/stylesheets/styles.css 2008-10-31 14:26:19 UTC (rev 1912)
@@ -443,6 +443,14 @@
text-align: center;
}
+#home_container .tabContent {
+ border: none;
+ border-top: 1px solid #999999;
+ padding: 1.5em 0 0 0;
+ margin-bottom: 1.0em;
+ background: white;
+}
+
#home_container .left {
float: left;
width: 28%;
@@ -458,16 +466,12 @@
overflow: hidden;
}
-#home_container .box p {
- padding: 0.2em 0;
-}
-
-#home_container .box .title {
- font-size: 100%;
+#home_container .box .box_title {
+ font-size: 108%;
line-height: 1.0;
font-weight: bold;
color: #222222;
- padding: 0.1em 1em 0.4em 1em;
+ padding: 0.2em 1em 0.4em 1em;
text-align: center;
background-image: url('/images/header-bg2.png');
background-position: top;