Picnik.com is a good online-base photo editing site. Very simple, and I really enjoy using it. That speaks a lot for it as I'm not a computer-savvy person and really don't 'enjoy' using a lot of these programs. :)
Hmmm....I'd probably agree that Picasa and picnik are your best bets if you want simple. I don't use them myself, since iPhoto does all the simple editing I need quite well.
What software were you using on your laptop to edit?
I'm with natalya1905 picasa (free download) on the laptop for organizing photos, initial editing and picnik (free online program) for sizing, adding borders, final editing to 1000 pixels.