Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Small changes / qa.

Browse source
This commit is contained in:
Martin Edenhofer 2015-06-27 18:13:47 +02:00
parent 9ad68cd8ae
commit 423c7428a7
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.js.coffee
View file

@ -74,8 +74,6 @@ class CalendarSubscriptions extends App.Controller
App.User.full( App.User.full(
App.Session.get( 'id' ), App.Session.get( 'id' ),
=> =>
App.i18n.set( @locale )
App.Event.trigger( 'ui:rerender' )
@notify( @notify(
type: 'success' type: 'success'
msg: App.i18n.translateContent( 'Successfully!' ) msg: App.i18n.translateContent( 'Successfully!' )
@ -92,4 +90,4 @@ class CalendarSubscriptions extends App.Controller
msg: App.i18n.translateContent( data.message ) msg: App.i18n.translateContent( data.message )
) )
App.Config.set( 'CalendarSubscriptions', { prio: 4000, name: 'Calendar Subscriptions', parent: '#profile', target: '#profile/calendar_subscriptions', controller: CalendarSubscriptions }, 'NavBarProfile' ) App.Config.set( 'CalendarSubscriptions', { prio: 3000, name: 'Calendar', parent: '#profile', target: '#profile/calendar_subscriptions', controller: CalendarSubscriptions }, 'NavBarProfile' )

2
app/assets/javascripts/app/controllers/_profile/linked_accounts.js.coffee
View file

@ -76,5 +76,5 @@ class Index extends App.Controller
msg: App.i18n.translateContent( data.message ) msg: App.i18n.translateContent( data.message )
) )
App.Config.set( 'LinkedAccounts', { prio: 3000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index }, 'NavBarProfile' ) App.Config.set( 'LinkedAccounts', { prio: 4000, name: 'Linked Accounts', parent: '#profile', target: '#profile/linked', controller: Index }, 'NavBarProfile' )

2
app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
View file

@ -7,7 +7,7 @@
<p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p> <p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
<h3><%= @T('Combined Url') %></h3> <h3><%= @T('URL') %></h3>
<input class="form-control js-select" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets"> <input class="form-control js-select" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets">
<h3><%= @T('Subscription Settings') %></h3> <h3><%= @T('Subscription Settings') %></h3>