Merge branch 'master' of github.com:DartmouthHackerClub/ddstown

DartmouthHackerClub · Feb 10, 2012 · 48941a0 · 48941a0
2 parents e47bc45 + dba5704
commit 48941a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
@@ -1,6 +1,10 @@
 <div class="row">
   <div class="span12">
-    <h1 style="text-align: center;">DDS stats, winter 2012</h1>
+    <img src="../../assets/images/pickr_logo.png" style="float:right;padding-right:25px;"/>
+    <h1 style="text-align: center;">Hi Name!</h1>
+    <h2>You've used 3 of 5 meal swipes for this week and $381 of $875
+    DBA for this term. </h2>
+    <h2>Check out your DDS analysis below.</h2>
   </div>
 </div>
 

diff --git a/rails/app/assets/images/pickr_logo.png b/rails/app/assets/images/pickr_logo.png