Merge branch 'master' of github.com:DearDesi/deardesi

index.html

@@ -7,8 +7,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-  <title>Dear Desi - Static Blog Generator</title>
+  <title>Desi, the DIY Blog Platform</title>
-  <meta name="description" content="Desi is a static blog generator that is built for the browser and also works in node.js">
+  <meta name="description" content="Desi is the DIY blog platform for normal people. You can build your blog with Desi in your browser and then host it on Google Drive, DropBox, Github, or a good ol' fashion web host via ftp.">
 
   <!-- Style -->
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -29,7 +29,15 @@
   <div style="margin-bottom: 0; border-top-width: 0;" class="navbar navbar-default">
     <div class="container">
       <div class="navbar-header">
-        <div style="padding-top: 9px; padding-left: 9px; padding-bottom: 9px;" class="pull-left"><img ng-src="http://dropsha.re/files/VY15+v8/desirae-parker-crop.jpg" style="border: 1px solid grey; height: 54px; width: 54px;" class="navbar-logo"/></div><a href="#/" style="padding-top: 23px; padding-left: 25px;" class="navbar-brand">Desi</a>
+        <div
+          style="padding-top: 9px; padding-left: 9px; padding-bottom: 9px;"
+          class="pull-left"><img
+            ng-src="http://dropsha.re/files/VY15+v8/desirae-parker-crop.jpg"
+            style="border: 1px solid grey; height: 54px; width: 54px;"
+            class="navbar-logo"/></div>
+        <a href="#/"
+          style="padding-top: 23px; padding-left: 25px;"
+          class="navbar-brand">Desi Demo</a>
 
         <div style="padding-top: 9px;">
           <button type="button" ng-init="navCollapsed = true" ng-click="navCollapsed = !navCollapsed" class="navbar-toggle"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
@@ -62,7 +70,7 @@
       <a href="https://github.com/DearDesi/desirae?rel=author" rel="me">Github</a> (v<span app-version></span>)
       <!--a href="https://plus.google.com/111222501744950155474?rel=author" data-user="AJ ONeal" rel="me">Google+</a -->
       |
-      <a href="#screencast" rel="me">YouTube</a>
+      <a href="https://www.youtube.com/watch?v=pFAKAWP_sec" rel="me">YouTube</a>
       |
       <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2 License</a>
       |
@@ -71,8 +79,8 @@
     <p>© AJ ONeal Tech LLC 2015
       with help from
       <a href="http://angularjs.org" target="_blank" title="Superheroic JavaScript MVW Framework">AngularJS</a>,
-      <a href="http://nodejs.org" target="_blank"
+      <a href="http://iojs.org" target="_blank"
-        title="Open source, cross-platform server-side JavaScript runtime environment">node.js</a>,
+        title="Open source, cross-platform server-side JavaScript runtime environment">io.js</a>,
       and <a href="http://twitter.github.com/bootstrap/" target="_blank">Twitter Bootstrap</a>
     </p>
   </center>

views/about/about.html

@@ -16,8 +16,9 @@
         </div>
         <div class="row">
           <div class="col-lg-7">
+            <!-- iframe width="560" height="315" src="//www.youtube.com/embed/pFAKAWP_sec" frameborder="0" allowfullscreen></iframe -->
             <br/>
-            <!--iframe width="560" height="315" src="//www.youtube.com/embed/YZzhIIJmlE0" frameborder="0" allowfullscreen></iframe-->
+            <p>Run these commands in Terminal:</p>
             <pre>
 <code>curl -fsSL bit.ly/install-deardesi | bash
 
@@ -28,7 +29,7 @@ open ~/Desktop/my-blog
 desi serve -d ~/Desktop/my-blog</code>
             </pre>
             <br/>
-            <p>The open <a href="http://local.dear.desi:65080">http://local.dear.desi:65080</a></p> in your browser.
+            <p>Then open <a href="http://local.dear.desi:65080">http://local.dear.desi:65080</a> in your browser.</p>
           </div>
           <div class="col-lg-5">
             <h2>Why Desi?</h2>
@@ -49,7 +50,7 @@ desi serve -d ~/Desktop/my-blog</code>
             </ul>
             <h3>What are you waiting for?</h3>
             <br/>
-            <a class="btn btn-primary btn-lg pull-right" href="/#authors">Try it!</a>
+            <a class="btn btn-primary btn-lg pull-right" href="/#authors">Get Started!</a>
           </div>
         </div>
       </div>