Added CMUSV logo to display2

setiQuest · Jun 8, 2011 · 93b45fd · 93b45fd
1 parent 119dc12
commit 93b45fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/app/views/display1/index.html.erb b/app/views/display1/index.html.erb
@@ -37,7 +37,7 @@
   <div class="text-large"><%= image_tag "logo_seti.png" %></div>
   <div class="text-title-yellow" style="padding-left:25px; width:1000px;">Current Status: <span id="current-observation-id">?</span></div>
   <div class="text-title-yellow">Activity ID: <span id="activity-id">?</span></div>
-  <div class="logo-cmusv"><%= image_tag "logo_cmusv.jpg", :width => "300px", :style => "float:right;" %></div>
+  <div class="logo-cmusv"><%= image_tag "logo_cmusv.jpg", :width => "300px" %></div>
   <div class="float-wall"></div>
 </div>
 

diff --git a/app/views/display2/index.html.erb b/app/views/display2/index.html.erb
@@ -18,6 +18,8 @@
     <iframe id="contextual-info" src="/display1/activity_contextual_info"></iframe>
   </div>
 
+  <div class="logo-cmusv-display2"><%= image_tag "logo_cmusv.jpg", :width => "300px" %></div>
+
   <div id="weatherForecast">
     <div style='width: 728px; height: 90px; background-image: url( http://vortex.accuweather.com/adcbin/netweather_v2/backgrounds/black_728x90_bg.jpg ); background-repeat: no-repeat; background-color: #000000;' ><div id='NetweatherContainer' style='height: 74px;' ><script src='http://netweather.accuweather.com/adcbin/netweather_v2/netweatherV2ex.asp?partner=netweather&tStyle=whteYell&logo=1&zipcode=96040&lang=eng&size=11&theme=black&metric=0&target=_self'></script></div><div style='text-align: center; font-family: arial, helvetica, verdana, sans-serif; font-size: 11px; line-height: 16px; color: #FFFFFF;' ><div style='float: left; padding-left: 10px;'><a style='color: #FFFFFF' href='http://www.accuweather.com/us/CA/HAT CREEK/96040/city-weather-forecast.asp?partner=accuweather&traveler=0' >Weather Forecast</a> | <a style='color: #FFFFFF' href='http://www.accuweather.com/maps-satellite.asp' >Weather Maps</a> | <a style='color: #FFFFFF' href='http://www.accuweather.com/index-radar.asp?partner=accuweather&traveler=0&zipcode=96040' >Weather Radar</a> | <a style='color: #FFFFFF' href='http://hurricane.accuweather.com/hurricane/index.asp' >Hurricane Center</a></div><img style='float: right; padding-right: 5px;' src='http://vortex.accuweather.com/adc2004/common/images/misc/netweather_v2/adcwhite.png' /></div></div>
   </div>

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
@@ -314,4 +314,10 @@ img:-moz-broken, img:-moz-user-disabled {
 .logo-cmusv {
     float: right;
     margin-left: 150px;
+}
+
+.logo-cmusv-display2 {
+    position: absolute;
+    left: 1600px;
+    top: 25px;
 }