From 4f7f3c5de13e88209e0fe24fb264022daf0f37d7 Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Thu, 9 Oct 2014 16:14:20 +0200
Subject: [PATCH] reorganize a little

---
 client/client.coffee  |  2 +-
 client/templates.html | 71 +++++++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/client/client.coffee b/client/client.coffee
index eb944eb..553e26c 100644
--- a/client/client.coffee
+++ b/client/client.coffee
@@ -92,7 +92,7 @@ errCallback = (err) ->
     notify title: err.code or 'Error', msg: err.reason, type: 'error'
   else notify title: 'Error', msg: err, type: 'error'
 
-Template.layout.notHome = -> Router.current().route.name isnt 'home'
+Template.magicIcon.notHome = -> Router.current().route.name isnt 'home'
 Template.layout.showSpinner = -> Meteor.status().connected is yes
 Template.home.events
   'click #twitter-login': ->
diff --git a/client/templates.html b/client/templates.html
index c766dee..b35912f 100644
--- a/client/templates.html
+++ b/client/templates.html
@@ -12,48 +12,51 @@
     </div>
   </div>
 </template>
+<template name="magicIcon">
+{{#if currentUser}}
+  {{#if amIValid}}
+    <a id="icon" class="pull-right" href="{{pathFor 'profile' user=currentUser.username}}">
+      <small><i class="fa fa-chevron-right"></i></small>
+    </a>
+  {{else}}
+    <a class="pull-right" id="icon" href="{{pathFor 'profile' user=currentUser.username}}" data-toggle="tooltip" data-placement="left" title="Need email verification">
+      <small><i class="fa fa-envelope"></i></small>
+    </a>
+  {{/if}}
+{{else}}
+  {{#if loggingIn}}
+    <a class="pull-right" href="/">
+      <small><i class="fa fa-cog fa-spin"></i></small></a>
+  {{else}}
+    {{#if notHome}}
+    <a class="pull-right" href="/">
+      <small><i class="fa fa-home"></i></small>
+    </a>
+    {{else}}
+    <a class="pull-right" href="{{pathFor 'signup'}}">
+      <small><i class="fa fa-user"></i></small>
+    </a>
+    {{/if}}
+  {{/if}}
+{{/if}}
+</template>
+
+<template name="title">
+  <h1><a id="big-title" href="/">MarkCloud</a>{{> magicIcon}}</h1>
+</template>
 
 <template name="layout">
 {{>ribbon}}
 {{> yield region="outside"}}
 <div class="container">
-  <h1><a id="big-title" href="/">MarkCloud</a>
-    {{#if currentUser}}
-      {{#if amIValid}}
-        <a id="icon" class="pull-right" href="{{pathFor 'profile' user=currentUser.username}}">
-          <small><i class="fa fa-chevron-right"></i></small>
-        </a>
-      {{else}}
-        <a class="pull-right" id="icon" href="{{pathFor 'profile' user=currentUser.username}}" data-toggle="tooltip" data-placement="left" title="Need email verification">
-          <small><i class="fa fa-envelope"></i></small>
-        </a>
-      {{/if}}
-    {{else}}
-      {{#if loggingIn}}
-        <a class="pull-right" href="/">
-          <small><i class="fa fa-cog fa-spin"></i></small></a>
-      {{else}}
-        {{#if notHome}}
-        <a class="pull-right" href="/">
-          <small><i class="fa fa-home"></i></small>
-        </a>
-        {{else}}
-        <a class="pull-right" href="{{pathFor 'signup'}}">
-          <small><i class="fa fa-user"></i></small>
-        </a>
-        {{/if}}
-      {{/if}}
-    {{/if}}
-  </h1>
-  <hr>
-  {{> yield}}
+  {{> title}} <hr> {{> yield}}
 </div>
 </template>
 
 <template name="docLayout">
 {{>ribbon}}
 {{> yield region="outside"}}
-<div class="container">{{> yield}}</div>
+<div class="container"> {{> yield}} </div>
 </template>
 
 <template name="home">
@@ -119,13 +122,14 @@ You will be able to delete your account and all your data whenever you want.
   {{/if}}
   <hr>
   <div class="text-center">
+    <!--{{> title}} <hr>-->
     {{#unless currentUser}}
       <p><a href="{{pathFor 'signin'}}">Log in</a> to edit and delete your documents<br></p>
     {{/unless}}
     {{#if valid}}
       {{#if owned}}
         <p>This document is <a id="owner-link" href="{{pathFor 'profile' user=currentUser.username}}">yours</a>.</p>
-        <p>You can link this document using a <a href="{{pathFor 'userDoc' user=currentUser.username _id=this._id}}">public</a> or <a href="{{pathFor 'doc'}}">anonymous link</a>.</p>
+        <p>You can link this document using a <a href="{{pathFor 'userDoc' user=currentUser.username _id=this._id}}">public</a> or <a href="{{pathFor 'doc'}}">anonymous</a> link.</p>
         <p>Anonymous links don't reveal your profile.</p>
       {{else}}
         {{#if ownerName}}
@@ -154,7 +158,8 @@ You will be able to delete your account and all your data whenever you want.
         {{/if}}{{/if}}
       </div>
       <br>
-    {{/if}}Powered by <a href="/">MarkCloud</a>
+    {{/if}}
+    Powered by <a href="/">MarkCloud</a>
   </div>
 </template>