Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

move current experimental work to master

  • Loading branch information...
commit f3f646b56d1161c98effdd544baa8989a8ff154e 1 parent a8d08e4
@StommePoes authored
View
BIN  root/static/images/fduck.v101.green.png
Deleted file not rendered
View
46 templates/base.tt
@@ -1,33 +1,17 @@
<!DOCTYPE html>
-<html lang="<@ language.locale @>">
- <@ INCLUDE head.tt @>
- <body>
- <div id="wrapper">
- <div id="header">
-
- <@ INCLUDE header.tt @>
-
- </div>
- <@ IF headline_template @>
- <div id="headline">
-
- <@ INCLUDE headline.tt @>
-
- </div>
- <@ END @>
- <div id="content">
- <article>
-
- <@ INCLUDE $LAYOUTS.shift @>
-
- </article>
- </div>
- <div id="footer">
-
- <@ INCLUDE footer.tt @>
-
- </div>
- </div>
- </body>
+<html lang="<@ language @>">
+<@ PROCESS head.tt @>
+ <body>
+ <@ INCLUDE header.tt @>
+ <div class="main" role="main">
+ <@ IF headline_template @>
+ <@ INCLUDE headline.tt @>
+ <@ END @>
+ <@ PROCESS $LAYOUTS.shift @>
+ </div>
+ <div id="footer" role="contentinfo">
+ <@ INCLUDE footer.tt @>
+ </div>
+ </body>
+ <!-- <@ version @> -->
</html>
-<!-- <@ version @> -->
View
64 templates/base/welcome.tt
@@ -1,30 +1,34 @@
-<div class="mybox legacybox">
- <@ IF c.user @>
- <a href="<@ u('My','account') @>">Get more information about your account</a>
- <@ ELSE @>
- Please use <a href="http://ddg.gg/">http://ddg.gg/</a> your short URL!&nbsp; It's shorter :)
- <@ END @>
-</div>
-<div class="welcome_cols" id="welcome_right">
- <div class="welcome_headline">Test DuckDuckGo Goodies</div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=64*343">64*343</a></div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=%243.43%2B%2434.45">$3.43+$34.45</a></div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=birth+date+of+bono">birth date of bono</a></div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=age+of+joan+rivers">age of joan rivers</a></div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=msft+vs+aapl+5yr">msft vs aapl 5yr</a></div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/?q=throw+5+dice">throw 5 dice</a></div>
- <div class="welcome_headline">DuckDuckGo Social</div>
- <div class="welcome_entry"><a href="http://duck.co/">DuckDuckGo Forum</a></div>
- <div class="welcome_entry"><a href="http://twitter.com/duckduckgo/team/members">The team behind DuckDuckGo</a></div>
- <div class="welcome_entry"><a href="http://twitter.com/duckduckgo">DuckDuckGo on Twitter</a></div>
- <div class="welcome_entry"><a href="http://facebook.com/duckduckgo">DuckDuckGo on Facebook</a></div>
- <div class="welcome_entry"><a href="http://webchat.freenode.net/?channels=duckduckgo">DuckDuckGo IRC Channel</a></div>
-</div>
-<div class="welcome_cols" id="welcome_left">
- <div class="welcome_headline">Welcome to our community project</div>
- <div class="welcome_entry"><a href="https://duckduckgo.com/">DuckDuckGo</a> is a general purpose search engine like Google or Bing. If you want to know more about DuckDuckGo, checkout our <a href="https://duckduckgo.com/about.html">About page</a></div>
- <div class="welcome_entry">Our search engine is very very user driven and we like to integrate and get in dialog with our community on all possible levels. We react fast on chat, email or forum. We want to finalize this touch with opening a community platform for all users, which is not only used by our users, but also developed by the community. Everybody can contribute, the community decides where we go.</div>
- <div class="welcome_entry">One thing the community always requested was options for helping us, spread the word about DuckDuckGo and helping us to extend the options DuckDuckGo offers. We have a bunch of open source projects on our <a href="">Github organization page</a>, where you can give pull request or can get added as contributor. This is the first reason for this platform, we want the community to help us translate DuckDuckGo into all possible (and impossible ;) ) languages.</div>
- <div class="welcome_headline">Translate DuckDuckGo!</div>
- <div class="welcome_entry">If you want to help to translate, you must <a href="<@ u('my','register') @>">register</a> or <a href="<@ u('my','login') @>">login</a> with your existing XMPP dukgo.com account to this platform, and then add the languages you can speak. Then you can go through the sets of so called "tokens", small text snippets, which we need to translate. We explain this procedure more clear after you registered or logged in.</div>
-</div>
+<@ IF c.user @>
+ <p class="infobox"><a href="<@ u('My','account') @>">Get more information about your account</a></p>
+<@ ELSE @>
+ <p class="infobox">Tip: Use the short URL <a href="http://ddg.gg/">ddg.gg</a> for less typing.</p>
+<@ END @>
+ <div class="aboutddg">
+ <h2>Welcome to our community project</h2>
+ <p><a href="https://duckduckgo.com/">DuckDuckGo</a> is a general purpose search engine like Google or Bing. If you want to know more about DuckDuckGo, checkout our <a href="https://duckduckgo.com/about.html">About page</a>.</p>
+ <p>Our search engine is very very user driven and we like to integrate and get in dialog with our community on all possible levels. We react fast on chat, email or forum. We want to finalize this touch with opening a community platform for all users, which is not only used by our users, but also developed by the community. Everybody can contribute, the community decides where we go.</p>
+ <p>One thing the community always requested was options for helping us, spread the word about DuckDuckGo and helping us to extend the options DuckDuckGo offers. We have a bunch of open source projects on our <a href="http://github.com/duckduckgo/community-platform">Github organization page</a>, where you can give pull request or can get added as contributor. This is the first reason for this platform, we want the community to help us translate DuckDuckGo into all possible (and impossible ;) ) languages.</p>
+ <h2>Translate DuckDuckGo!</h2>
+ <p>If you want to help to translate, you must <a href="<@ u('my','register') @>">register</a> or <a href="<@ u('my','login') @>">login</a> with your existing XMPP dukgo.com account to this platform, and then add the languages you can speak. Then you can go through the sets of so called "tokens", small text snippets, which we need to translate. We explain this procedure more clear after you registered or logged in.</p>
+ </div>
+
+ <div class="aboutddg">
+ <h2>Test DuckDuckGo Goodies</h2>
+ <ul>
+ <li><a href="https://duckduckgo.com/?q=64*343">64*343</a></li>
+ <li><a href="https://duckduckgo.com/?q=%243.43%2B%2434.45">$3.43+$34.45</a></li>
+ <li><a href="https://duckduckgo.com/?q=birth+date+of+bono">birth date of bono</a></li>
+ <li><a href="https://duckduckgo.com/?q=age+of+joan+rivers">age of joan rivers</a></li>
+ <li><a href="https://duckduckgo.com/?q=msft+vs+aapl+5yr">msft vs aapl 5yr</a></li>
+ <li><a href="https://duckduckgo.com/?q=throw+5+dice">throw 5 dice</a></li>
+ </ul>
+ <h2>DuckDuckGo Social</h2>
+ <ul>
+ <li><a href="http://duck.co/">DuckDuckGo Forum</a></li>
+ <li><a href="http://twitter.com/duckduckgo/team/members">The team behind DuckDuckGo</a></li>
+ <li><a href="http://twitter.com/duckduckgo">DuckDuckGo on Twitter</a></li>
+ <li><a href="http://facebook.com/duckduckgo">DuckDuckGo on Facebook</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=duckduckgo">DuckDuckGo IRC Channel</a></li>
+ </ul>
+ </div>
+
View
24 templates/footer.tt
@@ -1,12 +1,12 @@
-<footer>
- <div id="footer_content">
- <a href="<@ u('Base','welcome') @>">Welcome</a> |
- <a href="<@ u('Base','about') @>">About</a> |
- <a href="<@ u('Base','privacy') @>">Privacy</a> |
- <a href="<@ u('Base','termsofuse') @>">Terms Of Use</a> |
- Powered by <a href="http://www.perl.org/">Perl</a> |
- Delivered by <a href="http://nginx.org/">nginx</a> |
- Source at <a href="https://github.com/duckduckgo/community-platform">github</a> |
- &copy; 2011 <a href="http://duckduckgo.com" title="DuckDuckGo Search Engine">DuckDuckGo, Inc.</a>
- </div>
-</footer>
+ <ul role="navigation">
+ <li><a href="<@ u('Base','welcome') @>">Welcome</a></li>
+ <li><a href="<@ u('Base','about') @>">About</a></li>
+ <li><a href="<@ u('Base','privacy') @>">Privacy</a></li>
+ <li><a href="<@ u('Base','termsofuse') @>">Terms Of Use</a></li>
+ </ul>
+ <ul>
+ <li>Powered by <a href="http://www.perl.org/">Perl</a></li>
+ <li>Delivered by <a href="http://nginx.org/">nginx</a></li>
+ <li>Source at <a href="https://github.com/duckduckgo/community-platform">github</a></li>
+ <li>&#169; 2011 <a href="http://duckduckgo.com">DuckDuckGo, Inc.</a></li>
+ </ul>
View
39 templates/head.tt
@@ -1,14 +1,27 @@
<head>
- <title><@ prefix_title @> <@ IF title @>- <@ title @><@ END @></title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <@ FOREACH meta IN metas.pairs @>
- <meta name="<@ meta.key @>" content="<@ meta.value @>" />
- <@ END @>
- <link rel="stylesheet" type="text/css" href="/static/css/reset.css" />
- <link rel="stylesheet" type="text/css" href="/static/css/ddgc.css" />
- <script type="text/javascript" src="/static/js/jquery.js"></script>
- <script type="text/javascript" src="/static/js/jquery-ui.js"></script>
- <script type="text/javascript" src="/static/js/console.js"></script>
- <script type="text/javascript" src="/static/js/helper.js"></script>
- <script type="text/javascript" src="/static/js/ddgc.js"></script>
-</head>
+ <meta charset="UTF-8">
+ <title><@ prefix_title @> <@ IF title @>- <@ title @><@ END @></title>
+ <@ FOREACH meta IN metas.pairs @>
+ <meta name="<@ meta.key @>" content="<@ meta.value @>">
+ <@ END @>
+ <meta name="viewport" content="width=device-width; initial-scale=1.0;">
+ <link rel="stylesheet" media="screen, projection, handheld" href="/static/css/mobilefirst.css">
+ <link rel="stylesheet" media="screen and (min-width:600px), projection and (min-width:600px)" href="/static/css/desktop.css" title="large screen layout">
+ <!--leaving these scripts in til I decide what to do with them-->
+ <script type="text/javascript" src="/static/js/jquery.js"></script>
+ <script type="text/javascript" src="/static/js/jquery-ui.js"></script>
+ <script type="text/javascript" src="/static/js/console.js"></script>
+ <script type="text/javascript" src="/static/js/helper.js"></script>
+ <script type="text/javascript" src="/static/js/ddgc.js"></script>
+ <!--[if lt IE 9]>
+ <link rel="stylesheet" media="screen" href="/static/css/desktop.css">
+ <script>
+ var structure = document.styleSheets[document.styleSheets.length-1];
+ function doQuery() {
+ structure.disabled = document.documentElement.offsetWidth < 600;
+ }
+ window.attachEvent('onresize', doQuery);
+ doQuery();
+ </script>
+ <![endif]-->
+</head>
View
14 templates/header.tt
@@ -1,9 +1,5 @@
-<header>
-
- <a href="<@ u('Root','index') @>"><img id="logo" alt="DuckDuckGo Community Platform" src="/static/images/fduck.v101.green.png"/></a>
-
- <iframe src="http://duckduckgo.com/search.html?bgcolor=DBECF8" style="overflow:hidden;margin:0;padding:0;width:398px;height:38px;position:absolute;z-index:10;margin-left:-199px;left:50%;margin-top:-7px;" frameborder="0"></iframe>
-
- <@ INCLUDE userbox.tt @>
-
-</header>
+<div class="header">
+ <p id="logo"><a href="<@ u('Root','index') @>">DuckDuckGo Community Platform<span></span></a></p>
+ <p id="access"><a href="#skip">skip to content</a></p>
+ <@ INCLUDE userbox.tt @>
+</div>
View
4 templates/headline.tt
@@ -1,3 +1 @@
-<div id="headline_content">
- <@ INCLUDE $headline_template @>
-</div>
+<@ INCLUDE $headline_template @>
View
44 templates/userbox.tt
@@ -1,23 +1,25 @@
<@ IF !no_userbox @>
- <div id="userbox" class="fancymenu">
- <div id="userbox_headline" class="fancymenu_headline">
- <@ IF c.user @>
- <a href="<@ u('My','account') @>"><@ l('Welcome %s!',c.user.username) @></a>
- <@ ELSE @>
- <a href="<@ u('My','account') @>">Login</a> or <a href="<@ u('My','register') @>">register</a>
- <@ END @>
- </div>
- <div id="userbox_content" class="fancymenu_content">
- <@ IF c.user @>
- <p><a href="<@ u('My','account') @>"><@ l('Your account') @></a></p>
- <@ IF c.user.admin @>
- <p><a href="<@ u('My','apps') @>"><@ l('Your applications') @></a></p>
- <p><a href="<@ u('Admin','index') @>"><@ l('Admin interface') @></a></p>
- <@ END @>
- <p><a href="<@ u('My','logout') @>"><@ l('Logout') @></a></p>
- <@ ELSE @>
- <@ INCLUDE my/loginform.tt @>
- <@ END @>
- </div>
- </div>
+ <div id="logreg"<@ IF c.user @> class="user"<@ END @>>
+ <@ IF c.user @>
+ <ul>
+ <li><a href="<@ u('my','account') @>"><img src="/static/images/profile.png" width="50" height="50" alt="profile image"> <@ l('welcome %s!',c.user.username) @></a>
+ <@ ELSE @>
+ <p><a href="<@ u('my','account') @>">login</a> or <a href="<@ u('my','register') @>">register</a></p>
+ <@ END @>
+
+ <@ IF c.user @>
+ <ul>
+ <li><a href="<@ u('My','account') @>"><@ l('Your account') @></a></li>
+ <@ IF c.user.admin @>
+ <li><a href="<@ u('My','apps') @>"><@ l('Your applications') @></a></li>
+ <li><a href="<@ u('Admin','index') @>"><@ l('Admin interface') @></a></li>
+ <@ END @>
+ <li><a href="<@ u('My','logout') @>"><@ l('Logout') @></a></li>
+ </ul>
+ </li>
+ </ul>
+ <@ ELSE @>
+ <@ INCLUDE my/loginform.tt @>
+ <@ END @>
+ </div>
<@ END @>
Please sign in to comment.
Something went wrong with that request. Please try again.