github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the broken link to the back-office in the toolbar when the inline_editor tag is missing

This commit is contained in:
did 2012-01-24 22:04:49 +01:00
parent e523cb952c
commit 7ace1d9a48
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/locomotive/views/inline_editor/toolbar_view.js.coffee
View File

@ -63,7 +63,10 @@ class Locomotive.Views.InlinEditor.ToolbarView extends Backbone.View
back: (event) -> back: (event) ->
event.stopPropagation() & event.preventDefault() event.stopPropagation() & event.preventDefault()
if @model
window.location.href = @model.get('edit_url') window.location.href = @model.get('edit_url')
else
window.location.href = window.Locomotive.mounted_on + '/pages'
show_editing_mode_block: -> show_editing_mode_block: ->
@$('.editing-mode').show() @$('.editing-mode').show()

11
doc/TODO
View File

@ -71,6 +71,7 @@ x edit my site
x locale switcher x locale switcher
- back to default locale (if changed in settings) - back to default locale (if changed in settings)
- front - front
- pages
- inline editor - inline editor
x rack x rack
x iframe x iframe
@ -78,7 +79,7 @@ x edit my site
x save editable elements x save editable elements
x notification (growl) x notification (growl)
x change page x change page
- i18n x i18n
- aloha: - aloha:
x remove sidebar x remove sidebar
- i18n - i18n
@ -91,13 +92,13 @@ x deployment
x api routes x api routes
x change api location x change api location
(- add a way to custom the as_json method within the presenters (by default as_json ?) + custom responder ?) (- add a way to custom the as_json method within the presenters (by default as_json ?) + custom responder ?)
- REST actions: x REST actions:
x CRUD theme assets x CRUD theme assets
x CRUD snippets x CRUD snippets
x CRUD content assets x CRUD content assets
x CRUD pages x CRUD pages
x CRUD content types x CRUD content types
- data ? x data ?
- refactoring - refactoring
- remove the import / export scripts - remove the import / export scripts
- remove the cross domain authentication (use auth_token instead) - remove the cross domain authentication (use auth_token instead)
@ -107,9 +108,7 @@ x deployment
x unable to toggle the "required" check_boxes for content types x unable to toggle the "required" check_boxes for content types
x unable to sign out x unable to sign out
x unable to remove a field x unable to remove a field
x "back to admin" link does not work if inline editor disabled
- "back to admin" link does not work if inline editor disabled
- disallow to click twice on the submit form button (spinner ?) - disallow to click twice on the submit form button (spinner ?)
- message to notify people if their browser is too old - message to notify people if their browser is too old