Skip to content

Commit 8d4d7ca

Browse files
author
Éric Cholet
committed
Merged revisions 1959,1962-1965,1967,1977,1979,1983,1990-1993 via svnmerge from svn://svn.mongueurs.net/act/trunk
........ r1959 | eric | 2008-07-27 23:05:05 +0200 (Dim, 27 jul 2008) | 1 line stable branch changes update ........ r1965 | eric | 2008-07-31 00:14:52 +0200 (Jeu, 31 jul 2008) | 1 line remove unused admin templates ........ r1977 | eric | 2008-08-04 07:53:08 +0200 (Lun, 04 aoû 2008) | 1 line doc update ........ r1983 | eric | 2008-08-06 15:32:50 +0200 (Mer, 06 aoû 2008) | 1 line document ICal export/import workflow ........ r1993 | eric | 2008-08-09 21:43:41 +0200 (Sam, 09 aoû 2008) | 1 line doc update ........ git-svn-id: svn://svn.mongueurs.net/act/branches/stable@1994 67b57a05-4208-db11-a765-00306e02d86a
1 parent 06c1422 commit 8d4d7ca

File tree

9 files changed

+49
-143
lines changed

9 files changed

+49
-143
lines changed

Changes

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@ Changes in Act
22

33
[main changes only -- see http://svnweb.mongueurs.net/Act/log/branches/stable for full list]
44

5+
2008/08/09 r1992 personal schedule
6+
wiki diff between pages
7+
enhance schedule ICal export
8+
9+
2008/07/15 r1943 use Email::* modules (and sendmail) to send email
10+
11+
2008/05/07 r1917 new purchasing features:
12+
multiple products (e.g. registration, classes, accomodation)
13+
each purchase can contain one or more products
14+
each product can have one or more prices
15+
users can issue multiple orders: they can purchase products any time payment is open
16+
prices can be protected by promo codes
17+
allow gratis prices
18+
19+
2008/04/26 r1874 OpenID server
20+
521
2008/04/11 r1850 Croatian translation
622

723
2008/03/24 r1844 permalinks for news items

TODO

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@ UNPRIORITIZED TODO LIST
1414

1515
* schedule columns should be fixed width
1616

17-
* allow several commits layout
18-
(e.g. see http://www.yapceurope.org/2006/talk/schedule/1.html)
19-
2017
* replace login with email address
2118
the display name would be nick_name, pseudonymous would be the default behavior
2219

23-
* iCal talk export should be in conference timezone
24-
25-
* add a "Powered by Act" somewhere (Maddingue)
26-
2720
* display a nicer page for expired twostep urls, instead of 404 (rjbs)
2821

2922
* let the organizers force the registration of existing users
@@ -101,10 +94,6 @@ UNPRIORITIZED TODO LIST
10194
* hackathons do not have talks. Support that by disabling the talks
10295
related handlers.
10396

104-
* allow a conference to put a limit on the number of "paying" attendees
105-
=> it may actually need to be a limit to "committed" attendes, since
106-
speakers often have the entrance fee waived
107-
10897
* handle the edition of lightning talk sessions, by creating something
10998
less burdensome than the current talk:id
11099

@@ -120,9 +109,6 @@ UNPRIORITIZED TODO LIST
120109
accommodation and the like. Registration for a specific event shouldn't
121110
include information which is irrelevant to that event.
122111

123-
* Closing Date
124-
It should be possible to close registrations before the event start date.
125-
126112
* Optional SSL Protected Admin Login
127113
There should be an optional SSL protected login option, at least for admins,
128114
allowing them to login to the website without being evasedropped.

lib/Act/Manual/Organizer/Schedule.pod

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=head1 Managing the talk schedule with Act
22

3-
Act automatically creates a schedule web pages from the talks information.
4-
This informations is also made available in the iCal format.
3+
Act automatically creates a schedule web page from the talks information.
4+
The schedule is also made available in the ICal format.
55

66
=head1 GENERAL SCHEDULE TIPS
77

@@ -159,4 +159,35 @@ in the database.)
159159
And here is the result:
160160
L<http://conferences.yapceurope.org/fpw2005/event/43>.
161161

162+
=head1 Using calendar software
163+
164+
People with the C<orga> bit set can work with Act talks, both pending and accepted,
165+
scheduled and unscheduled, using calendar software such as iCal or Google Calendar.
166+
167+
=over 4
168+
169+
=item *
170+
171+
Use "iCal export" to export talks to an .ics file.
172+
173+
=item *
174+
175+
Import the .ics file into your calendar software.
176+
Unscheduled talks will be set to a default date.
177+
178+
=item *
179+
180+
Compose the schedule by move talks around in the calendar software.
181+
182+
=item *
183+
184+
Export the calendar to an .ics file.
185+
186+
=item *
187+
188+
Upload the .ics file to Act using the "iCal import" feature.
189+
Act then updates existing talks' start date and time with new values from the uploaded file.
190+
191+
=back
192+
162193
=cut

lib/Act/Manual/Organizer/Templates.pod

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -389,52 +389,5 @@ becoming as harmless as possible.
389389
=back
390390

391391

392-
=head2 The F<B<admin.html>> Template
393-
394-
This template depends on the F<admin/users>, F<admin/talks>, F<admin/money>,
395-
and F<admin/rights> templates, and is just a wrapper arround them.
396-
397-
=over 4
398-
399-
=item * F<B<admin/users>>
400-
401-
This template only shows content if the C<global.request.user.is_orga()> method
402-
returns C<true>. Or, in other words, if the user is a organizer for this
403-
event.
404-
405-
Builds the administrative B<users> menu. There is only two items on this menu,
406-
linking to B<create> and B<export> pages for the event.
407-
408-
=item * F<B<admin/talks>>
409-
410-
This template only shows content if the C<global.request.user.is_orga()> method
411-
returns C<true>. Or, in other words, if the user is a organizer for this
412-
event.
413-
414-
Builds the administrative B<talks> menu, showing talks and events associated
415-
with the current event. There are three items on this menu, the first one
416-
to B<ical_import> page, one to the B<events> page and the last one pointing to
417-
B<newevent> page.
418-
419-
=item * F<B<admin/money>>
420-
421-
This template only shows content if the C<global.request.user.is_tresaurer()>
422-
method returs C<true>. Or, in other words, if the user is a tresaurer for this
423-
event.
424-
425-
Builds the administrative B<Tresaurer> menu, offering links to B<payments>, and
426-
B<csv/payments> pages, destined to tresaurer use.
427-
428-
=item * F<B<admin/rights>>
429-
430-
This template only shows content if the C<global.request.user.is_admin()>
431-
method returns C<true>. Or, in other words, if the user is an administrator for
432-
this event.
433-
434-
Builds the administrative B<Admin> menu, offering a single link to the
435-
B<rights> page, for user role management.
436-
437-
=back
438-
439392
=cut
440393

templates/admin.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

templates/admin/money

Lines changed: 0 additions & 15 deletions
This file was deleted.

templates/admin/rights

Lines changed: 0 additions & 13 deletions
This file was deleted.

templates/admin/talks

Lines changed: 0 additions & 23 deletions
This file was deleted.

templates/admin/users

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)