#14 Update some texts

- Link to todo from about page - Mention AWS at privacy page - Hide Carlos/Natalia until got proper intro texts - Add todos - Shuffle footer links a bit
Trustroots · Dec 22, 2014 · d7bdb10 · d7bdb10
1 parent 53aa6c1
commit d7bdb10
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 48 deletions.
diff --git a/public/modules/core/views/footer.client.view.html b/public/modules/core/views/footer.client.view.html
@@ -17,9 +17,9 @@
           <li><a ui-sref="about">About</a></li>
           <li><a href="http://ideas.trustroots.org/">Blog</a></li>
           <li><a ui-sref="privacy">Privacy</a></li>
+          <li><a ui-sref="rules">Rules</a></li>
           <li><a ui-sref="team">Team</a></li>
           <li><a href="https://github.com/Trustroots/">Developers</a></li>
-          <li><a ui-sref="rules">Rules</a></li>
           <li><a ui-sref="contact">Contact</a></li>
         </ul>
       </nav>

diff --git a/public/modules/pages/views/about.client.view.html b/public/modules/pages/views/about.client.view.html
@@ -89,6 +89,12 @@ <h3>Geeky stuff</h3>
 
     </div>
   </div>
+  <div class="row">
+    <div class="col-xs-4 col-xs-offset-4 text-center lead">
+      <hr>
+      <a ui-sref="todo">Feature todo list</a>
+    </div>
+  </div>
 
   <br><br>
 

diff --git a/public/modules/pages/views/privacy.client.view.html b/public/modules/pages/views/privacy.client.view.html
@@ -59,8 +59,11 @@ <h3>Your emails</h3>
 
         <h3>Our server</h3>
 
-        Our server (and thus your data) is securely hosted at <a href="http://www.digitalocean.com">DigitalOcean</a>.
+        Our server (and thus your data) is securely hosted at <a href="http://www.digitalocean.com">DigitalOcean</a> and backed up hourly to <a href="http://aws.amazon.com/">AWS</a>.
 
+        <hr>
+
+        <p class="lead">Questions? <a ui-sref="contact">Drop us a line!</a></p>
 
       </div>
 

diff --git a/public/modules/pages/views/team.client.view.html b/public/modules/pages/views/team.client.view.html
@@ -39,7 +39,7 @@ <h4 class="media-heading">Mikael</h4>
 
       <br><br>
 
-      <!-- Carlos -->
+      <!-- Carlos --
       <div class="media">
         <a class="pull-left" href="#">
           <img class="media-object img-circle" src="/modules/core/img/avatar.png" width="100" alt="">
@@ -49,19 +49,13 @@ <h4 class="media-heading">Carlos</h4>
           <p class="text-color-links">
             In the past has volunteered for CouchSurfing (x and x collectives).
           </p>
-          <!--
-          <p>
-            <a href="#"><i class="text-muted fa fa-fw fa-twitter"></i></a>
-            <a href="#"><i class="text-muted fa fa-fw fa-github"></i></a>
-            <a href="#"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
-          </p>
-          -->
         </div>
       </div>
 
       <br><br>
+      -->
 
-      <!-- Natalia -->
+      <!-- Natalia --
       <div class="media">
         <a class="pull-left" href="#">
           <img class="media-object img-circle" src="/modules/core/img/avatar.png" width="100" alt="">
@@ -71,13 +65,19 @@ <h4 class="media-heading">Natalia</h4>
           <p class="text-color-links">
             In the past has volunteered for CouchSurfing (x and x collectives).
           </p>
-          <!--
+        </div>
+      </div>
+      -->
+
+      <!-- YOU -->
+      <div class="media">
+        <a class="pull-left" ui-sref="contact">
+          <img class="media-object img-circle" src="/modules/core/img/avatar.png" width="100" alt="">
+        </a>
+        <div class="media-body">
           <p>
-            <a href="#"><i class="text-muted fa fa-fw fa-twitter"></i></a>
-            <a href="#"><i class="text-muted fa fa-fw fa-github"></i></a>
-            <a href="#"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
+            <em class="lead">Hey, help us build Trustroots! <a ui-sref="contact">Tell us</a> about your ideas and let's see how they could be done. Some keywords about working on this project would be “cutting edge” and “fun”. Next big thing would be to construct legal entity and volunteer network for the project.</em>
           </p>
-          -->
         </div>
       </div>
 
@@ -107,33 +107,19 @@ <h4 class="media-heading">Callum</h4>
 
       <!-- Kasper -->
       <div class="media">
-      <a class="pull-left" href="http://kasper.re/">
-        <img class="media-object img-circle" src="//gravatar.com/avatar/edccc1f234833b3b5c266c18c2db139d?s=100" width="100" alt="Kasper">
-      </a>
-      <div class="media-body">
-        <h4 class="media-heading">Kasper</h4>
-        <p class="text-color-links">
-          Founded multiple popular and trusted websites such as <a href="http://hitchwiki.org" target="_blank">Hitchwiki</a>, <a href="http://trashwiki.org" target="_blank">Trashwiki</a>, <a href="http://nomadwiki.org" target="_blank">Nomadwiki</a>, <a href="http://couchwiki.org">CouchWiki</a> (former wiki in CouchSurfing), <a href="http://coinwiki.info" target="_blank">Coinwiki</a> and <a href="http://deletionpedia.org" target="_blank">Deletionpedia</a>. In the past has volunteered for CouchSurfing as a tech team coordinator 2006—2007 and for <a href="http://bewelcome.org" target="_blank">BeWelcome</a> BoD in 2013.
-        </p>
-        <p>
-          <a href="http://kasper.re" target="_blank" class="text-muted">kasper.re</a>
-          <a href="https://twitter.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-twitter"></i></a>
-          <a href="https://github.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-github"></i></a>
-          <a href="http://www.linkedin.com/in/guaka" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
-        </p>
-      </div>
-      </div>
-
-      <br><br>
-
-      <!-- YOU -->
-      <div class="media">
-        <a class="pull-left" ui-sref="contact">
-          <img class="media-object img-circle" src="/modules/core/img/avatar.png" width="100" alt="">
+        <a class="pull-left" href="http://kasper.re/">
+          <img class="media-object img-circle" src="//gravatar.com/avatar/edccc1f234833b3b5c266c18c2db139d?s=100" width="100" alt="Kasper">
         </a>
         <div class="media-body">
+          <h4 class="media-heading">Kasper</h4>
+          <p class="text-color-links">
+            Founded multiple popular and trusted websites such as <a href="http://hitchwiki.org" target="_blank">Hitchwiki</a>, <a href="http://trashwiki.org" target="_blank">Trashwiki</a>, <a href="http://nomadwiki.org" target="_blank">Nomadwiki</a>, <a href="http://couchwiki.org">CouchWiki</a> (former wiki in CouchSurfing), <a href="http://coinwiki.info" target="_blank">Coinwiki</a> and <a href="http://deletionpedia.org" target="_blank">Deletionpedia</a>. In the past has volunteered for CouchSurfing as a tech team coordinator 2006—2007 and for <a href="http://bewelcome.org" target="_blank">BeWelcome</a> BoD in 2013.
+          </p>
           <p>
-            <em class="lead">Hey, help us build Trustroots! <a ui-sref="contact">Tell us</a> about your ideas and let's see how they could be done. Some keywords about working on this project would be “cutting edge” and “fun”.</em>
+            <a href="http://kasper.re" target="_blank" class="text-muted">kasper.re</a>
+            <a href="https://twitter.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-twitter"></i></a>
+            <a href="https://github.com/guaka" target="_blank"><i class="text-muted fa fa-fw fa-github"></i></a>
+            <a href="http://www.linkedin.com/in/guaka" target="_blank"><i class="text-muted fa fa-fw fa-linkedin"></i></a>
           </p>
         </div>
       </div>
@@ -146,10 +132,10 @@ <h4 class="media-heading">Kasper</h4>
       <hr/>
       <p class="love">Give us some <i class="fa fa-heart"></i> at:</p>
       <div class="btn-group">
-        <a href="http://ideas.trustroots.org" class="btn btn-default btn-lg">Blog</a>
-        <a href="https://www.facebook.com/trustroots.org" class="btn btn-default btn-lg" target="_blank"><i class="fa fa-facebook"></i> Facebook</a>
-        <a href="https://twitter.com/trustroots" class="btn btn-default btn-lg" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>
-        <a href="https://github.com/Trustroots" class="btn btn-default btn-lg" target="_blank"><i class="fa fa-github"></i> Github</a>
+        <a href="http://ideas.trustroots.org" class="btn btn-link btn-lg">Blog</a>
+        <a href="https://github.com/Trustroots" class="btn btn-link btn-lg" target="_blank">Github</a>
+        <a href="https://www.facebook.com/trustroots.org" class="btn btn-link btn-lg" target="_blank">Facebook</a>
+        <a href="https://twitter.com/trustroots" class="btn btn-link btn-lg" target="_blank">Twitter</a>
       </div>
       <br><br>
     </div>

diff --git a/public/modules/pages/views/todo.client.view.html b/public/modules/pages/views/todo.client.view.html
@@ -7,6 +7,12 @@
         <h2>Todo</h2>
       </div>
 
+      <p>
+        You can follow our work also at <a href="https://github.com/trustroots/trustroots/issues">GitHub</a>.
+        <br><br>
+      </p>
+
+
       <h4>The Map</h4>
       <ul>
         <li>Proper search filters for users</li>
@@ -15,7 +21,7 @@ <h4>The Map</h4>
 
       <h4>Profiles</h4>
       <ul>
-        <li>Try to import some data from CouchSurfing</li>
+        <li>Try to allow importing some data from CouchSurfing</li>
         <li>Show what you have in common with user (common friends etc)</li>
         <li>Upload your own avatar</li>
       </ul>
@@ -24,21 +30,20 @@ <h4>Contacts</h4>
       <ul>
         <li>Find your other social media friends and connect with them</li>
         <li>Show new contact messages at inbox threads</li>
-        <li><em>"How do you know him?"</em> for contact info</li>
+        <li><em>"How do you know this person?"</em> for contact info</li>
       </ul>
 
       <h4>Other</h4>
       <ul>
         <li>Notifications from new messages at the header</li>
+        <li>Communities (groups such as "hitchhikers" or "geeks")</li>
         <li>Text versions for all emails</li>
         <li>More mobile friendly</li>
         <li>Connect your profile to <a href="http://hitchwiki.org">Hitchwiki</a>, <a href="http://nomadwiki.org">Nomadwiki</a> and <a href="http://trashwiki.org">Trashwiki</a></li>
         <li>Login with email</li>
         <li>API</li>
       </ul>
 
-      <p>You can follow our work also at <a href="https://github.com/trustroots/trustroots/issues">GitHub</a></p>
-
     </div>
   </div><!-- /.row -->