Commit graph

5026 commits

Author SHA1 Message Date
bsag
2bd2d1928e Added clarsen's patch to prettify due dates for the range of 2-7 days away. There's a new setting in settings.yml.tmpl which you should add to your settings.yml. If due_style is set to 1, due dates in the 2-7 days away range will have the label, 'Due on Monday' (or whatever the corresponding day of the week it is). If set to 0, the behaviour will be as before (i.e. 'Due in 4 days').
Thanks clarsen!



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@173 a4c988fc-2ded-0310-b66e-134b36920a42
2006-01-08 15:02:23 +00:00
bsag
d0a542f625 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
2006-01-08 13:21:24 +00:00
bsag
c58f41775c Quite a few improvements to Ajax handling here:
* Installed the RJS plugin http://www.codyfauser.com/articles/2005/12/05/rjs-templates-plugin-subversion-repository
* Used the RJS templates to update multiple page elements on addition and deletion of actions: the new action gets added, the count 'badge' is updated correctly, and a status area provides helpful information.
* If your data entry triggers validation errors e.g. no description for the next action), the errors are displayed in the status area (not very prettily as yet...)
* The message about the context/project having no uncompleted actions automagically appears/disappears without refreshing the page.

The editing and toggling of actions hasn't been updated yet.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@171 a4c988fc-2ded-0310-b66e-134b36920a42
2006-01-04 19:49:15 +00:00
bsag
e5d9a413d5 Updated for Rails 1.0
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@170 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-24 10:57:19 +00:00
bsag
bfbd89bb7d Applied Luke's patch to fix CSS errors in print.css. Also removed text-shadow property on h2 element to get rid of Firefox errors. I've changed the colour to grey (666) with the same red as before on a:hover etc. I think it looks a bit better than white with no text shadow.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@169 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-12 13:59:41 +00:00
bsag
a07ae7b2b3 Applied Luke's patch (#167) for the staleness colouring bug in Apache.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@168 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-07 19:11:44 +00:00
bsag
7d33019265 Changed the instances of :project (referring to flagging whether we are on a project page) for an @on_page = "project" variable. In forms, I send a request parameter @param["on_project_page"] to set @on_page to "project" before rendering the partial.
It works fine except in the following circumstances, which I can't seem to figure out:

* If you edit an action on a project page, it will render with '[P]' link until you refresh
* If you mark an action completed on a project page, it will also render with a '[P]' link until you refresh.

However, adding a new action on a project page renders properly immediately.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@167 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-07 19:06:24 +00:00
bsag
1424b12834 Stupidly forgot to add the new partials to the repos.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@166 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-04 11:47:16 +00:00
bsag
80f3fdbc77 Applied Luke's patch (#164) to decrease the size of the homepage and load the edit forms dynamically when the edit button is clicked. Thanks, Luke!
As a result, I'm going to redo the empty message changes I made in [164], and will see if I can find a more sensible way to implement them. The empty messages still appear (now also in the notes area if that's empty), but you need a refresh after Ajax changes to view or remove them.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@165 a4c988fc-2ded-0310-b66e-134b36920a42
2005-12-04 11:43:09 +00:00
bsag
8349e760b3 First stage of cleaning up the messages in project/show which remind you if there are no uncompleted or completed actions, or notes in the current project. The show method checks whether @not_done, @done or @notes is empty, and if it is sets a message which is displayed in the partial.
I've added Scriptaculous calls to the Ajax for adding a new action, or completing a previously not done action removes the appropriate message (as these activities must logically make @not_done and @done non-empty. Similar thing added for project notes.

The next step will be to handle those cases where the last action is completed or deleted, or an unchecked done item refills the not_done actions, which is trickier to pick up. Then I'll repeat for context and todo views.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@164 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-27 17:56:34 +00:00
bsag
d7e7e9346d Added a button to the bottom the project/show/[name] fields which allows you to mark the project as completed (if it is currently uncompleted) or uncompleted (if it is currently completed). It redirects you to the projects page so that you can add another project to the list.
For simplicity and flexibility, the button is visible all the time, so that you can complete a project at any time.

Fixes #76.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@163 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-13 14:25:31 +00:00
bsag
8a342036a1 Updated for Rails 0.14.3
* Fixed unchecking of next actions on context and project pages, so that they now update visually, as well as changing the database.
* For some reason, the completion field was not being saved, which was messing up the completed page. That's fixed now.
* Deletion and editing of items was broken on context/show and project/show. That's fixed now, but if you uncheck a completed item, then attempt to delete or edit an item without a refresh it will fail. I'm not sure what I can do about this.
* Next actions on project and context pages now show the appropriate link to contexts and projects respectively, even when first created by Ajax.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@162 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-13 11:50:18 +00:00
bsag
a7c094b38d Fixed a weird problem which appeared using Rails 0.14.2 where loading the home page resulted in an error about nil objects. Traced the problem to self.init and altered the code to avoid it. Similar problems still exist on the completed page, and I'm trying to think of ways to work around them.
Also improved database performance by using eager loading of associations on the todo/list page.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@161 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-06 18:28:00 +00:00
bsag
d9355432d7 I'm a loon. As perlguy pointed out in #151, Ajax stuff was completely broken in the last revision (on Safari as well as IE6). I could have sworn that I'd tested it, but obviously not.
It turns out that you need to call prototype.js as well as scriptaculous.js, or nothing works at all (scriptaculous then calls the other scripts like control, effect etc.).

Fixes #151.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@160 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-02 09:08:24 +00:00
bsag
7c454eb42d Fixed the calling of the Scriptaculous javascript files. Now you only need to call scriptaculous.js, and that calls effects, controls etc. Previously each of the files was getting called multiple times because I was loading scriptaculous.js '''and''' all the others.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@159 a4c988fc-2ded-0310-b66e-134b36920a42
2005-11-01 19:30:07 +00:00
bsag
a948beefee Fixes #135 (projects page incorrectly referring to context page for Sortable drag and drop code, so changes to project sort order were not sticking after a refresh.
Fixed #142 - the 500 error was being generated on dragging projects and contexts to reorder because the order method was looking for an order view and layout. I've added a :render => nothing statement to order now,and that seems to fix the error.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@158 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-31 07:52:07 +00:00
bsag
f39ebf6ec9 Continued the separating out of the new item forms for all the controllers. So the new item form for todo/list, project/show/[name] and context/show/[name] all use shared/add_new_item_form.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@157 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-30 19:12:08 +00:00
bsag
9867ca01ad Updated to work with Rails 0.14.1 (1.0 Release candidate) - fixes #145.
The bug where project associations didn't seem to be immediately displayed when next actions were added from the Context page is magically fixed! Fixes #142.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@156 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-30 12:21:50 +00:00
bsag
551e767b5e Sorted out the styling of the 'Fresh actions' box, so that the refresh link is more visible. Fixes #111.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@155 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-15 10:47:04 +00:00
bsag
69773d159d [Contributed by Luke]. Applied Luke's patch to enable newly created contexts and projects to be dragged and dropped. Fixes #136.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@154 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-15 10:27:02 +00:00
bsag
1e5425ffdc [Contributed by Andre]
A new print stylesheet, which prints nicely formatted on 3x5 index cards, with one context on each card. Fixes #89.

Thanks, Andre!


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@153 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-12 17:52:03 +00:00
bsag
5cdc9691d8 [Contributed by luke]
Access key hints are now added with Javascript, and are tailored appropriately to the platform (Ctrl for Macs, Alt for Windows).

Thanks, Luke!


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@152 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-12 13:28:21 +00:00
bsag
d695ede1be Deleting a project now also deletes any notes attached to it, so that errors aren't generated when [tracks_url]/notes is visited.
Fixes #138.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@151 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-12 13:00:19 +00:00
bsag
cc001264fc Deleted projects and contexts now properly disappear in the Ajax 'fade' style when the delete button is clicked.
References to context.reset and project.reset are replaced by the correct Form.reset. Also replaced all instances of Form.focus_first with the correct Form.focusFirstElement.

Tidied up the edit forms on the projects and contexts pages. There's a weird visual bug in Safari (doesn't happen in Firefox), where the selected input box appears to be empty and unselected. However, if you type, your input will replace the previous text, and if you tab immediately to another field, you'll see that the input field was '''not''' actually empty.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@150 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-12 12:51:14 +00:00
bsag
5e4f0f9fe8 Improved the security of the new drag and drop features of the projects and contexts lists by checking that the logged in user owns those items.
Also changed references to Form.focus_first which were defined in the removed file prototype-ex.js to Form.focusFirstElement, which is defined in prototype.js. Fixes #133.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@149 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-10 21:14:34 +00:00
bsag
5ce97df3f4 Quite a few changes in this revision:
1. The contexts and projects lists are now drag and droppable. In other words, if you visit [tracks_url]/projects or [tracks_url]/contexts, you can grab the 'DRAG' handle with the mouse and drag and drop the projects or contexts into your preferred order. At the same time, this re-orders the 'position' column appropriately, so that changes in order will be reflected on other pages. '''NB''': At the moment, deleting projects and contexts is a bit buggy. The item doesn't disappear, but if you refresh the page it will update appropriately. Also, if you add a new item, you can't drag it until you refresh. I'll try to fix these things. Fixes #115.
2. Fixed typo of 'tomorrow' due date label. Fixes #131
3. I updated the syntax for some of the visual effects to use the new {{{visual_effect(:fade, 'element')}}} syntax. Also removed the javascript files effects2 and prototype-ex, which aren't used now. 


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@148 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-09 17:51:31 +00:00
bsag
86b8753c17 I'm seriously beginning to hate #188, but it really is fixed now. Really. The problem before was that due to a weird conjunction of due dates and creation dates on my sample set, it did actually work for me. now I use the same bit of code to display the actions on the home page and on the txt page, so it really is the same. If anyone opens that ticket again, woe betide them... :-D
Also fixes #109: lolindrath's patch (plus a bit of extra tinkering) means that newly created and newly edited actions get the [C] link if they are on the projects page and the [P] link otherwise.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@147 a4c988fc-2ded-0310-b66e-134b36920a42
2005-10-02 10:35:07 +00:00
bsag
1043fefb1b '''Really''' fixes #118. Now sorts the actions themselves as well as the contexts in the same order as one the home page.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@146 a4c988fc-2ded-0310-b66e-134b36920a42
2005-09-30 17:11:09 +00:00
bsag
157d882483 Applied lolindrath's patch to a) mark overdue actions only with a red badge reading 'Overdue by X days' and b) label the due dates using relative descriptions ('Due today', 'Due tomorrow', 'Due in X days').
Fixes #102


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@145 a4c988fc-2ded-0310-b66e-134b36920a42
2005-09-28 17:16:42 +00:00
bsag
a8c7c73428 The TXT view now sorts contexts by position (hidden contexts are hidden), just as on the home page.
Fixes #118.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@144 a4c988fc-2ded-0310-b66e-134b36920a42
2005-09-27 17:25:54 +00:00
bsag
e392123933 Changed the old collapse.png and expand.png images, and replaced them witih the ones provided by lolindrath, which are bigger and slightly shaded in a rather nice way.
Also fixed the CSS so that when the context is collapsed, there's no white border still showing which looked messy and was a bit confusing.

Fixes #72.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@143 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-29 11:03:31 +00:00
bsag
9f5fff1225 Added the sanitize method to all of the fields which get displayed on the page (context.name, project.name, project.description, todo.description, todo.notes, note.body). This stops harmful HTML codes being embedded in the page. Sanitize strips out javascript and on* attributes. The HTML gets rendered with the HTML entities escaped.
Incidentally, #79 does seem to be fixed now: if you enter a project or context name with a slash, the slash is escaped in the URL as %2F, so links don't break.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@142 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-28 14:20:42 +00:00
bsag
979ae7dc27 Changed the shebang lines to <tt>#!/usr/bin/env ruby</tt>. This should work for all *nix based setups (Linux or Mac OS X), but Windows users will probably have to change it. Try this command at the command line, run inside the Tracks directory:
{{{
ruby -i.bak -pe 'gsub!("#!/usr/bin/env ruby", "#!c:/ruby/bin/ruby")' public/dispatch.* script/*
}}}

I also failed to add the new user-related files and the new migrate task last time I committed, so those are added now.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@141 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-28 12:54:47 +00:00
bsag
6487400f07 Applied lolindrath's patch to fix #81: adding/editing next actions should work OK in Opera 8.02 (Windows). I don't have this browser, so let me know if this fix works. Doesn't seem to break anything else. Thanks, lolindrath.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@140 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-27 11:13:36 +00:00
bsag
cc78e8b58b Applied lolindrath's patch to fix #73: next actions which were completed yesterday now show up correctly in the 'Completed in the last 7 days' box on the completed action view.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@139 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-26 18:28:03 +00:00
bsag
f161ddf4ff Updated the contexts.yml and projects.yml with the new database fields. Also
added the new description field for projects in the content sql file.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@138 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-26 18:05:50 +00:00
bsag
db7084dabe Added in most of Tony Shadwick's patches. The main change is that projects now have an optional description field, in which you can describe the aims or main point of the project. If present, it's displayed just below the project name on the [tracks_url]/show/[project_name] page.
A placeholder page is also added for future configuration of users: [tracks_url]/user/index and [tracks_url]/user/admin. It doesn't do anything useful yet ;-).

I added the database changes as a migrate task, so running:

{{{
  rake migrate
}}}

at the command line inside your tracks directory will automatically update your database (if you are using either MySQL or PostgreSQL.

Fixes #84.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@137 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-20 10:40:20 +00:00
bsag
0a7a50c7c3 Added a rake task ('setup_tracks') which copies all the *.tmpl files and to a new file/directory name minus the .tmpl extension. Note that you do need to copy database.yml.tmpl -> database.yml first and edit it appropriately, or rake can't run any tasks!
Updated the documentation appropriately.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@136 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-10 20:01:48 +00:00
bsag
66946fd14e Files doc/CHANGELOG, doc/README_FOR_APP and README_FIRST.txt updated to reflect new instructions for installing the multi-user version of Tracks in the trunk.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@135 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-10 14:38:07 +00:00
bsag
21a37286b3 Updated the content SQL file to work with the new schemas. This file ''does not'' contain any data for the users table. You need to visit http://YOURURL/signup to set up new users.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@134 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-10 13:41:12 +00:00
bsag
fa795bf066 Updated the table schemas in db with the new fields required for the multi-user facility. The MySQL and Postgresql versions are for reference only, as users installing or upgrading and using either of those databases can use the command 'rake migrate' to populate or update their database with the correct schema.
Users of SQLite/SQLite3 will have to use the schema to update/populate their database manually. For now...


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@133 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-10 12:45:32 +00:00
bsag
47a60277ab Added the tmp.tmpl directory, as the directory 'tmp' is needed for storing session data in the latest version of Tracks. You need to copy this directory to 'tmp' before it will work.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@132 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-10 09:40:09 +00:00
nic
91641500a7 Merged tracks-mu-import branch changes r113:130 into the trunk
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@131 a4c988fc-2ded-0310-b66e-134b36920a42
2005-08-08 01:54:05 +00:00
bsag
2d2f9fcca8 Added a 'charset=UTF-8' meta tag to standard.rhtml as suggested by Gabriel Birke to fix problems with non-ASCII characters.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@111 a4c988fc-2ded-0310-b66e-134b36920a42
2005-07-17 11:24:24 +00:00
bsag
1d29f43785 Added Notes. These are added to a particular project, and displayed in summary form on /project/[name]. You can see all notes on /notes, and individual notes on /note/[id]. The latter two pages allow you to delete and edit the notes. The note body uses Textile/Markdown format.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@110 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-18 13:46:03 +00:00
bsag
bc978622e7 * Ambiguous wording "Add next action to this context" and "Completed actions in this context" was fixed on home page. Fixes #71
* Replaced the built-in Effect.Squish() effect on deleted and completed actions with Effect2.Fade() by [http://mir.aculo.us/effects/index.html Thomas Fuchs]. This looks much nicer, and doesn't generate the visual oddities that Kris noted. I've also added an Effect.Highlight for when new actions are added to help inform the user that something has happened.


git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@109 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-15 17:32:50 +00:00
bsag
f5053d60c2 Modified display of undone next actions to return the correct case for "actions" depending on whether there are none, many or one. Fixes #69.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@108 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-12 17:30:19 +00:00
bsag
dd255218b9 Replaced the disabled checkboxes in /projects and /contexts with labels (grey boxes with white text) denoting whether the context is visible or hidden and whether the project is active or completed. Fixes #67.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@107 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-12 16:36:55 +00:00
bsag
c7618cdc5d Oops. Got a bit carried away with the last commit, and hid completed projects from /projects listing. Put this right. (I'm ill and I should really get into bed...)
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@106 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-12 12:23:51 +00:00
bsag
3f90096bb8 Completed projects no longer appear in the Projects drop down on all the forms. Fixes #66.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@105 a4c988fc-2ded-0310-b66e-134b36920a42
2005-06-12 12:14:30 +00:00