Permalink
Browse files

so close!

  • Loading branch information...
1 parent ffb29f6 commit 5228a0d1075bc937a8cf6e08c68d2f5a93057b26 @danielgrippi danielgrippi committed May 31, 2010
View
@@ -1 +1 @@
-<object class="us_image" height=25%><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=11099292&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=11099292&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="100%"></embed></object>
+<object class="us_image" width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=11099292&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=11099292&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object><div id="video_descrip">We take a little time to discuss our reasoning behind Diaspora.</div>
View
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
<head>
+ <meta name="viewport" content="width=device-width" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>{{ page.title }}</title>
<meta name="author" content="diaspora" />
@@ -13,53 +14,46 @@
<body>
<div id="header" class="main_nav">
<h1 class="title"><a href ="/">DIASPORA</a></h1>
+ </div>
+ <div id="floating_nav">
<ul id="nav">
<li><a href="/index.html">home</a></li>
<li><a href="/project.html">project</a></li>
<li><a href="/people.html">people</a></li>
<li><a href="/faq.html">faq</a></li>
<li><a href="/blog.html">blog</a></li>
<li><a href="/media.html">media</a></li>
-
</ul>
</div>
- {{ content }}
+ <div class="container">
+ {{ content }}
+ </div>
<div id="footer">
- <div class="span-20">
- <div class="span-6 append-1 last">
- <h1>team diaspora</h1>
- <ul>
- <li>Daniel Grippi</li>
- <li>Maxwell Salzberg</li>
- <li>Raphael Sofaer</li>
- <li>Ilya Zhitomirskiy</li>
- </ul>
- </div>
-
- <div class="span-6 append-1 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
- <div class="span-6 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
+ <div id="footer_left">
+ <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type"><span class="brand">DIASPORA</span>Daniel Grippi | Maxwell Salzberg | Raphael Sofaer | Ilya Zhitromirskiy</span><br/><br/><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a>
</div>
-
-
-
- <div id="cc_info">
- <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a><br /><span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type">Diaspora Website</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.joindiaspora.com" property="cc:attributionName" rel="cc:attributionURL">Daniel Grippi, Maxwell Salzberg, Raphael Sofaer, Ilya Zhitomirskiy</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.<br />Based on a work at <a xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://www.joindiaspora.com" rel="dc:source">joindiaspora.com</a>.
+
+ <div id="footer_right">
+ <div class="span-4 append-1 last">
+ <span class="footer_statement">We're Social!</span>
+ <ul class="span-4 last" style="font-weight:bold;">
+ <li><a href="http://twitter.com/joindiaspora">Twitter</a></li>
+ <li><a href="http://identi.ca/joindiaspora">Identi.ca</a></li>
+ <li><a href="#">Facebook</a></li>
+ </ul>
+ </div>
+ <div class="span-3 last">
+ <span class="footer_statement">Contact Us</span>
+ <ul class="span-4 last">
+ <li><b>questions</b> AT joindiaspora</li>
+ <li><b>people</b> AT joindiaspora</li>
+ <li><b>press</b> AT joindiaspora</li>
+ </ul>
+ </div>
</div>
</div>
View
@@ -1,7 +1,6 @@
---
layout: default
---
-{%include alert.html%}
{{ content }}
<a href="{{post.url}}">permalink</a>
@@ -1,75 +1,63 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
<head>
+ <meta name="viewport" content="width=device-width" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>reason number x</title>
<meta name="author" content="diaspora" />
<link rel="stylesheet" href="/css/blueprint/screen.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="/css/core.css" type="text/css" media="screen, projection" />
<link href="/atom.xml" rel="alternate" type="application/rss+xml" title="diaspora feed" />
<meta name="google-site-verification" content="DGuBficaL_YHPIz5-RX8sSnOLA7fzNDLFyqpY7Q2gIk" />
- <META HTTP-EQUIV="EXPIRES" CONTENT="Thu May 27 23:40:29 -0400 2010">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sun May 30 22:27:54 -0400 2010">
</head>
<body>
<div id="header" class="main_nav">
<h1 class="title"><a href ="/">DIASPORA</a></h1>
+ </div>
+ <div id="floating_nav">
<ul id="nav">
<li><a href="/index.html">home</a></li>
<li><a href="/project.html">project</a></li>
<li><a href="/people.html">people</a></li>
<li><a href="/faq.html">faq</a></li>
<li><a href="/blog.html">blog</a></li>
<li><a href="/media.html">media</a></li>
-
</ul>
</div>
- <div id= "alert">
- Attention: We're fully funded! Check out other awesome projects on
- <a class="extra" href="http://kickstarter.com">kickstarter!</a>!
-</div>
-
-
-<h2>reason number x</h2>
+ <div class="container">
+ <h2>reason number x</h2>
<p class="meta">17 <span class="caps">APRIL</span> 2010 by maxwell</p>
<p>Every few days, we will post a few interesting links we feel somehow relates confirms why we all need diasproa now more than ever.</p>
<a href="">permalink</a>
+ </div>
<div id="footer">
- <div class="span-20">
- <div class="span-6 append-1 last">
- <h1>team diaspora</h1>
- <ul>
- <li>Daniel Grippi</li>
- <li>Maxwell Salzberg</li>
- <li>Raphael Sofaer</li>
- <li>Ilya Zhitomirskiy</li>
- </ul>
- </div>
-
- <div class="span-6 append-1 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
- <div class="span-6 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
+ <div id="footer_left">
+ <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type"><span class="brand">DIASPORA</span>Daniel Grippi | Maxwell Salzberg | Raphael Sofaer | Ilya Zhitromirskiy</span><br/><br/><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a>
</div>
-
-
-
- <div id="cc_info">
- <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a><br /><span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type">Diaspora Website</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.joindiaspora.com" property="cc:attributionName" rel="cc:attributionURL">Daniel Grippi, Maxwell Salzberg, Raphael Sofaer, Ilya Zhitomirskiy</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.<br />Based on a work at <a xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://www.joindiaspora.com" rel="dc:source">joindiaspora.com</a>.
+
+ <div id="footer_right">
+ <div class="span-4 append-1 last">
+ <span class="footer_statement">We're Social!</span>
+ <ul class="span-4 last" style="font-weight:bold;">
+ <li><a href="http://twitter.com/joindiaspora">Twitter</a></li>
+ <li><a href="http://identi.ca/joindiaspora">Identi.ca</a></li>
+ <li><a href="#">Facebook</a></li>
+ </ul>
+ </div>
+ <div class="span-3 last">
+ <span class="footer_statement">Contact Us</span>
+ <ul class="span-4 last">
+ <li><b>questions</b> AT joindiaspora</li>
+ <li><b>people</b> AT joindiaspora</li>
+ <li><b>press</b> AT joindiaspora</li>
+ </ul>
+ </div>
</div>
</div>
@@ -1,78 +1,66 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
<head>
+ <meta name="viewport" content="width=device-width" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>A Little More About The Project</title>
<meta name="author" content="diaspora" />
<link rel="stylesheet" href="/css/blueprint/screen.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="/css/core.css" type="text/css" media="screen, projection" />
<link href="/atom.xml" rel="alternate" type="application/rss+xml" title="diaspora feed" />
<meta name="google-site-verification" content="DGuBficaL_YHPIz5-RX8sSnOLA7fzNDLFyqpY7Q2gIk" />
- <META HTTP-EQUIV="EXPIRES" CONTENT="Thu May 27 23:40:29 -0400 2010">
+ <META HTTP-EQUIV="EXPIRES" CONTENT="Sun May 30 22:27:54 -0400 2010">
</head>
<body>
<div id="header" class="main_nav">
<h1 class="title"><a href ="/">DIASPORA</a></h1>
+ </div>
+ <div id="floating_nav">
<ul id="nav">
<li><a href="/index.html">home</a></li>
<li><a href="/project.html">project</a></li>
<li><a href="/people.html">people</a></li>
<li><a href="/faq.html">faq</a></li>
<li><a href="/blog.html">blog</a></li>
<li><a href="/media.html">media</a></li>
-
</ul>
</div>
- <div id= "alert">
- Attention: We're fully funded! Check out other awesome projects on
- <a class="extra" href="http://kickstarter.com">kickstarter!</a>!
-</div>
-
-
-<h2>A Little More About The Project</h2>
+ <div class="container">
+ <h2>A Little More About The Project</h2>
<p class="meta">21 <span class="caps">APRIL</span> 2010 by maxwell</p>
<p>Diaspora aims to be a distributed network, where totally separate computers connect to each other directly, will let us connect without surrendering our privacy. We call these computers &#8216;seeds&#8217;. A seed is owned by you, hosted by you, or on a rented server. Once it has been set up, the seed will aggregate all of your information: your facebook profile, tweets, anything. We are designing an easily extendable plugin framework for Diaspora, so that whenever newfangled content gets invented, it will be automagically integrated into every seed.</p>
<p>Now that you have your information in your seed, it will connect to every service you used to have for you. For example, your seed will keep pulling tweets and you will still be able to see your Facebook newsfeed. In fact, Diaspora will make those services better! Upload an image to Flickr and your seed can automatically generate a tweet from the caption and link. Social networking will just get better when you have control over your data.</p>
<p>A seed will not just be all your existing networks put together, though. Decentralizing lets us reconstruct our “social graphs” so that they belong to us. Our real social lives do not have central managers, and our virtual lives do not need them. Friend another seed and the two of you can synchronize over a direct and secure connection instead of through a superfluous hub. Encryption (privacy nerds: we’re using <span class="caps">GPG</span>) will ensure that no matter what kind of content is being transferred, you can share privately. Eventually, today&#8217;s hubs could be almost entirely replaced by a decentralized network of truly personal websites.</p>
<p>Stay tuned for more updates on updates, and be sure to check out our <a href="http://kck.st/9QC2zk">Kickstarter!</a></p>
<a href="">permalink</a>
+ </div>
<div id="footer">
- <div class="span-20">
- <div class="span-6 append-1 last">
- <h1>team diaspora</h1>
- <ul>
- <li>Daniel Grippi</li>
- <li>Maxwell Salzberg</li>
- <li>Raphael Sofaer</li>
- <li>Ilya Zhitomirskiy</li>
- </ul>
- </div>
-
- <div class="span-6 append-1 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
- <div class="span-6 last">
- <h1>web presence</h1>
- <ul>
- <li>twitter</li>
- <li>facebook</li>
- </ul>
- </div>
+ <div id="footer_left">
+ <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type"><span class="brand">DIASPORA</span>Daniel Grippi | Maxwell Salzberg | Raphael Sofaer | Ilya Zhitromirskiy</span><br/><br/><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a>
</div>
-
-
-
- <div id="cc_info">
- <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/80x15.png" /></a><br /><span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/InteractiveResource" property="dc:title" rel="dc:type">Diaspora Website</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.joindiaspora.com" property="cc:attributionName" rel="cc:attributionURL">Daniel Grippi, Maxwell Salzberg, Raphael Sofaer, Ilya Zhitomirskiy</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.<br />Based on a work at <a xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://www.joindiaspora.com" rel="dc:source">joindiaspora.com</a>.
+
+ <div id="footer_right">
+ <div class="span-4 append-1 last">
+ <span class="footer_statement">We're Social!</span>
+ <ul class="span-4 last" style="font-weight:bold;">
+ <li><a href="http://twitter.com/joindiaspora">Twitter</a></li>
+ <li><a href="http://identi.ca/joindiaspora">Identi.ca</a></li>
+ <li><a href="#">Facebook</a></li>
+ </ul>
+ </div>
+ <div class="span-3 last">
+ <span class="footer_statement">Contact Us</span>
+ <ul class="span-4 last">
+ <li><b>questions</b> AT joindiaspora</li>
+ <li><b>people</b> AT joindiaspora</li>
+ <li><b>press</b> AT joindiaspora</li>
+ </ul>
+ </div>
</div>
</div>
Oops, something went wrong.

0 comments on commit 5228a0d

Please sign in to comment.