Permalink
Browse files

Merge branch 'master' of github.com:duckduckgo/duckduckgo-publisher

  • Loading branch information...
2 parents 377a249 + e7db19c commit 0a848f8f297f3a81edcd5bd71f14c9eb36fbad13 @Getty Getty committed Dec 31, 2012
Showing with 1 addition and 32 deletions.
  1. +0 −5 share/site/duckduckgo/about.tx
  2. +0 −26 share/site/duckduckgo/footer.tx
  3. +1 −1 share/site/duckduckgo/meta/about.tx
@@ -1,8 +1,3 @@
-<script src="/js/jquery/jquery-1.7.2.min.js"></script>
-<script src="/js/mediaelement/mediaelement-and-player.min.2.9.1.js"></script>
-<link rel="stylesheet" href="mediaelementplayer.css" />
-<style> .video-container, .video-container video { max-height: 368px; } </style>
-
<div class="video-container">
<video width="640" height="360" id="about-video" poster="/assets/about/about-duckduckgo-posterimg.jpg" controls="controls" style="width: 100%; height: 100%;" preload="none">
@@ -1,28 +1,2 @@
<!-- footer //-->
-<div id="footer_homepage" class="k_bottom k_float">
- <div id="footer_homepage_left">
- <: lp('wedonttrackyou',"We don't %s you.",r('<a href="http://donttrack.us/">') ~ lp('wedonttrackyou','track') ~ r('</a>') ):>
- </div>
- <div id="footer_homepage_right">
- <script type="text/javascript">
- nib(0,'','','',0,0);
- nib(0,'','&nbsp;&nbsp;','',0,1);
- {
- var err=new RegExp('[\?\&]e=([^\&]+)');
- var errm=new Array();
- errm['2']='<: js(l('no search')) :>';
- errm['3']='<: js(l('search too long')) :>';
- errm['4']='<: js(l('not %s encoding',r('UTF-8'))) :>';
- if (err.test(window.location.href)) {
- var error=document.getElementById('error');
- error.innerHTML='Oops, '+(errm[RegExp.$1]?errm[RegExp.$1]:'<: js(l('there was an error.')) :>')+' &nbsp;<: js(l('Please try again')) :>';
- YAHOO.util.Dom.setStyle(error,'display','block');
- }
- };
- if (ip) setTimeout('nuo(1)',250);
- nip(3)
- </script>
- </div>
-</div>
-
<script type="text/javascript">nip(3)</script>
@@ -23,7 +23,7 @@
<meta name="twitter:player:height" value="544">
<!-- template b -->
-<link rel="stylesheet" href="/s478.css" type="text/css"><link title="DuckDuckGo" type="application/opensearchdescription+xml" rel="search" href="/opensearch_ssl.xml"><link rel="image_src" href="/assets/about/about-duckduckgo-posterimg.jpg"/>
+<link title="DuckDuckGo" type="application/opensearchdescription+xml" rel="search" href="/opensearch_ssl.xml"><link rel="image_src" href="/assets/about/about-duckduckgo-posterimg.jpg"/>
<script src="js/jquery/jquery-1.7.2.min.js"></script>
<script src="js/mediaelement/mediaelement-and-player.min.2.9.1.js"></script>
<link rel="stylesheet" href="mediaelementplayer.css" />

0 comments on commit 0a848f8

Please sign in to comment.