1
0
mirror of https://github.com/fazo96/markcloud.git synced 2025-03-28 22:48:38 +01:00

reorganize a little

This commit is contained in:
Enrico Fasoli 2014-10-09 16:14:20 +02:00
parent 07524cd879
commit 4f7f3c5de1
2 changed files with 39 additions and 34 deletions

View File

@ -92,7 +92,7 @@ errCallback = (err) ->
notify title: err.code or 'Error', msg: err.reason, type: 'error' notify title: err.code or 'Error', msg: err.reason, type: 'error'
else notify title: 'Error', msg: err, 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.layout.showSpinner = -> Meteor.status().connected is yes
Template.home.events Template.home.events
'click #twitter-login': -> 'click #twitter-login': ->

View File

@ -12,13 +12,8 @@
</div> </div>
</div> </div>
</template> </template>
<template name="magicIcon">
<template name="layout"> {{#if currentUser}}
{{>ribbon}}
{{> yield region="outside"}}
<div class="container">
<h1><a id="big-title" href="/">MarkCloud</a>
{{#if currentUser}}
{{#if amIValid}} {{#if amIValid}}
<a id="icon" class="pull-right" href="{{pathFor 'profile' user=currentUser.username}}"> <a id="icon" class="pull-right" href="{{pathFor 'profile' user=currentUser.username}}">
<small><i class="fa fa-chevron-right"></i></small> <small><i class="fa fa-chevron-right"></i></small>
@ -28,7 +23,7 @@
<small><i class="fa fa-envelope"></i></small> <small><i class="fa fa-envelope"></i></small>
</a> </a>
{{/if}} {{/if}}
{{else}} {{else}}
{{#if loggingIn}} {{#if loggingIn}}
<a class="pull-right" href="/"> <a class="pull-right" href="/">
<small><i class="fa fa-cog fa-spin"></i></small></a> <small><i class="fa fa-cog fa-spin"></i></small></a>
@ -43,17 +38,25 @@
</a> </a>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</h1> </template>
<hr>
{{> yield}} <template name="title">
<h1><a id="big-title" href="/">MarkCloud</a>{{> magicIcon}}</h1>
</template>
<template name="layout">
{{>ribbon}}
{{> yield region="outside"}}
<div class="container">
{{> title}} <hr> {{> yield}}
</div> </div>
</template> </template>
<template name="docLayout"> <template name="docLayout">
{{>ribbon}} {{>ribbon}}
{{> yield region="outside"}} {{> yield region="outside"}}
<div class="container">{{> yield}}</div> <div class="container"> {{> yield}} </div>
</template> </template>
<template name="home"> <template name="home">
@ -119,13 +122,14 @@ You will be able to delete your account and all your data whenever you want.
{{/if}} {{/if}}
<hr> <hr>
<div class="text-center"> <div class="text-center">
<!--{{> title}} <hr>-->
{{#unless currentUser}} {{#unless currentUser}}
<p><a href="{{pathFor 'signin'}}">Log in</a> to edit and delete your documents<br></p> <p><a href="{{pathFor 'signin'}}">Log in</a> to edit and delete your documents<br></p>
{{/unless}} {{/unless}}
{{#if valid}} {{#if valid}}
{{#if owned}} {{#if owned}}
<p>This document is <a id="owner-link" href="{{pathFor 'profile' user=currentUser.username}}">yours</a>.</p> <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> <p>Anonymous links don't reveal your profile.</p>
{{else}} {{else}}
{{#if ownerName}} {{#if ownerName}}
@ -154,7 +158,8 @@ You will be able to delete your account and all your data whenever you want.
{{/if}}{{/if}} {{/if}}{{/if}}
</div> </div>
<br> <br>
{{/if}}Powered by <a href="/">MarkCloud</a> {{/if}}
Powered by <a href="/">MarkCloud</a>
</div> </div>
</template> </template>