Permalink
Browse files

Merge branch 'release/0.5.26'

  • Loading branch information...
2 parents 2611424 + e4c2d3f commit 392282f9412c5d290454a6aad8a67f9f12afb694 @potomak committed Oct 29, 2011
@@ -54,9 +54,15 @@
<% end %>
</div>
- <div id="logo">
- <h1 class="<%= "start" unless current_user %>"><%= link_to "Tomatoes", root_path %></h1>
- <h2 class="<%= "start" unless current_user %>">Pomodoro technique<sup>®</sup> time tracker</h2>
+ <div id="logo" class="block <%= current_user ? "auth" : "start" %>">
+ <div class="text">
+ <h1><%= link_to "Tomatoes", root_path %></h1>
+ <h2>Pomodoro technique<sup>®</sup> time tracker</h2>
+ </div>
+ <div id="sponsors" class="block">
+ <p class="left">Sponsored by</p>
+ <a id="mongohq" class="left" href="http://mongohq.com">MongoHQ</a>
+ </div>
</div>
<%= render :partial => 'shared/announcement' %>
@@ -1,7 +1,7 @@
-<% tomatoes = Tomato.all.count %>
+<% tomatoes = Tomato.count %>
<% now = Time.zone.now %>
-<% first_tomato = Tomato.order_by([[:created_at, :desc]]).last %>
+<% first_tomato = Tomato.order_by([[:created_at, :desc]]).last || Tomato.new(:created_at => Time.now) %>
-<%= pluralize(User.all.count, 'user') %> already tracked <%= pluralize(tomatoes, 'tomato') %><br/>
+<%= pluralize(User.count, 'user') %> already tracked <%= pluralize(tomatoes, 'tomato') %><br/>
about <%= humanize(tomatoes*Tomato::DURATION) %> of work<br/>
about <%= number_with_precision(tomatoes/((now - first_tomato.created_at) / 3600)) %> tomatoes per hour
@@ -1,16 +1,17 @@
<% unless current_user %>
- <div id="intro">
- <h2>About Tomatoes</h2>
- <p>Tomatoes is a web-based time tracker.</p>
- <p>Use the Pomodoro technique® to track your working time in 25-minutes slot called <i>pomodoro</i>.</p>
- </div>
<div id="sign_in" class="block">
<%= link_to signin_path, :class => "button" do %>
<%= image_tag("Octocat.png", :width => "32") %>
Sign in with GitHub
<% end %>
<p>Sign in with your GitHub account and start tracking your pomodoros.</p>
</div>
+
+ <div id="intro">
+ <h2>About Tomatoes</h2>
+ <p>Tomatoes is a web-based time tracker.</p>
+ <p>Use the Pomodoro technique® to track your working time in 25-minutes slot called <i>pomodoro</i>.</p>
+ </div>
<% else %>
<div id="progress_bar">
<div id="timer_container">
@@ -1 +1 @@
-{"name":"Tomatoes","app":{"urls":["http://tomatoes.heroku.com/"],"launch":{"web_url":"http://tomatoes.heroku.com/"}},"icons":{"128":"icon_128.png"},"version":"0.5.25","description":"Pomodoro technique online time tracker"}
+{"name":"Tomatoes","app":{"urls":["http://tomatoes.heroku.com/"],"launch":{"web_url":"http://tomatoes.heroku.com/"}},"icons":{"128":"icon_128.png"},"version":"0.5.26","description":"Pomodoro technique online time tracker"}
@@ -12,7 +12,7 @@
Bundler.require(:default, Rails.env) if defined?(Bundler)
module TomatoesApp
- VERSION = '0.5.25'
+ VERSION = '0.5.26'
REPO = 'https://github.com/potomak/tomatoes'
class Application < Rails::Application
View
@@ -10,7 +10,7 @@ test:
# set these environment variables on your prod server
production:
- uri: <%= ENV['MONGOHQ_URL'] %>
+ uri: <%= ENV['MONGOHQ_BIG_URL'] %>
use_activesupport_time_zone: true
# slaves:
# - host: slave1.local
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Tomatoes - Application Error</title>
+ <style type="text/css">
+ body {
+ background-color: white;
+ color: #333333;
+ font-family: Arial, sans-serif;
+ margin: 0;
+ padding: 36px;
+ line-height: 18px;
+ font-size: 14px;
+ }
+ .section {
+ margin-bottom: 36px;
+ color: #222222;
+ }
+ .section h1 {
+ background-image: url(pomodoro.png);
+ background-repeat: no-repeat;
+ padding: 22px;
+ padding-left: 50px;
+ margin: 0;
+ margin-left: 15px;
+ font-size: 26px;
+ overflow: hidden;
+ }
+ .article {
+ padding: 22px;
+ font-size: 14px;
+ }
+ </style>
+</head>
+<body>
+ <div class="section">
+ <h1>Application Error</h1>
+ <div class="article">
+ <p>An error occurred in the application and your page could not be served. Please try again in a few moments.</p>
+ <p>If you are the application owner, check your logs for details.</p>
+ </div>
+ </div>
+</body>
+</html>
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Tomatoes - Application Offline for Maintenance</title>
+ <style type="text/css">
+ body {
+ background-color: white;
+ color: #333333;
+ font-family: Arial, sans-serif;
+ margin: 0;
+ padding: 36px;
+ line-height: 18px;
+ font-size: 14px;
+ }
+ .section {
+ margin-bottom: 36px;
+ color: #222222;
+ }
+ .section h1 {
+ background-image: url(pomodoro.png);
+ background-repeat: no-repeat;
+ padding: 22px;
+ padding-left: 50px;
+ margin: 0;
+ margin-left: 15px;
+ font-size: 26px;
+ overflow: hidden;
+ }
+ .article {
+ padding: 22px;
+ font-size: 14px;
+ }
+ </style>
+</head>
+<body>
+ <div class="section">
+ <h1>Application Offline for Maintenance</h1>
+ <div class="article">
+ <p>This application is undergoing maintenance right now. Please check back later.</p>
+ </div>
+ </div>
+</body>
+</html>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -199,14 +199,19 @@ a.button:hover {
font-weight: bold;
}
+#logo.auth .text {
+ float: left;
+ margin-right: 20px;
+}
+
#logo h1 {
font-size: 48px;
font-family: 'Leckerli One', cursive;
margin-top: 10px;
margin-bottom: -8px;
}
-#logo h1.start {
+#logo.start h1 {
font-size: 158px;
margin-bottom: -45px;
text-align: center;
@@ -222,10 +227,33 @@ a.button:hover {
margin-left: 53px;
}
-#logo h2.start {
+#logo.start h2 {
font-size: 20px;
margin-left: 436px;
- margin-bottom: 50px;
+ margin-bottom: 0;
+}
+
+#logo.auth #sponsors {
+ margin-top: 41px;
+ float: right;
+}
+
+#logo.start #sponsors {
+ margin-left: 580px;
+}
+
+#logo #sponsors p {
+ margin: 0;
+ margin-top: 6px;
+ margin-right: 7px;
+}
+
+#logo #sponsors a#mongohq {
+ display: block;
+ text-indent: -9000px;
+ background-image: url(/images/sponsors/mongohq_small.png);
+ width: 100px;
+ height: 28px;
}
#container {
@@ -237,7 +265,9 @@ a.button:hover {
padding-bottom: 20px;
}
-#intro {}
+#intro {
+ margin-bottom: 40px;
+}
#sign_in {
margin: 80px 50px;

0 comments on commit 392282f

Please sign in to comment.