Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' of github.com:mozilla/towtruck into develop

Conflicts:
	app/http/views/site/index.ejs
  • Loading branch information...
commit 866bdcc5b1cf10c3179739a4f626df6bc3cf9c51 2 parents 2cd9181 + 5cda6b4
@simonwex simonwex authored
View
6 app/http/views/site/example/index.ejs
@@ -25,19 +25,19 @@
<ul class="thumbnails">
<li class="span2">
- <a href="#" class="thumbnail">
+ <a href="./code" class="thumbnail">
<img src="/images/thumb-codeeditor.png" alt="">
<p>Code Editor</p>
</a>
</li>
<li class="span2">
- <a href="#" class="thumbnail">
+ <a href="./longpage" class="thumbnail">
<img src="/images/thumb-longpage.png" alt="">
<p>A long page</p>
</a>
</li>
<li class="span2">
- <a href="#" class="thumbnail">
+ <a href="./form" class="thumbnail">
<img src="/images/thumb-form.png" alt="">
<p>A form</p>
</a>
View
50 app/http/views/site/index.ejs
@@ -29,6 +29,31 @@
</div>
</div>
</div>
+
+ <div id="features" class="section">
+ <div class="container">
+ <h1 class="main-header">Introducing TowTruck.</h1>
+ <h2>Let's make collaborating on the web easier.</h2>
+ <div class="span4 far-left">
+ <img class="main-img" src="images/site-features-01.png" alt="Browser Header Shared Image">
+ <h2 class="subheader">By someone you trust.</h2>
+ <p class="main-text">Built and hosted by [Mozilla], Towtruck is [open source](github).</p>
+ </div>
+ <div class="span4 textcenter">
+ <img class="main-img" src="images/site-features-02.png" alt="Browser Header Shared Image">
+ <h2 class="subheader">Create together.</h2>
+ <p class="main-text">TowTruck lets users communicate, co-author, co-browse and guide each other.</p>
+ </div>
+ <div class="span4 textcenter">
+ <img class="main-img" src="images/site-features-03.png" alt="Browser Header Shared Image">
+ <h2 class="subheader">Built for the web.</h2>
+ <p class="main-text">TowTruck is implemented in Javascript; no software or plugins to install, and it's friendly with existing web pages, while still letting developers customize the experience.</p>
+ </div>
+ </div>
+ <hr style="width:50%;margin:20px auto 0px;">
+ </div>
+
+
<div id="how_it_works" class="section">
<div class="container">
<h1 class="main-header">How it Works</h1>
@@ -101,31 +126,6 @@
</div>
</div>
- <div id="features" class="section">
- <div class="container">
- <h1 class="main-header">Features</h1>
- <div class="span4 far-left">
- <img class="main-img" src="images/site-features-01.png" alt="Browser Header Shared Image">
- <h2 class="subheader">Cursor-mirroring</h2>
- <p class="main-text">See your friend's cursors in real-time to help point to areas on the page.</p>
- <p></p>
- </div><!-- /.span4 -->
- <div class="span4 textcenter">
- <img class="main-img" src="images/site-features-02.png" alt="Browser Header Shared Image">
- <h2 class="subheader">Real-time chat</h2>
- <p class="main-text">Talk to your friends over chat, so you can share resources and links.</p>
- <p></p>
- </div><!-- /.span4 -->
- <div class="span4 textcenter">
- <img class="main-img" src="images/site-features-03.png" alt="Browser Header Shared Image">
- <h2 class="subheader">Real-time voice chat</h2>
- <p class="main-text">Using Web Real-Time Communication, you can talk with your friends over the microphone in the browser.</p>
- <p></p>
- </div><!-- /.span4 -->
- </div>
- <hr style="width:50%;margin:20px auto 0px;">
- </div>
-
<div id="how_to_install" class="section">
<div class="container">
<h1 class="main-header">How to Install TowTruck</h1>
Please sign in to comment.
Something went wrong with that request. Please try again.