Browse files

style sheet changes

  • Loading branch information...
1 parent 9b24b60 commit 0d53531d20c57de92417f368288a99518fcc007a @MichaelWhi MichaelWhi committed Apr 7, 2012
View
1 Gemfile
@@ -16,7 +16,6 @@ group :assets do
gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
- # gem 'therubyracer'
gem 'uglifier', '>= 1.0.3'
end
View
1 app/assets/stylesheets/application.css
@@ -9,4 +9,5 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
+ *= require_tree .
*/
View
3 app/controllers/restaurants_controller.rb
@@ -1,8 +1,9 @@
class RestaurantsController < ApplicationController
def index
- @restaurant = params[:restaurant]||"mensa"
+ @restaurant = params[:restaurant]||"mensa" #check for valid parameter
menu = get_menu_data(@restaurant)
today = Date.today
+ # the following line sets the date to next monday if no menu for today exists:
today = Date.commercial(Date.today.year, 1+Date.today.cweek, 1) unless menu[today.strftime("%d.%m.%Y")]
@menu = menu[today.strftime("%d.%m.%Y")]
end
View
4 app/views/layouts/application.html.erb
@@ -11,7 +11,7 @@
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width">
- <%= stylesheet_link_tag "iUPB"%>
+ <%= stylesheet_link_tag "application", :media => "all" %>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile.structure-1.1.0-rc.2.min.css" />
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="img/h/apple-touch-icon.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="img/m/apple-touch-icon.png">
@@ -25,7 +25,7 @@
<!-- <script>(function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(d.href.indexOf("http")||~d.href.indexOf(e.host))&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone")</script> -->
<meta http-equiv="cleartype" content="on">
- <%= stylesheet_link_tag "application", :media => "all" %>
+
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
<script src="http://code.jquery.com/mobile/1.1.0-rc.2/jquery.mobile-1.1.0-rc.2.min.js"></script>
View
2 app/views/restaurants/index.html.erb
@@ -8,7 +8,7 @@
<li>
<h3><%= menu["name"] %>
</h3>
- <p><%= menu["typ"] %>
+ <p><i><%= menu["typ"] %></i>
</p>
<% menu["beilage"].each do |beilage| %>
<p><%= beilage %></p>

0 comments on commit 0d53531

Please sign in to comment.