mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-14 11:24:22 +01:00
Main changes are to login and session management:
* Added Luke Melia's patch to warn the user when the session has timed out when the user has added or checked off a next action without refreshing the page first. If they check off an item, they are redirected to the login page, then when they return, they are informed that the action has been checked off. If they add an item, they are informed after returning from the login page that the next action hasn't been added. Fixes #163. * Made some stylistic changes to login and signup pages to make them tidier, and to fit with the main theme better * Fixed bug with deleting items: the sheet which appeared was an alert (with only an 'OK' box, rather than a confirmation (with both an 'OK' and 'Cancel' box). Fixes #189. * Added a new feed icon to comply with the new de-facto standard: from [http://www.feedicons.com/ Feed Icons]. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@172 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
parent
c58f41775c
commit
d0a542f625
26 changed files with 212 additions and 146 deletions
|
|
@ -65,10 +65,11 @@ class ContextController < ApplicationController
|
|||
|
||||
# fallback for standard requests
|
||||
if @saved
|
||||
flash["warning"] = 'Added new next action'
|
||||
redirect_to :action => 'show', :id => @item
|
||||
flash["notice"] = 'Added new next action.'
|
||||
redirect_to :controller => 'todo', :action => 'list'
|
||||
else
|
||||
#render :action => 'new'
|
||||
flash["warning"] = 'The next action was not added. Please try again.'
|
||||
redirect_to :controller => 'todo', :action => 'list'
|
||||
end
|
||||
|
||||
rescue
|
||||
|
|
@ -76,7 +77,7 @@ class ContextController < ApplicationController
|
|||
render :action => 'error'
|
||||
else
|
||||
flash["warning"] = 'An error occurred on the server.'
|
||||
#render :action => 'new'
|
||||
redirect_to :controller => 'todo', :action => 'list'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -93,7 +94,7 @@ class ContextController < ApplicationController
|
|||
|
||||
# fallback for standard requests
|
||||
if @saved
|
||||
flash["warning"] = 'Successfully deleted next action'
|
||||
flash["notice"] = 'Successfully deleted next action'
|
||||
redirect_to :controller => 'todo', :action => 'list'
|
||||
else
|
||||
render :controller => 'todo', :action => 'list'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue