@@ -1,30 +1,33 @@ - -<div class="portlet portletB"> - <h2><span><%= I18n.t("tog_conclave.site.upcoming") %></span></h2> +<div class="floatLeft leftColumn"> + <div class="portlet portletB"> + <% if params[:controller] == "member/conclave/events"%> + <h2>Events</h2> + <% else -%> + <h2><%= I18n.t("tog_conclave.site.upcoming") %></h2> + <% end %> <div class="portlet_content"> - <ul> - <%@events.each do |event|%> - <li class="clearfix"> - <div class="image left"><%= icon_for_event(event, 'small')%></div> - <%= link_to event.title, conclave_event_path(event), :title => event.title %> - <br/> <%=event.opening_time %> - </li> - <%end%> - </ul> + <%@events.each do |event|%> + <dl class="clear"> + <dt class="floatLeft vspace"> + <% if event.icon %> + <%= icon_for_event(event, 'big')%> + <% end %> + </dt> + <dd class="floatRight vspace title"><%= link_to event.title, conclave_event_path(event), :title => event.title %></dd> + <dd class="floatRight time"><%=event.opening_time %></dd> + </dl> + <%end%> </div> -</div> -<% if !@events.empty? %> - <div class="info_results"> - <span class="info_items"> - <%= page_entries_info @events %> - </span> - <span class="pages_navigation right"> - <%= will_paginate @events %> - </span> </div> -<%end%> - + <% if !@events.empty? %> + <div class="pages_navigation right"> + <%= will_paginate @events %> + </div> + <%end%> +</div> -<% content_for :sidebar do %> - <%= render :partial => 'calendar', :locals => {:year => @year, :month => @month} -%> +<% if params[:controller] != "member/conclave/events"%> + <% content_for :sidebar do %> + <%= render :partial => 'calendar', :locals => {:year => @year, :month => @month} -%> + <% end -%> <% end -%> app/views/conclave/events/index.html.erb @@ -1,42 +1,49 @@ -<div class="detail detail1"> - <div class="image"><%= icon_for_event(@event, 'big')%></div> - <div class="title"><%= @event.title -%></div> - <div class="subtitle"> - <%= @event.opening_time %> - </div> - <div class="text"> - <%= sanitize textilize(@event.description) %> - </div> - - <div class="portlet portletC"> - <h2><span>More info</span></h2> - <div class="portlet_content"> - <ul> - <li><%if @event.url%>Url: <%=link_to @event.url, @event.url%><%end%></li> - <li>Venue: <%= link_to @event.venue, @event.venue_link %></li> - </ul> +<div class="leftColumn floatLeft"> + <div class="portlet portletC"> + <div class="portlet_content"> + <dl class="clear"> + <dt class="floatLeft vspace"> + <% if @event.icon %> + <%= icon_for_event(@event, 'big')%> + <% end %> + </dt> + <dd class="title floatRight vspace"><%= @event.title -%></dd> + <dd class="time floatRight"><%= @event.opening_time %></dd> + </dl> + <h2>More Info</h2> + <div class="yellowBox"> + <div class="holder"> + <ul class="infoHolder eventDetails"> + <li><label>Description:</label><%= sanitize textilize(@event.description) %></li> + <li><%if @event.url%><label>Url:</label> <%=link_to @event.url, @event.url%><%end%></li> + <li><label>Venue:</label><%= link_to @event.venue, @event.venue_link %></li> + </ul> + <div id="register"> + <% if current_user && current_user.registered?(@event) %> + <%= button_to "Unregister", member_conclave_unregister_path(@event) %> + <% else %> + <%= button_to "Register", member_conclave_register_path(@event) %> + <% end %> + </div> </div> - </div> - <div id="register"> - <% if current_user && current_user.registered?(@event) %> - <%= button_to "Unregister", member_conclave_unregister_path(@event) %> - <% else %> - <%= button_to "Register", member_conclave_register_path(@event) %> - <% end %> - </div> - <div id="map"> - <%= render :partial => 'map', :locals => {:width => 400, :height => 300} %> + </div> </div> - -</div> - -<div> - <% for attendees in @event.attendees %> - <div><%= link_to icon_for_profile(attendees.profile, 'small'), profile_path(attendees.profile) %> - <%= link_to attendees.profile.full_name || attendees.login, profile_path(attendees.profile) %></div> - <% end %> + </div> + <div> + <% for attendees in @event.attendees %> + <div> + <%= link_to icon_for_profile(attendees.profile, 'small'), profile_path(attendees.profile) %> + <%= link_to attendees.profile.full_name || attendees.login, profile_path(attendees.profile) %> + </div> + <% end %> + </div> </div> <% content_for :sidebar do %> + <h2>Event Calender</h2> <%= render :partial => 'calendar', :locals => {:year => @event.start_date.year, :month => @event.start_date.month} -%> + <div id="map" class="vspace"> + <h2>Maps</h2> + <%= render :partial => 'map', :locals => {:width => 400, :height => 300} %> + </div> <% end -%> app/views/conclave/events/show.html.erb fc622b5f910a48f8b89e83ae362535a81b73a6ab Payal Gupta cool.payal1985@gmail.com http://github.com/suratpyari/tog_conclave/commit/fb636358175d90d3ad5c0d8f63549a88c6c0855a fb636358175d90d3ad5c0d8f63549a88c6c0855a 2009-01-05T03:43:57-08:00 2009-01-05T03:43:57-08:00 views modified 707f94b93fccd60230aca6647d8625cb7ff8ab42 Payal Gupta cool.payal1985@gmail.com