arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity
2,342 Commits 9 Branches 6 Tags 30 MiB
fc503f505c
Commit Graph

248 Commits

Author SHA1 Message Date
dave
7fb84ea200 Apparently Safari takes the "email" seriously, and won't let anything go 
that isn't really an email.. no so good for usernames.  We need a "I
don't have an email" button  or somethign .
 2010-07-13 04:33:42 +00:00
dave
b6f43280d7 fix naming and types 2010-07-13 03:54:34 +00:00
dave
b1f2718a3c Users can login and logout and look at their home pages. 2010-07-13 03:30:11 +00:00
james
6021d9f486 Start implementing the secondary menu 
Fix importantdates div to not load when the div isnt there
 2010-07-12 20:29:20 +00:00
james
2c6a491710 Switch doctype to HTML5 
Properly float the important dates div
Remove table from page heading icon/title/help icon and use divs/floats instead
Temporarily make the login form post to the login.php page so one can still login
 2010-07-12 19:40:06 +00:00
justin
7b90784828 add support to link to fair website 2010-07-11 14:46:44 +00:00
james
5956a15754 Final UI changes for the day.... 2010-07-09 20:35:05 +00:00
james
39c8d90d1e More UI changes 2010-07-09 20:25:31 +00:00
james
5321de365f More UI recommendations 2010-07-09 19:24:04 +00:00
james
fe5b170371 Re-arrange some stuff as per new UI specs 2010-07-09 19:04:25 +00:00
james
16c5e8ecc9 Switch back to CSS layout 2010-06-28 18:00:47 +00:00
james
c086e7e0bb refactor config into config & super pages, 'config' page is now 'conference config' specifically for the conference, all non-conference related tasks are moved to the superuser page 2010-06-23 21:18:06 +00:00
james
4faa4b8dc4 Migrate all dates to use conferences ONLY, instead of dual conference/FAIRYEAR setup 2010-06-23 16:06:01 +00:00
james
e02e5ba687 Remove a bunch of conferenceid=0 checks -- we now always have a conference id 2010-06-17 21:14:00 +00:00
james
e98ec8751b add event types 
schedule shows event types in different colours
add tabs to schedule editor windor for each event type
forward port ENUM changes to tableeditor
fix bug in emit_minute_selector
 2010-06-14 19:25:49 +00:00
james
badea469f6 Switch hour and minute in the editor to dropdowns 
Fix passing extra parameters to emit_hour_selector
Allow emit_minute_selector to work with different minute intervals
 2010-06-11 20:04:51 +00:00
james
4edd9baad3 Working schedule event editor for adding, editing and removing events from the schedule. 2010-06-11 19:36:50 +00:00
james
ba20d1b974 Move session stuff up so it can be set before its used to determine the conference 2010-06-10 19:40:20 +00:00
james
122248a03c Move the conference block above the configuration/dates loading, so we can load the right dates for the conference (and probably soon, the right configuration variables too!) 2010-06-10 17:58:27 +00:00
james
86a43e909a Implement conference specific logos 2010-06-09 20:24:52 +00:00
james
4799b4ffd8 Add back the UTF8 database set names call, and switch all emails to use UTF8 encoding 2010-06-09 15:14:41 +00:00
jacob
6504d09886 Added updates for converting from Latin1 to utf8 character encoding 2010-06-04 20:23:59 +00:00
james
14308b5991 Start of adding 'conferences' and ability to switch between running conferences 2010-06-03 19:21:27 +00:00
dave
530788e1c5 Require that magic_quotes is OFF. 2010-04-18 22:40:07 +00:00
dave
29f799f0a2 Detect the award warning condition before printing the warning. About half of 
the BC fairs repeatedly tried to downlaod awards to make the warning go away.
 2010-04-02 05:19:33 +00:00
jacob
b632b6c932 Adding sortable columns to tables 2010-03-30 21:59:04 +00:00
james
ac10772214 Let everyone know that they need to re-download all of their awards before uploading will work 2010-03-30 17:45:37 +00:00
james
e18264232d CWSF divisions changed this year, hopefully we catch this before many fairs used it :( 2010-03-30 15:06:08 +00:00
james
cbab7c7fa8 also convert an ending </div> into a newline when converting html to text 2010-03-30 04:39:56 +00:00
james
3fce787126 Actually, wrap at 75 not 78, to leave room for a few quoted replies 2010-03-30 04:03:23 +00:00
james
3116d8f232 When converting HTML to TEXT, wrap at 78 chars, some mail servers wont accept emails with very long lines 2010-03-30 04:01:38 +00:00
dave
b49634f038 + and ^ are special cases, need to go at the beginning of a [] 2010-03-02 00:07:16 +00:00
dave
c09e70d3e6 + in the name, not the domain 2010-03-01 23:50:48 +00:00
dave
1e73f06d8b Allow + in email addresses 2010-03-01 22:17:38 +00:00
dave
a16e749d9f Remove debug line, fix tab indent 2010-02-23 19:58:07 +00:00
dave
c284fed0f5 Add a debug_() routine and use it in curl 2010-02-23 19:58:06 +00:00
james
f4d2d636d8 By default, turn ON all eligibility in divs/cats for downloaded awards.. so 
fairs don't wonder why they can't assign any winners to these awards.  In other
words, make it "just work".  :p
 2010-02-22 20:26:23 +00:00
dave
61aee7f487 Fix email checking (did we do this before and had to undo it for some 
reason?) Anyway, fraser valley had a student try to enter
"blah@blah.com/" as their email, which the isEmailAddress happily
accepted, and then remote servers started sending back errors to the
Committee because the email address is actually invalid.
 2010-02-20 00:45:59 +00:00
james
48361e5868 Use RFC822 file from RMail to parse out the proper return path and set it 2010-02-16 00:15:21 +00:00
james
ba8c8f91cb Set the return path and bounce-to for emails being sent out 2010-02-12 18:32:58 +00:00
james
3442c2347d Dont override the mail encoding as utf-8 - we now store it in the db as ISO, so just use that (the default) 2010-02-11 16:47:48 +00:00
james
29074faacd Move the content-type header out of send_header() so it sends it on ANY request that includes the common.inc (should be every request) 
This fixes french characters in all the new ajax'd editors, becuase they obviously werent calling send_header() on the request so the
encoding was defaulting to UTF8 and causing improperly encoded characters
 2010-02-03 16:20:23 +00:00
dave
7fc721b96f Add support for URLMAIN and URLLOGIN replacement in communications 2010-01-27 20:24:16 +00:00
james
3c364b84c6 oops forgot to commit the getUserForSponsor function! 2010-01-14 18:34:33 +00:00
james
617723cdbe A few more common html entities to convert to text 2009-12-03 21:13:31 +00:00
james
c0f6031904 FCKEditor always does UTF8, so force the Rmail encoding into that 
Also calculate the email TEXT from the email HTML, its not perfect but pretty darn good.

TODO: need to do an update script that converts the encoding of ALL existing emails in the databse from ISO-8859-1 to UTF-8
DO NOT UPDATE TO THIS VERSION UNTIL I CAN ADD THAT CONVERSION SCRIPT
 2009-12-02 23:11:25 +00:00
james
99114c7242 Completely convert the old communication module over to the new system... (almost). 
TODO: switch the "send" to the new dialog-style preview and confirmation, instead of the old one, but at least it works!
 2009-12-02 22:17:20 +00:00
james
838f61a948 Working email sending from fundraising module, and implement new emailqueue system. None of the existing emails are migrated to the new system yet, and both old and new work in parallel until we can finish migration 2009-12-01 22:02:03 +00:00
dave
f67b485d6d - Separate the icons out of the colour themes 
- Detect the theme directories and use dropdown boxes to select the theme and theme_icons, so no one can type in random stuff and screw their sfiab.
- Add 2 missing icons.
 2009-11-06 22:10:06 +00:00
dave
3bead26bf8 - This is important for the last commit 2009-11-06 08:24:31 +00:00
james
bd2eede7fa jquery local for popup windows too 2009-10-28 18:52:38 +00:00
james
b629e511bc Use local jquery 2009-10-28 18:51:02 +00:00
james
5da58aeb12 Add a fundraising reports MOCKUP page so carolyn can take screenshots and link it into the menu 2009-10-16 15:43:26 +00:00
dave
52b7580dcb - Replacement for PDF generation. 2009-10-16 06:16:48 +00:00
dave
cf5c31464e - Add a #content iframe to the toplevel, hidden, width,hight=0,0 
- Add a report generator dialog box that uses the content iframe for file downloads
- The content iframe also works for creating dynamic content
- Try to make FCKEditor work with jquery, it still doesn't.  The content of FCKEditor isn't passed
  through serializeArray it seems.
 2009-10-15 07:11:43 +00:00
james
027c03b297 - commit all outstanding changes 2009-10-14 19:53:09 +00:00
james
8ea2823bf1 bloody hell.. more renaming Campaign->Appeal, Goal->Purpose 
Begin the actual donations/sponsorships page for donors
Remove students from prospecting, set it to alumni, which wont be active for a while
 2009-10-09 20:25:01 +00:00
james
6c61b26b1f Update fundraising dashboard tables to be live 
Add a colour_to_percent converter to calculate colour ranges between 0 and 100, ranging from red to green through yellow
Remove the query output from donors search results
 2009-10-06 21:00:12 +00:00
james
1fa368293f Create fundraising setup page 
Move fundraising levels editor into the setup
Remove the old level editor
 2009-10-02 19:21:43 +00:00
james
01fde584be Do a lot of database re-working, renaming and reorganization 
Database now refers to everything by donor/donation .. and apparently just as i complete this, carolyn has decided to go to both donor/sponsor instead of just donor.. ugh..
 2009-10-02 16:46:13 +00:00
james
0cb0ab36f4 Switch the default theme as per carolyn's suggestion 2009-10-01 20:30:15 +00:00
james
336fc8637f Oops link to proper files 2009-10-01 17:08:56 +00:00
james
2d24c48e13 Add a module-based menu, based on the second level nav name. this is most likely temporary until we re-do the side menu, but at least its there for now as i have to move on with the actual coding of the fundraising module! 2009-10-01 17:05:11 +00:00
dave
d821a6402e - Reverse the calling order too 2009-09-25 22:43:50 +00:00
dave
aecbabbb4a - reverse the timeout and i18n_array args, i18n should go first as it will be 
used much more often.
 2009-09-25 22:43:12 +00:00
dave
b0e7715fb9 - Turn fair_save into an ajax query 
- Add notification area and debug to the popup window, still an ugly hack.
- Add a checkbox to the feeder fair config to enable/disable the whole thing (will confuse people less, needs to be implemented)
- Also add a checkbox for signaling the feeder fair if there are additional materials for an assigned award.
 2009-09-23 16:42:24 +00:00
dave
e07d24102c - Well, disabling the fields was a good idea, exept that serialize() skips over 
the value but not the name, so it sets every disabled field to "" when
  passing the data to mysql.
 2009-09-20 19:25:42 +00:00
dave
20fe1d8b13 - Switch to a global message status area 2009-09-18 03:29:13 +00:00
dave
792a581357 Put the debug DIV in a sensible location 2009-09-17 06:48:52 +00:00
dave
d2535f46bc - Add status area on each page for award div 
- Redirect all ajax load output to a debug div (which can be turned on with
  debug=true).  The output has to go somewhere, and it can't go to the
  notification div, because it will overwrite what's already there.  The ajax
  methods emit javascript now to add notifications.
 2009-09-13 19:25:03 +00:00
dave
1f830c7845 - Proof of concept floating status messages that go away after a timeout, in 
the same approx. spot that SFIAB has always put status messages.
 2009-09-13 08:33:54 +00:00
dave
8f29090c38 - Load .js for popups too, but pretty soon we won't need this popup function at all. 2009-09-11 06:11:43 +00:00
james
bef9c279ec rework/rename the translationeditor 2009-09-11 05:33:41 +00:00
dave
8b7a6e14b3 - Convert the popup to use the jquery ui popup 
- Theme the whole thing
- Remvoe the translation dropdown support for now, it's causing a spurious reload replacing the endire page with a clickable "translations" link
- Add code for the prize editor, not done yet.
 2009-09-09 17:06:11 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
james
bf58a9d78b Make the Help button work on all of the sfiab.com sites because of the mod-rewrite REDIRECT_URL 2009-01-27 21:52:11 +00:00
james
fde29e7a91 Migrate 1320 from branch into HEAD 2008-11-02 02:35:46 +00:00
james
ffa116bb5d Add backup/restore functionality - need to add icon still 
Fix bug where title was leaving room for an icon even if there was no icon
 2008-09-24 21:56:11 +00:00
james
09be3848ff Look in the right location for the fair logo image file from the content management page display 2008-08-28 22:14:17 +00:00
james
b2fb7855f0 Make format_date, format_time and format_datetime accept either a unix timestamp, or a text string 
switch important_dates to use format_datetime
 2008-08-28 22:11:10 +00:00
james
c45edf34ec Add a format_date, format_time and format_datetime functions to pull from the localization settings and update a few places where the date/times are output to use them... need to change everywhere else in the codebase to use these functions too! 2008-08-28 22:02:06 +00:00
james
9995867f1d Add countries table and populate 
Add countries_code field to provinces table and fix canadian provinces
Populate US States into provinces table
Add config option to Localization tab to enter a 2 letter country code (how to lookuup from countries table?!)
Update emit_province_selector to use country config entry
 2008-08-28 21:41:31 +00:00
james
eb2128da25 Update send_header() for a third parameter of the icon to use 2008-08-22 20:35:08 +00:00
james
7e84ab0222 Add cms table, and move the 'index' pagetext to cms 
Add .htaccess rules for the cms
Add cms page display code and convert index.php to pull from the cms
If no page title is passed to send_header(), output the fair name in the <title> tag
 2008-08-19 21:13:29 +00:00
james
3992b68029 Update page text's to do multiple languages, instead of storign the text's in the separate language editor 
Also - force it to use the newly auto-installed fckeditor, and reduce the height a bit becuase there's now
more than one per page.
 2008-08-18 21:08:23 +00:00
james
517455ee13 Migrate css to a theme and setup to allow multiple themes 
Begin adding icons to the default theme and reorganizing the admin index
 2008-07-24 16:20:16 +00:00
james
651d6235a4 Add config options for Province/State and Postal Code/Zip Code 2008-07-16 17:23:53 +00:00
dave
6d3f518648 - Fix the multiple cookie bugs if SFIABDIRECTORY=='' and the user visits 
'/admin' or some other subdir first.  Setting the cookie directory to ''
  seems to mean that PHP sets it to the current directory.  We want it to be
  set to '/'.
 2008-03-30 18:42:15 +00:00
dave
fc4de718f0 - Use a &raquo; character instead of >> for menu position. 2008-02-04 23:40:26 +00:00
james
1ae2b2e779 Better display of development versions, and make the DEBUG session output easily switch on-off-able by passing in ?debug=true or ?debug=false to any page. 2007-12-20 22:39:21 +00:00
dave
8c42e853af - Handle type/stock for custom reports properly 
- Convert reports.php to use SESSION based status messages.  Just to try it
  out.
 2007-12-20 18:44:28 +00:00
james
9a7383f552 How'd that / sign get in there, it should be a . to concatenate 2007-12-20 14:48:02 +00:00
james
00eed557cd Move the contact link out of the centered div, so it looks like the rest of the menu items 2007-12-13 19:54:19 +00:00
james
6c864d1b93 Bump version for development 2.1.7 
Create page text entry for 'invite only' volunteer registration
Create a contact page to contact committee members, and link it into the committees page, and the bottom of the left side menu
 2007-12-13 19:52:27 +00:00
dave
57f349b1b1 - Add a year field to the users db, we'll need it eventually 
- Add a designate field to the schools, to indicate an independent, standard,
  private, etc. school.  It's not editable yet, but.. eventually.
- Fix generatePassword to use proper string indexing, and remove the
  possibility of indexing beyond the end of the string.
- Add "Invite" and "SinglePassword" modes for volunteer registration.
- Update the admin section, add a new volunteers page to contain links to all
  volunteer options
 2007-12-13 18:09:22 +00:00
dave
9fffa6755d - Call them 'fair's not 'region's.. to assist linking fairs together. 
- This patch references some config variables that don't exist yet, that's ok,
  we dont' want anyone turning these on yet.
 2007-12-12 04:15:17 +00:00
james
d024d30793 Revert the isEmailAddress change so emails will actually send out again 2007-12-09 22:18:29 +00:00
dave
3479ab4e7f - Add missing i18n() to the top bar 2007-11-23 20:56:59 +00:00
dave
071ded90b0 - Remove "Home >>" from the top nav bar, and simplify the logic 2007-11-23 20:55:29 +00:00
dave
3ba0d061f7 - Remove auth_has_access($access) completely, use 
committee_auth_has_access($access) now.
- Remove unused committee_login and committee_auth.php
- Simplify the left bar logic for the committee links
 2007-11-21 07:41:09 +00:00