Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix iron router error: route never dispatch in case Meteor.loggingIn() i... #358

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use text link with Box and Onedrive
StrongBearCeo committed Apr 30, 2015
commit 0c4692ba01f7251183f0df0445ae31622072d582
5 changes: 5 additions & 0 deletions client/entry.less
Original file line number Diff line number Diff line change
@@ -100,6 +100,11 @@
}
}
}

a {
display: block;
margin: auto;
}
}

.email-option {
9 changes: 6 additions & 3 deletions client/helpers.coffee
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ UI.registerHelper 'otherLoginServices', ->
Accounts.oauth.serviceNames().length > 0

UI.registerHelper 'loginServices', ->
Accounts.oauth.serviceNames()
["google", "dropbox", "box", "onedrive"]

UI.registerHelper 'showSignupCode', ->
AccountsEntry.settings.showSignupCode is true
@@ -50,9 +50,12 @@ UI.registerHelper 'containerCSSClass', ->
"container-fluid"
else
"container"

UI.registerHelper 'rowCSSClass', ->
if AccountsEntry.settings.fluidLayout is true
"row-fluid"
else
"row"
"row"

UI.registerHelper 'isPrimaryService', (serviceName)->
serviceName is 'google' or serviceName is 'dropbox'
24 changes: 17 additions & 7 deletions client/views/social/social.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<template name='entrySocial'>
<button class="btn" id="entry-{{this}}" name="{{this}}">
{{#if unconfigured}}
<i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
{{else}}
<i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
{{/if}}
</button>
{{#if isPrimaryService this}}
<button class="btn" id="entry-{{this}}" name="{{this}}">
{{#if unconfigured}}
<i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
{{else}}
<i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
{{/if}}
</button>
{{else}}
<a class="btn" id="entry-{{this}}" name="{{this}}">
{{#if unconfigured}}
<i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
{{else}}
<i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
{{/if}}
</a>
{{/if}}
</template>