Skip to content

Commit

Permalink
started on cleaning up periods and program feature
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivarconr
ivarconr committed Oct 15, 2012
1 parent 623ad25 commit f008e68
Show file tree
Hide file tree
Showing 10 changed files with 377 additions and 236 deletions.
4 changes: 2 additions & 2 deletions app/controllers/periods_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def index

@edit = params[:edit] && admin?
@all_talks = Talk.all_pending_and_approved if @edit

@all_talks.sort!{|t1,t2|t1.id <=> t2.id}

respond_to do |format|
format.html # index.html.erb
format.html {render :layout => 'plain' }# index.html.erb
format.xml { render :xml => @periods }
end
end
Expand Down
10 changes: 1 addition & 9 deletions app/controllers/program_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,10 @@ def index

@time_ids = @periods.collect { |p| p.time_id }.sort.uniq

@w = Array.new
@w[0] = [Talk.find(11), Talk.find(97)]
@w[1] = [Talk.find(35), Talk.find(88)]
@w[2] = [Talk.find(35), Talk.find(89)]
@w[3] = [Talk.find(41), Talk.find(36)]
@w[4] = [Talk.find(43), Talk.find(36)]
@w[5] = [Talk.find(24), Talk.find(82)]

@selected = params[:selected]

respond_to do |format|
format.html # index.html.erb
format.html {render :layout => 'program' } # index.html.erb
format.xml
end
end
Expand Down
29 changes: 29 additions & 0 deletions app/helpers/program_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,34 @@ def period_talks(period)
def period_workshops(workshop)
"#{link_to h(workshop.title), workshop}<br /> #{workshop.speaker_name}"
end

def period_talks_slot(period)
"<div class='slot'>" + period.talks.sort_by(&:position).collect { |t|
"<h3>#{abbr_for_talk(t.talk_type.name.downcase)}#{link_to h(t.title), t} (#{t.speaker_name})</h3>" }.join + "</div>"
end

def timeslot_talks_section(period, index)
last = index == 2 ? "last" : ""
"""
<section class='period one sal_#{period.scene_id} fourcol #{last}'>
<header>
<time class='time'>#{period.time_of_day}</time>
<span class='location'>Sal #{period.scene_id}</span>
</header>
#{period_talks_slot(period)}
</section>
""".html_safe
end

def timeslot_talks_row(periods)
html = "<div class='row'>"
periods.each do |index, period|
html += timeslot_talks_section(period, index)
end

html += "</div>"
html.html_safe
end

end
110 changes: 63 additions & 47 deletions app/views/layouts/plain.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
<!DOCTYPE html>
<html lang="no">

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>
<%= content_for?(:title) ? yield(:title) : "Smidig 2012: 05. - 06. november på Radisson SAS Plaza Hotel Oslo" %>
</title>

<!--[if lte IE 9]>
<link rel="stylesheet" href="<%= stylesheet_link_tag 'ie_1140' %>" type="text/css" media="screen" />
<link rel="stylesheet" href="/stylesheets/ie_1140.css" type="text/css" media="screen" />
<![endif]-->


<%= stylesheet_link_tag '1140' %>
<%= stylesheet_link_tag 'screen', :media => "screen,projection,tv" %>
<%= stylesheet_link_tag 'fonts' %>

<%= javascript_include_tag 'jquery-1.4.2.min' %>
<%= stylesheet_link_tag 'styles' %>
<%= stylesheet_link_tag 'tooltip' %>

<%= javascript_include_tag 'css3-mediaqueries' %>
<%= javascript_include_tag 'jquery-1.7.2.min' %>
<%= javascript_include_tag 'jquery.simpletip-1.3.1.min' %>
<%= javascript_include_tag 'application' %>

<!-- Sponsor widget -->
<%= javascript_include_tag ENV['INFO_APP_BASE']+'/javascript/sponsor.js' %>
<script type="text/javascript">
smidig.sponsor.init("<%= ENV['INFO_APP_BASE'] %>");
</script>

<%= auto_discovery_link_tag :rss, {:controller => 'talks', :format => :rss}, {:title => "Alle lyntaler"} %>
<%= auto_discovery_link_tag :rss, {:controller => 'talks', :topic_id => @topic, :format => :rss}, {:title => "Lyntaler for #{@topic.title}"} if @topic %>
Expand All @@ -26,48 +35,55 @@

<body>

<section>
<header class="container" id="header">
<div class="twelvecol last">
<h1><%= link_to "Smidig 2012", root_url %></h1>
</div>
</header>

<nav class="container" id="nav">
<%#= render :partial => 'layouts/menu' %>
</nav>

<% unless flash.empty? %>
<div class="container" id="notifications">
<% if flash[:notice] %>
<p class="notice"><%= flash[:notice] %></p>
<% end %>
<% if flash[:warn] %>
<p class="warn"><%= flash[:warn] %></p>
<% end %>
<% if flash[:error] %>
<p class="error"><%= flash[:error] %></p>
<% end %>
</div>
<% end %>

<section class="container" id="content">
<div class="row">
<article class="eightcol">
<%= yield %>
</article>
<div class="aside fourcol last" id="aside">
<% #= render :partial => 'layouts/sponsors' %>
</div>
</div>
</section>
<footer id="footer">
<!--<div id="socialcluster"><a class="epost" href="mailto:[email protected]">Send oss en epost.</a><a class="facebook" href="http://www.facebook.com/pages/Smidig-konferansen/102562453136427">Besøk oss på Facebook.</a><a class="twitter" href="http://twitter.com/#!/smidig">Følg oss på Twitter.</a><a class="linkedin" href="http://www.linkedin.com/groups?mostPopular=&amp;gid=963587">Besøk vår gruppe på LinkedIn.</a></div>-->
</footer>
</section>
<div class="main">
<div class="twelvecol">
<div class="content-wrapper">
<%= yield %>
</div>
</div>
</div>
<footer class="page-footer">
<div class="row">
Smidigkonferansen 2012
<br>
<a href="mailto:[email protected]">[email protected]</a>
<h3>Godbiter fra tidligere konferanser</h3>
<ul>
<li>
<a href="http://vimeo.com/smidig">Videoarkiv på Vimeo</a>
</li>
<li>
<a href="http://smidig2011.no/">Smidig 2011</a>
</li>
<li>
<a href="http://smidig2010.no/">Smidig 2010</a>
</li>
<li>
<a href="http://smidig2009.no/">Smidig 2009</a>
</li>
<li>
<a href="http://smidig2008.no/">Smidig 2008</a>
</li>
<li>
<a href="http://smidig2007.no/">Smidig 2007</a>
</li>
</ul>
<h3>Følg oss</h3>
<ul>
<li>
<a href="https://twitter.com/smidig">@twitter</a>
</li>
<li>
<a href="http://www.facebook.com/smidig">Smidigkonferansen</a>
</li>
<li>
<a href="http://lanyrd.com/2012/smidig2012">Lanyrd</a>
</li>
</ul>
</div>
</footer>

<%= render :partial => 'layouts/facebook' %>
<%= render :partial => 'layouts/analytics' %>

</body>
Expand Down
90 changes: 90 additions & 0 deletions app/views/layouts/program.html.erb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>
<%= content_for?(:title) ? yield(:title) : "Smidig 2012: 05. - 06. november på Radisson SAS Plaza Hotel Oslo" %>
</title>

<!--[if lte IE 9]>
<link rel="stylesheet" href="/stylesheets/ie_1140.css" type="text/css" media="screen" />
<![endif]-->


<%= stylesheet_link_tag '1140' %>
<%= stylesheet_link_tag 'styles' %>
<%= stylesheet_link_tag 'tooltip' %>

<%= javascript_include_tag 'css3-mediaqueries' %>
<%= javascript_include_tag 'jquery-1.7.2.min' %>
<%= javascript_include_tag 'jquery.simpletip-1.3.1.min' %>
<%= javascript_include_tag 'application' %>

<!-- Sponsor widget -->
<%= javascript_include_tag ENV['INFO_APP_BASE']+'/javascript/sponsor.js' %>
<script type="text/javascript">
smidig.sponsor.init("<%= ENV['INFO_APP_BASE'] %>");
</script>

<%= auto_discovery_link_tag :rss, {:controller => 'talks', :format => :rss}, {:title => "Alle lyntaler"} %>
<%= auto_discovery_link_tag :rss, {:controller => 'talks', :topic_id => @topic, :format => :rss}, {:title => "Lyntaler for #{@topic.title}"} if @topic %>
<%= auto_discovery_link_tag :rss, {:controller => 'comments', :talk_id => @talk, :format => :rss}, {:title => "Kommentarer for #{@talk.title}"} if @talk %>
</head>

<body>

<div class="row main">
<div class="twelvecol">
<div class="content-wrapper">
<%= yield %>
</div>
</div>
</div>
<footer class="page-footer">
<div class="row">
Smidigkonferansen 2012
<br>
<a href="mailto:[email protected]">[email protected]</a>
<h3>Godbiter fra tidligere konferanser</h3>
<ul>
<li>
<a href="http://vimeo.com/smidig">Videoarkiv på Vimeo</a>
</li>
<li>
<a href="http://smidig2011.no/">Smidig 2011</a>
</li>
<li>
<a href="http://smidig2010.no/">Smidig 2010</a>
</li>
<li>
<a href="http://smidig2009.no/">Smidig 2009</a>
</li>
<li>
<a href="http://smidig2008.no/">Smidig 2008</a>
</li>
<li>
<a href="http://smidig2007.no/">Smidig 2007</a>
</li>
</ul>
<h3>Følg oss</h3>
<ul>
<li>
<a href="https://twitter.com/smidig">@twitter</a>
</li>
<li>
<a href="http://www.facebook.com/smidig">Smidigkonferansen</a>
</li>
<li>
<a href="http://lanyrd.com/2012/smidig2012">Lanyrd</a>
</li>
</ul>
</div>
</footer>

<%= render :partial => 'layouts/facebook' %>
<%= render :partial => 'layouts/analytics' %>

</body>
</html>
2 changes: 1 addition & 1 deletion app/views/periods/_period.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<%=
# select_tag "periods[#{period.id}]positions[#{position}]new_talk", "<option></option>" +
# options_from_collection_for_select(@all_talks, 'id', 'option_text', period.talk_list[position] && period.talk_list[position].id)
select_tag "periods[#{period.id}]positions[#{position}]new_talk", options_from_collection_for_select(@all_talks, 'id', 'option_text', period.talk_list[position] && period.talk_list[position].id)
select_tag "periods[#{period.id}]positions[#{position}]new_talk", options_from_collection_for_select(@all_talks, 'id', 'option_text', period.talk_list[position] && period.talk_list[position].id), {:include_blank => ''}
%>

<%= hidden_field_tag "periods[#{period.id}]positions[#{position}]previous_talk", (period.talk_list[position] && period.talk_list[position].id) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/periods/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
<% end %>
</table>
<%= submit_tag "Oppdater programmet" if @edit %>
<%= submit_tag "Oppdater programmet", :class => 'button' if @edit %>

Loading

0 comments on commit f008e68

Please sign in to comment.