Merge branch 'master' into production

mozilla · Oct 19, 2010 · 266c03e · 266c03e
2 parents 0d3fc46 + 57d0e6b
commit 266c03e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/docs/demoApps.html b/docs/demoApps.html
@@ -25,7 +25,6 @@ <h1 id="logo"><a href="http://mozillalabs.com" title="Mozilla Labs homepage"><im
 			<li><a href="http://mozillalabs.com/discussions/">Discussions</a></li>
 			<li><a href="http://mozillalabs.com/get-involved/">Get Involved</a></li>
 			<li><a href="http://mozillalabs.com/about/">About</a></li>
-
 			</ul>
 
 			<form id="search" action="http://mozillalabs.com/">
@@ -67,6 +66,19 @@ <h1>Mozilla Labs Apps</h1>
             <a href="tech_intro.html">Technical Documentation</a>: Full documentation on the proposed architecture of Open Web Apps. 
             </div>
 
+            <div>
+            <a href="http://github.com/mozilla/openwebapps">Source Code</a>: The implementation is available on github.
+            </div>
+            </p>
+            <br>
+            <p>
+              To further explain our proposal, we put together this screencast which introduces
+              Open Web Apps:
+            </p>
+<p style="text-align: center;">
+<object width="640" height="385"><param name="movie" value="http://www.youtube.com/v/iBFVrmyald4?fs=1&amp;hl=en_US&amp;rel=0&amp;hd=1&amp;color1=0x3a3a3a&amp;color2=0x999999"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/iBFVrmyald4?fs=1&amp;hl=en_US&amp;rel=0&amp;hd=1&amp;color1=0x3a3a3a&amp;color2=0x999999" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="640" height="385"></embed></object>
+</p>
+
 				</div> <!-- END projectintro -->
 			</div> <!-- END SPOTLIGHT -->
 		</div> <!-- END HEADER -->

diff --git a/site/dashboard.css b/site/dashboard.css
@@ -529,6 +529,10 @@ src: url('fonts/MuseoSans_500.otf') format('opentype');
 
 }
 
+#footer a {
+    color: #888;
+}
+
 .mozLogo {
 	margin-bottom: -10px;
 	margin-right: 6px;

diff --git a/site/index.html b/site/index.html
@@ -22,7 +22,7 @@
       <div class="appList" id="appList">
       </div>
     </div>
-    <div id="footer">a Mozilla Labs project</div>
+    <div id="footer">a Mozilla Labs project - <a href="http://www.mozilla.com/en-US/privacy-policy.html">Privacy Policy</a> and <a href="http://www.mozilla.com/en-US/about/legal.html">Legal Notices</a> </div>
   </div>
 </div>
 <div id="unsupportedBrowser">

diff --git a/store/src/index.html b/store/src/index.html
@@ -57,7 +57,7 @@
 
 
 </div>
-<div id="footer">A Mozilla Labs experiment - <a href="/privacy">Privacy Policy</a></div>
+<div id="footer">A Mozilla Labs experiment - <a href="http://www.mozilla.com/en-US/privacy-policy.html">Privacy Policy</a> and <a href="http://www.mozilla.com/en-US/about/legal.html">Legal Notices</a></div>
 
 </body>
 </html>