Commits

Anonymous committed 1aadadf Merge

Merge

Comments (0)

Files changed (6)

ratemyflight/project_template/site_media/css/style.css

 html, body { height: 100%; }
 body { width: 100%; background: #e4fafe url("../img/bg.jpg") repeat-x 0 0; font-family: helvetica, arial, sans serif; font-size: 12px; position: relative; }
-
 #wrapper { width: 100%; min-height: 100%; margin: 0 auto -99px; background: url("../img/foot-cityscape.gif") repeat-x center bottom; }
 #foot, .push { height: 99px; clear: both; }
-#container { width: 960px; margin: 120px auto 0; background: #fff; 
-    -moz-box-shadow: 0px 0px 30px #999; 
-    -webkit-box-shadow: 0px 0px 30px #999; }
+#container { width: 960px; margin: 120px auto 0; background: #fff; -moz-box-shadow: 0px 0px 30px #999; -webkit-box-shadow: 0px 0px 30px #999; }
 #header { margin: 0 auto; height: 80px; position: relative; }
 #header h1.logo { position: absolute; top: -87px; left: 341px; display: block; width: 267px; height: 153px; margin: 0 auto; background: url("../img/ratemyflight.png") no-repeat 0 0; text-indent: -9999px; }
-
-#message { position: absolute; z-index: 30; width: 400px; top: -110px; 
-    right: 30px; background: #FFFCC3; text-align: left; 
-    -moz-box-shadow: 0px 0px 20px #999; 
-    -webkit-box-shadow: 0px 0px 20px #999; 
-    padding: 15px; margin-bottom: 20px; border: 1px solid #999;
-    font-size: 14px;}
-
-#message .close {float:right; text-decoration:none; font-size:18px; 
-    font-weight:bold; color:#000;}
-
-#message code {font-weight:bold;}
-
-#message h2 { margin: 0; font-size: 22px; margin-bottom: 10px; color: #000;  }
+#message { position: absolute; z-index: 30; width: 400px; top: -110px; right: 30px; background: #FFFCC3; text-align: left; -moz-box-shadow: 0px 0px 20px #999; -webkit-box-shadow: 0px 0px 20px #999; padding: 15px; margin-bottom: 20px; border: 1px solid #999; font-size: 14px; }
+#message .close { float:right; text-decoration:none; font-size:18px; font-weight:bold; color:#000; }
+#message code { font-weight:bold; }
+#message h2 { margin: 0; font-size: 22px; margin-bottom: 10px; color: #000; }
 #message p { line-height: 19px; margin-bottom: 6px; }
-#map_holder { position: relative; margin: 0 auto 20px; text-align: center;  border: 1px solid #231f20; background: #fff; }
+#map_holder { position: relative; margin: 0 auto 20px; text-align: center; border: 1px solid #231f20; background: #fff; }
 #map_canvas { height: 500px; }
 #map_data { width: 950px; padding: 4px; height: 20px; position: absolute; z-index: 3; top: 0; background: rgba(64, 64, 64, 0.5); text-align: right; color: #fff; }
-
-#map_holder .close {float:right; text-decoration:none; font-size:18px; 
-    font-weight:bold; color:#fff;}
-
-#form_rater { width: 350px; background: rgba(21, 21, 21, 0.95); 
-    position: absolute; z-index: 100; top: 20px; left: -100px; 
-    -moz-border-radius: 10px; border-radius: 10px;
-     border: 2px solid #fff; padding: 10px 20px; }
+#map_holder .close { float:right; text-decoration:none; font-size:18px; font-weight:bold; color:#fff; }
+#form_rater { width: 350px; background: rgba(21, 21, 21, 0.95); position: absolute; z-index: 100; top: 20px; left: -100px; -moz-border-radius: 10px; border-radius: 10px; border: 2px solid #fff; padding: 10px 20px; }
 #form_rater h2 { height: 30px; color: #fff; font-size: 21px; text-align: left; }
-
 div.content a { text-decoration: none; color: #00bed4}
 div.content a:hover { text-decoration: underline;}
 div.content a:visited {color: #c73e3d;}
 
-#footer { margin: 10px auto; text-align: center; }
+#footer { margin: 10px auto; text-align: center; font-size: 14px; color: #23536e;  }
 #footer > p { font-size: 18px; color: #231f20; }
 .cl { clear: both; }
 form.rate li { list-style: none; }
 form.rate th { text-align: right; vertical-align: top; }
 form.rate th, form.rate td { padding: 5px; color: #fff; }
 form.rate td { font-size: 10px; text-align: left; }
-form.rate input, form.rate select, form.rate textarea { width: 120px; height: 10px; padding: 5px; border: 2px solid #65cce7; -moz-border-radius: 5px; border-radius: 5px;  }
+form.rate input, form.rate select, form.rate textarea { width: 120px; height: 10px; padding: 5px; border: 2px solid #65cce7; -moz-border-radius: 5px; border-radius: 5px; }
 form.rate select { height: 25px; width: 135px; }
 form.rate textarea { height: 60px; }
 form.rate input[type="submit"] { height: 40px; margin: 10px 0 0 25px; font-size: 18px; color:#fff; background: #212121; cursor: pointer; }
 form.rate input[type="submit"]:hover { background: #65cce7; color: #212121; }
+div.flight-info { width: 190px; background: #fff; border: 1px solid #000; margin-left: 20px; height: 70px; -webkit-box-shadow: 4px 4px 4px #555; -moz-box-shadow: 4px 4px 4px #555; }
+div.flight-info div.avatar { float: left; width: 48px; padding-left: 2px; padding-top: 2px; }
+div.flight-info div.flight { width: 136px; float: right; background: #fff; text-align: left; padding: 2px; }
+#rankings { }
+#rankings h3 { font-size: 17px; color: #23536e; }
+#rankings ul { width:298px; float:left; list-style-type:none; margin:0 0 10px 20px; padding-bottom: 20px; border-right:1px solid #a7bac5; }
+#rankings .last { border-right-width:0px; }
+#rankings .topflyer-avatar { width: 25px; vertical-align: middle; margin-right: 7px; }
+#rankings li { font-size:16px; margin-top:5px; font-size: 12px; color: #0d84a9; }
+#rankings li:first-child { margin-bottom: 15px; }
+#rankings .ranking-icon { float: left; margin-right: 7px; }
+div.flight-info div.rating { background: url(/site_media/img/stars_g.png) no-repeat; text-align: left; }
+div.flight-info div.rating div { overflow: hidden; height: 17px; }
 
-
-div.flight-info {
-    width: 190px;
-    background: #fff;
-    border: 1px solid #666;
-    margin-left: 20px;
-    height: 70px;
-    -webkit-box-shadow: 0px 0px 10px #555;
-    -moz-box-shadow: 0px 0px 10px #555;
+#nav {width:200px; margin:0 auto 10px auto; white-space:nowrap;}
+#nav li {display:inline; margin:0 10px;}
+#nav a {font-size:16px;}
+.content {padding:50px; font-size:18px; line-height:24px;}
+.content h1, .content h2, .content p, .content pre {margin-bottom:20px;}
+.content pre {background:#eee; padding:20px;}
+.content h1 {font-size:30px;}
+.content h2 {font-size:20px;}
+.content ul {margin-left:50px;}
 }
 
 div.flight-info div.avatar {
     overflow: hidden;
     height: 17px;
 }
-.flight-info h4 {color:#555;}
-.flight-info .codes {font-weight:bold;}
-
+.flight-info h4 {color:#555;}
+.flight-info .codes {font-weight:bold;}
+
+
Add a comment to this file

ratemyflight/project_template/site_media/img/icon-plane.gif

Added
New image
Add a comment to this file

ratemyflight/project_template/site_media/img/icon-star.gif

Added
New image
Add a comment to this file

ratemyflight/project_template/site_media/img/icon-thumbup.gif

Added
New image

ratemyflight/project_template/templates/base.html

 	<link rel="stylesheet" href="{{ MEDIA_URL }}css/style.css" >
 
     {% block extra_head %}{% endblock %}
-    {% include "includes/ga_code.html" %}
-    
-    <style>
-        #nav {width:200px; margin:0 auto 10px auto; white-space:nowrap;}
-        #nav li {display:inline; margin:0 10px;}
-        #nav a {font-size:16px;}
-        .content {padding:50px; font-size:18px; line-height:24px;}
-        .content h1, .content h2, .content p, .content pre {margin-bottom:20px;}
-        .content pre {background:#eee; padding:20px;}
-        .content h1 {font-size:30px;}
-        .content h2 {font-size:20px;}
-        .content ul {margin-left:50px;}
-    </style>
-
+    {% include "includes/ga_code.html" %}
 </head>
 <body>
 	<div id="wrapper">
-		<div id="message">
-		    <a class="close" href="#" onclick="$(this).parent().hide(); return false;">X</a>
+		<div id="message">
+		    <a class="close" href="#" onClick="$(this).parent().hide(); return false;">X</a>
 			<h2>We need your flight data!</h2>
-			<p>
-			    Send a tweet with the hashtag <strong>#ratemyflight</strong> and give your 
-			    flight a score out of 10. For example if you flew British 
-			    Airways <strong>(BA)</strong> flight <strong>227</strong> from 
-			    Sydney <strong>(SYD)</strong> to Los Angeles <strong>(LAX)</strong> 
-			    and gave it a rating of <strong>8</strong> you'd tweet:
-			 </p>
-            <code>
-                BA227 SYD LAX 8/10 I really enjoyed this flight! #ratemyflight
-            </code>
+			<p>
+			    Send a tweet with the hashtag <strong>#ratemyflight</strong> and give your 
+			    flight a score out of 10. For example if you flew British 
+			    Airways <strong>(BA)</strong> flight <strong>227</strong> from 
+			    Sydney <strong>(SYD)</strong> to Los Angeles <strong>(LAX)</strong> 
+			    and gave it a rating of <strong>8</strong> you'd tweet:
+			 </p>
+            <code>
+                BA227 SYD LAX 8/10 I really enjoyed this flight! #ratemyflight
+            </code>
 		</div>
 		<div id="container">
 			<div id="header">
-				<h1 class="logo">Rate My Flight</h1>
-			</div>
-			
-			<ul id="nav">
-			    <li><a href="{% url home %}">Home</a></li>
-			    <li><a href="{% url about %}">About</a></li>
-			    <li><a href="{% url api %}">API</a></li>
+				<h1 class="logo">Rate My Flight</h1>
+			</div>
+			
+			<ul id="nav">
+			    <li><a href="{% url home %}">Home</a></li>
+			    <li><a href="{% url about %}">About</a></li>
+			    <li><a href="{% url api %}">API</a></li>
 			</ul>
 	
 			{% block main %}{% endblock %}

ratemyflight/project_template/templates/index.html

 		<h2>Rate a flight</h2>
 		<form method="post" class="rate">
 			<table>{{ form.as_table }}</table>
-			<input type="submit" value="Rate!" />
+			<input type="submit" value="Rate it" />
 		</form>
 	</div>
 </div>
 
 <div id="rankings">
 <ul>
-    <li><h3>Top Airlines</h3></li>
+    <li><img src="{{ MEDIA_URL }}img/icon-plane.gif" alt="" class="ranking-icon" /><h3>Top Airlines</h3></li>
     {% for airline in top_airlines %}
-    <li>{{ airline.name }} [Rating: {{ airline.rating }}]</li>
+    <li>{{forloop.counter}}. {{ airline.name }} [Rating: {{ airline.rating }}]</li>
     {% endfor %}
 </ul>
 <ul>
-    <li><h3>Top Destinations</h3></li>
+    <li><img src="{{ MEDIA_URL }}img/icon-star.gif" alt="" class="ranking-icon" /><h3>Top Destinations</h3></li>
     {% for airport in top_destinations %}
-    <li>{{ airport.name }} [Rating: {{ airport.rating }}]</li>
+    <li>{{forloop.counter}}. {{ airport.name }} [Rating: {{ airport.rating }}]</li>
     {% endfor %}
 </ul>
 <ul class="last">
-    <li><h3>Top Fliers</h3></li>
+    <li><img src="{{ MEDIA_URL }}img/icon-thumbup.gif" alt="" class="ranking-icon" /><h3>Top Fliers</h3></li>
     {% for flyer in top_flyers %}
-    <li><img src="{{ flyer.avatar_url|default:"/site_media/img/default_avatar.png" }}">{{ flyer.name }} [Flights: {{ flyer.flights }}]</li>
+    <li><img src="{{ flyer.avatar_url|default:"/site_media/img/default_avatar.png" }}" class="topflyer-avatar" />{{ flyer.name }} [Flights: {{ flyer.flights }}]</li>
     {% endfor %}
 </ul>
 <br clear="all" />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.