Commit graph

2089 commits

Author SHA1 Message Date
adb051f42f Add track tag for subtitles; make source tag HTML5 closed. 2022-05-12 15:59:53 -07:00
ba6f17394e Sustainer page — note about video; frontpage — wider; add youtube
Link to the Youtube version for browsers where <video> element
doesn't work.

Note on the sustainer page that folks should watch it to learn about
us.

Widen into the big box on front page.
2022-05-12 15:39:29 -07:00
4a7cbb6845
put intro video on first page and replace holiday card 2022-05-12 15:26:51 -07:00
cf36479427 Correct email addresses for copyright assignment form. 2022-05-02 08:23:24 -07:00
f0e7f5736c Make copyright assignment area live. 2022-05-02 08:05:02 -07:00
2a52ce5084 Remove various folks no longer involved with organization. 2022-04-13 11:33:20 -07:00
bac40a5f97 Link to article in the Register about Neo4j and AGPLv3 2022-04-08 05:20:21 -07:00
26a78afbfa
add taxinfo gpg key and update robots.txt with it 2022-03-31 12:53:38 -07:00
951682828c Switch alert box to talk about Neo4j 2022-03-30 10:31:38 -07:00
e162fec26d Financial — CHAR500 — correct name, it's not CHAR-500
It seems NYS doesn't put the hypen between “CHAR” and “500”, even
though we always did on these pages.  I'm not changing the names of
the old files in docs/, as it doesn't seem worth it, but I did change
the textual description inside the anchor tags.
2022-03-25 13:05:40 -07:00
675a1267ad Financial — FY 2020 — fix link to CHAR500
The document was already in the docs/ directory, there was just a
typo in this link here.
2022-03-25 13:04:55 -07:00
9be3344544 FY 2019 — Form 990 & CHAR500 — add PDFs and links to them. 2022-03-25 12:57:00 -07:00
869a7580ac Add deadline details on FY 2021 that just ended last month. 2022-03-25 12:57:00 -07:00
c38bd4cf35 Remove needless blank lines. 2022-03-25 12:57:00 -07:00
6b1ed75d7a
Handle UnicodeEncodeErrors from junk URLs. 2022-03-15 10:59:47 +11:00
90e75a3007
update jmp logo 2022-02-15 11:58:19 -08:00
88a491e291 Fix minor typo. 2022-02-01 17:19:49 -08:00
ec5d1a0ff0
assignment: pluralize copyrights, assign right for existing claims. 2022-02-02 09:31:25 +11:00
e3da223f8e
add open letter to front page of website 2022-02-01 09:46:05 -08:00
45fb3444b6 PDF of Open Letter to Biden administration 2022-02-01 09:11:07 -08:00
75eef37ddc
remove deb from eval, and some projects 2022-01-21 13:17:30 -08:00
71a9e62085 Financial — FY 2020 — CHAR500 — Add document to transparency page
Also, apparently NYS writes “CHAR500” not “CHAR-500”.  🤷
2022-01-19 08:23:27 -08:00
3416e8670f Financial — FY 2020 — Form 990 — List document on Transparency page 2022-01-19 08:16:39 -08:00
27cbe02650 Financial — Audit — FY 2020 — put audit report on Transparency page. 2022-01-19 08:11:26 -08:00
036589001e HTML formatting errors (stray tags) 2022-01-19 08:06:50 -08:00
5ead0257ae Financial — Audit — FY 2019 — Add audit report to Transparency page 2022-01-19 08:06:32 -08:00
ecaa98c375 Transparency — correct out-of-date details regarding filings. 2022-01-18 18:08:34 -08:00
5bef923cfe
Revert local development settings committed.
This reverts commit adf2229720.
2022-01-11 09:17:55 +11:00
adf2229720
Rename __unicode__ methods to __str__ following Django upgrade. 2022-01-11 09:13:46 +11:00
60616f4226
mdash html typos 2022-01-05 10:06:33 -08:00
f8f3cb2f36
increase font size for full match 2022-01-04 15:42:03 -08:00
7a49bf08d6
separate divs and add css for exceeded 2022-01-04 14:34:28 -08:00
c586ffb383 Make additional bar when time left with donation exceeding goal
This is a first draft of making another bar appear after the
completed "matched!" bar that will show how much extra we've gotten
beyond the match amount.
2022-01-04 14:05:16 -08:00
f22dd3306b
fix link to vizio update 2022-01-04 07:19:49 -08:00
59b705aac1
move holiday banner and put motion to remand info 2022-01-03 15:42:59 -08:00
2a808a58c6 Fix the anchor. 2022-01-01 20:19:21 -08:00
9b63f8642f
grammar fix 2021-12-29 10:29:38 -08:00
385863c6e7
change language around $1.7m 2021-12-29 10:20:42 -08:00
0d8ecb8471
add motion to remand to frontpage and update TotW 2021-12-28 18:07:57 -07:00
a4690092b5 Restore anchor for Supporters; #supporters URL links may be common 2021-12-27 13:01:28 -08:00
801b145757 Remove holiday greeting from every page. 2021-12-27 09:40:02 -08:00
a3b10fc24c Even more space is ok here. 2021-12-24 17:33:14 -08:00
792892b4dd Take up more of the screen. 2021-12-24 17:29:29 -08:00
d0045a9e7d Add CCS and add video to sustainer page. 2021-12-24 17:28:03 -08:00
60147dba8b Formatting improvement. 2021-12-24 17:23:55 -08:00
351e3dcb20 Use video tag instead of image with a link to the video. 2021-12-24 17:22:09 -08:00
b2be8f14e5 Remove stray character. 2021-12-24 17:17:12 -08:00
a543d38cb3 Slightly better formatting. 2021-12-24 17:16:35 -08:00
208dfe2681 Correct location of link. 2021-12-24 17:11:32 -08:00
7fe9c07ceb Add holiday card to banner at top for next few days
Also, fix a few URLs .
2021-12-24 17:08:47 -08:00
0db5e00516
visual postcard link and add to /sustainer 2021-12-23 16:52:45 -05:00
81cbfc96c4
add postcard to frontpage 2021-12-23 15:10:47 -05:00
cced60976a
add 2021 video postcard 2021-12-23 10:57:00 -05:00
ec780ab15f
add 2021 holiday card 2021-12-21 07:43:13 -08:00
e3e9493944
Merge branch 'ben/copyright-assignment' 2021-12-18 09:24:30 +11:00
9b7e412a40
assignment: Fix typo noted by Pam. 2021-12-18 09:22:21 +11:00
1c38ad0179
Revert removal of "safe" template tag from blog/news headlines.
Conservancy use HTML entities in their titles.
2021-12-18 08:58:53 +11:00
3227e4ce9f
remove number of sustainers 2021-12-17 09:43:02 -08:00
14abe07a4a
Remove unnecessary use of "safe" template tag.
This tag marks a variable as not requiring escaping by the template engine,
potentially creating cross-site scripting vulnerabilities, so shouldn't be used
unless absolutely necessary. In these cases, I don't think it's necessary.
2021-12-17 21:55:47 +11:00
d11ed137fa
Fix Django warning about old TEMPLATES_* settings. 2021-12-17 18:35:50 +11:00
b2e952f3b8
Fix URLconfs causing Django check warnings. 2021-12-17 18:14:50 +11:00
97899caf78
Remove URL slash prefix. 2021-12-17 17:27:26 +11:00
e9df3a0d7e
Remove unnecessary null=True on ManyToManyFields. 2021-12-17 17:25:38 +11:00
47fa2b3623
Disable copyright assignment URLs until we're ready to launch. 2021-12-17 16:56:07 +11:00
1ce6f36532
Merge branch 'ben/copyright-assignment' 2021-12-17 16:54:47 +11:00
7374c9f915
assignment: Accept current date anywhere on earth. 2021-12-17 10:54:47 +11:00
6e380dba29
assignment: Apply further wording updates from Pam/Denver. 2021-12-17 09:53:13 +11:00
c23f799fa1
add employer matching to /donate 2021-12-16 13:51:24 -08:00
26ac00e864
assignment: Allow today's date. 2021-12-11 11:29:13 +11:00
52c0eb8e6c
assignment: Mention 7 days on form. 2021-12-11 10:40:07 +11:00
c9a76ea17f
assignment: Fix period ends in email. 2021-12-11 10:25:57 +11:00
b0263491a0
assignment: Validate that end date is provided if you didn't choose open-ended. 2021-12-10 18:37:13 +11:00
530890f6ad
assignment: Apply Denver's requested changes. 2021-12-10 11:33:37 +11:00
c6b329f0cf
Fix validation. 2021-12-07 17:49:57 +11:00
3272a25a8d
Remove redundant call to super(). 2021-12-07 17:06:37 +11:00
35a8de7f07
Add missing template. 2021-12-07 17:02:04 +11:00
0565f9b308
Update the assignment form with feedback from Pam/Denver. 2021-12-07 16:55:45 +11:00
2b1fd9ab90
Add assignment date range. 2021-12-07 09:59:40 +11:00
e1481ce55e
Add migration. 2021-12-07 09:59:40 +11:00
780e0b8dbf
Add assignment thanks page. 2021-12-07 09:59:38 +11:00
a53a4560cd
Add assignment template. 2021-12-07 09:58:56 +11:00
a2675ee029
Prototype copyright assignment form. 2021-12-07 09:58:47 +11:00
32da708977
fix formatting for first <ul> and h4 2021-12-06 12:43:58 -08:00
035b55fb9e
add new articles to press coverage 2021-12-06 12:35:53 -08:00
45d2e0782b
Fix Unicode encoding issues. 2021-12-03 16:01:21 +11:00
5dcf4acbb3
Fix CSS selector. 2021-12-03 15:36:16 +11:00
80fd409ade
Fix Vizio CSS selector. 2021-12-03 15:19:28 +11:00
3c8f363537
Add selected highlight to top feature menu. 2021-12-03 15:04:54 +11:00
2a1e00eee2
Add missing forms.py. 2021-12-03 11:58:26 +11:00
889dbcf38c
Remove type annotation. 2021-12-03 11:43:01 +11:00
9a06def0e7
Add simple CCS upload (no JavaScript). 2021-12-03 11:38:21 +11:00
e11e6ff451 Update glossary term of the week to CCS. 2021-11-30 06:23:22 -08:00
1408bafea5 Shorten DMCA text in the call-out since news is getting stale. 2021-11-30 06:23:22 -08:00
c472eaeebc Remove stray “ 2021-11-30 06:23:22 -08:00
a45fcb395b
Remove problematic call to decode(). 2021-11-30 17:35:55 +11:00
2d078b0004
Apply futurize --stage-2 Python 2/3 compatibility transformations.
These changes specifically require the use of the "future" library.
2021-11-30 07:55:45 +11:00
457e5739f7
Add unique constraint to Staff.username.
Previously had some duplicates for "pono" which were causing
MultipleObjectsReturned errors. A username is generally considered to be unique.
2021-11-29 14:31:26 +11:00
843b24c63a
Don't send email notification on DisallowedHost error. 2021-11-29 14:21:14 +11:00
9b48cc94e6 Continuing saga of the sizing chart problems for original shirts
Gildan removed the sizing chart entirely from their website again
after yet another redesign.  Originally, we deep-linked into files in
their CDN for the charts, but it appears that in 5c72071 that I
introduced cut-and-paste error on the sizing charts.  I cannot find
the original links, but finally I simply decided we'd mirror the
files in our CDN, which is where these now link to.

I suspect that I didn't do this to start for worrying about copyright
infringement, but upon second thought, I think it's very reasonably
fair use for us to distribute these images.  We bought a lot of
t-shirts from Gildan and just trying to sell through.
2021-11-27 10:51:51 -08:00
f13940777f
Remove duplicate copy of manage.py. 2021-11-26 14:04:43 +11:00
7b981fcb52
Add a missed "object" change. 2021-11-26 14:03:24 +11:00
31e51a7742
Apply "object" changes only from futurize --stage2. 2021-11-26 13:49:40 +11:00
05bee8b3c3
Apply futurize --stage1 (safe) Python 2/3 compatibility changes. 2021-11-26 13:00:20 +11:00
69725698ae
Fix a encoding issues for future Python 3 support. 2021-11-26 12:41:27 +11:00
4c3661ad19
progress bar: Remove display-table vertical align workaround.
Was causing some display glitches on some browsers. Using nested flexbox instead.
2021-11-26 09:10:25 +11:00
a6dcb714b8 Remove one event per discussion with karen. 2021-11-23 10:12:55 -08:00
c4e1752a06 Rewrite help us continue and t-shirt sections. 2021-11-23 10:11:03 -08:00
a4df264490 Rewrite “Writing and Speaking” 2021-11-23 10:02:39 -08:00
9c3e362f93 Make the pun clearer with caps and quotes. 2021-11-23 10:02:22 -08:00
c951623774 Rewrite “New Staff” 2021-11-23 09:56:17 -08:00
38183285a9 Remove word "member" 2021-11-23 09:56:06 -08:00
5c9f70af7b Rewrite “Highlights from some of our member projects” 2021-11-23 09:49:24 -08:00
7e06d262ee Rewrite of “Our Year in Review” section; add links as well. 2021-11-23 09:25:41 -08:00
d1cc382a01 Reword opening sentence, add links as discussed in XMPP 2021-11-23 09:06:10 -08:00
02d8a44f83
add copy for 2021 donation page 2021-11-23 07:58:40 -08:00
1ddcb2e4ba
Move fundraising goal end times into database. 2021-11-19 17:56:44 +11:00
b4c438322c
Fix markup errors on "What We Do" causing layout issues. 2021-11-19 17:14:29 +11:00
68f5f1fa2c
Move sub-menus to RHS and re-enable on mobile. 2021-11-19 17:02:59 +11:00
26ff31bb78
progress bar: Drop JS, make mobile friendly, match design to new site.
The existing jQuery UI-based fundraising progress bar used a float layout,
making it hard to adapt for mobile use. Given that there is not interactivity,
I've dropped all the JS and switched to a flexbox layout. This works well
because the bar will stretch to fit the text rather than always maintaining its scale.
2021-11-16 13:25:39 +11:00
6bdc205e6a
update term of the week 2021-11-08 13:08:03 -08:00
b61d158ea9
make header box a link 2021-10-28 14:33:23 -07:00
29a4296f14
errant ) in link 2021-10-28 14:03:32 -07:00
0cbd204e2f
fixed wrongblurb, resetting vizio and replacing truth social 2021-10-28 13:57:08 -07:00
f820eddaff
change frontpage blurb to be about DMCA exemptions 2021-10-28 13:18:53 -07:00
bbc6eb13c6
fix mastodon link on frontpage 2021-10-25 10:45:50 -07:00
beb0dbfd82 Add <p> tag for my bio. 2021-10-23 17:58:44 -07:00
720b91a8cf Put complaint with journalist resources on main page. 2021-10-23 17:44:16 -07:00
7efaadaf0c Not necessarily third-party. 2021-10-23 17:42:37 -07:00
2290846c21 Shorten box on front page a bit. 2021-10-23 12:52:27 -07:00
399675d6c3 Rework blog menu order. 2021-10-23 12:50:28 -07:00
7229e78e0f Sidebar should disappear on small screens.
We've had a report that the sidebars are very distracting,
particularly for the blogs, on smaller screens.  This change to the
CSS will cause sidebars to disappear on smaller screens.
2021-10-23 12:42:59 -07:00
91d661f715 Conform title to title of blog post. 2021-10-22 14:23:39 -07:00
ee667f6179 Slug change propagation to static pages. 2021-10-22 14:20:33 -07:00
1b8a709d0c Make box smaller. 2021-10-21 20:47:51 -07:00
ec2cd619f2 Add additional call-out for current blog post. 2021-10-21 20:38:52 -07:00
eb6fc77708 Remove "The"s from top menu. 2021-10-21 20:36:41 -07:00
1bee33f278 Format like previous with the <p> solution
<ul> is the right HTML way to format these, but they are all too
close.  Get it to look more like it did with <p>'s with CSS.
2021-10-21 20:36:41 -07:00
eb847f9f32 Use typical way of putting the category in a block.
Django is so frustrating as it's never clear about how things trickle
up and down through templates, so move the category to the top like
the others.
2021-10-21 20:36:41 -07:00
501b6e091b
Merge branch 'master' 2021-10-21 13:56:05 -07:00
798d4aee8f
fix sustainer text and button for sustaining 2021-10-21 13:55:13 -07:00
1f6e2156f4 Additional fixes for menu items related to news and press
A few additional places where the news and press pages were not
properly menu integrated.  This fixes various inconsistencies and
missing category and submenu markings in menus.
2021-10-21 12:40:09 -07:00
a80c95fd13 Fix minimal start of ourcoverage.html and correct various problems
ourcoverage.html was a reasonable minimal start but not really ready
for production.  Make changes necessary to put this into production,
as follows:

  * Rename ourcoverage.html to vizio-coverage.html.  This is just
    Vizio coverage for now.

  * Order articles by most in-depth/interesting.  Verified this
    ordering by consensus with Conservancy staff.

  * mailto: link for press coverage on the main inthenews page, but
    don't use that on Vizio page; it's unlikely we'll miss any of the
    Vizio coverage.

  * use &mdash; instead of -

  * put quotes around article titles.

  * Add missing PR Web article

  * Switch from <p>'s to <li>'s in vizio-coverage.html

  * Fix menu issues.  09a4b02 outlined the issues regarding how to
    add items to menu; it does require a CSS change as explained
    therein; merely using the right `base_` is not enough

  * Improve menu integration.  Per PR people's recommendation, the
    Vizio stuff that also goes in other areas needs to be placed in
    multiple menus.
2021-10-21 12:34:22 -07:00
ee348bf69b
add bkuhn to /press and fix sustainers button 2021-10-21 12:18:26 -07:00
6fbf8b0690
Merge branch 'pono/supporter-updates' 2021-10-21 11:41:47 -07:00
88b57b2f32
formatting tweaks for /press 2021-10-21 11:40:35 -07:00
4c00e4e4af
create page for Our Coverage 2021-10-21 11:34:34 -07:00
63dee11c8a
fixup /press from Hannahs notes
a few s/supporters/sustainers/
add link to inthenews
update news and press menu
2021-10-21 11:29:40 -07:00
5348aae07b
add text describing sustainers 2021-10-21 10:39:32 -07:00
a90f18d77c
change svg to sustainer and remove tonys pic 2021-10-21 10:24:58 -07:00
4b99b5a1a7
delete 2020 donation text 2021-10-21 09:07:30 -07:00
4daf268345
new supporter image 2021-10-21 08:57:59 -07:00
3acdadcacc Learn page is not coming soon anymore! 2021-10-21 08:46:07 -07:00
357aacf99c Vizio — For compliance only, note resources are for Vizio
The Resources for Journalists are only related to Vizio, so make that
read that way on compliance pages that *are not* Vizio pages.
2021-10-21 08:45:08 -07:00
09a4b021c1 Repair menu highlighting, both for main menu and submenus
During the recent improvements made on the website, the menus and
submenu highlighting for selected menus fell into disarray.
Correction requires changes to the CSS and templates both, because
Django doesn't really have a convenient way to set variables in
templates to use to solve this.

There are still a few submenu items highlighting not working even
after this commit.  More work needs  to be done.
2021-10-21 08:39:47 -07:00
46adf33eb3
simplify /about, fix formatting on frontpage, svg img for supporters 2021-10-21 08:36:23 -07:00
814b629006 Copyleft Compliance — Vizio — update title to match newswire version 2021-10-21 07:21:28 -07:00
90928718b9 Copyleft Compliance — Vizio — add missing CSS menu item thing 2021-10-20 07:49:45 -07:00
3372ad11ef Copyleft Compliance — Vizio — Shorten a few menu item names. 2021-10-20 07:49:01 -07:00
8cc5c86d72 Copyleft Compliance — Vizio — Improvements to Menu selection. 2021-10-20 07:41:58 -07:00
2b480224ce Copyleft Compliance — Vizio — now with case number and court stamp 2021-10-20 07:30:24 -07:00
714fe4febb Copyleft Compliance — Vizio — Rename Complaint file for full name 2021-10-20 07:29:04 -07:00
7aff4102ab Copyleft Compliance — Vizio — Temporarily only just four news item 2021-10-19 13:06:59 -07:00
dc325f20f8
fixme on sponsors page points to /about 2021-10-19 12:18:35 -07:00
841c4ba647
add linux kernel and link for repair assoc. 2021-10-19 11:53:58 -07:00
fd2720f0c5 Copyleft Compliance — Vizio — Q&A is Compliance base, add PDF links 2021-10-19 11:06:10 -07:00
d938406aa8 fix /press to link to documents and media@sfconservancy.org 2021-10-19 11:06:10 -07:00
5d25ca30b7 Copyleft Compliance — Vizio — call it "Vizio Lawsuit" on menu. 2021-10-19 11:06:10 -07:00
22126bfdcb make description on front page bigger and fix TotW <p> 2021-10-19 11:06:10 -07:00
0911b0158e add back Vizio button on main page and Vizio into menu 2021-10-19 11:06:10 -07:00
e1c7423fc8 Copyleft Compliance — Vizio — "Special Message" was placeholder. 2021-10-19 11:06:10 -07:00
46ecddfe5a Copyleft Compliance — Vizio — fix typo in URL 2021-10-19 11:06:10 -07:00
66a04f2142 Copyleft Compliance — Vizio — temporarily put first line of PR here 2021-10-19 11:06:10 -07:00
b59115cfcf Copyleft Compliance — Vizio — put two links in Learn about it
This unreverts 613674c071
2021-10-19 11:06:10 -07:00
09ba320179 Copyleft Compliance — Vizio — Add complaint. 2021-10-19 11:06:06 -07:00
de2998db8d Copyleft Compliance — Vizio — initial announcement 2021-10-19 11:05:16 -07:00
613674c071 Revert addition from pono — Q&A link added too early
Commit 37d67fb1da included this link,
and it was brought in from a branch from pono.  Removing it
temporarily.
2021-10-19 09:23:45 -07:00
c328dc29b7 past litigation: add summary for top of page. 2021-10-19 09:20:18 -07:00
0d077f602b fix /press with links and media contact info 2021-10-19 08:36:32 -07:00
9a0cb169d1 update staff and bug fix for /news menu 2021-10-19 08:36:32 -07:00
895026ff66 Write section on Conservancy v. Best Buy et al & update VMware info 2021-10-19 08:36:32 -07:00
4669d6724d Generalize VMWare links page into a previous litigation links page
More will need to be added to make it true, this is the first step.
2021-10-19 08:36:32 -07:00
6fe4cbe1e4 Add Help Compliance page and put it on the menu. 2021-10-19 08:36:32 -07:00
20260b4390 Change "" to &ldquo; and &rdquo; 2021-10-19 08:36:32 -07:00
3bb2b9bccc frontpage: comment out image until we have a good one. 2021-10-19 08:35:41 -07:00
4d0d3a351b Temp remove additional call out links. 2021-10-19 07:38:56 -07:00
dd473e0a17 Fix breadcrumb link. 2021-10-19 06:50:26 -07:00
6cb4b45761 Filings ⇒ Transparency, necessary rename operation & related first
The Filings page will ultimately be part of the Transparency page,
but for now, just rename it in prep for  later changes.
2021-10-19 06:50:26 -07:00
ee815f8424 Make the sidebar selected state less subtle. 2021-10-19 06:50:26 -07:00
2c41970fbd Outreachy should be on “What We Do” menu; Copyleft Compliance first.
Note the FIXME in Member Projects class for menu selection; unsure
which one to use given the changes.
2021-10-19 06:50:26 -07:00
Daniel Pono Takamori
6a85213fea add more articles to In The News 2021-10-19 06:50:26 -07:00
Daniel Pono Takamori
2182ce5ae6 add learn coming soon 2021-10-19 06:50:26 -07:00
Daniel Pono Takamori
587e508b6f add /press and make that kit page
fix urls for press and learn
start work on new news partial submenu
2021-10-19 06:50:26 -07:00
c31ef840df page should have a <h1> title. 2021-10-19 06:50:26 -07:00
a98efefcf6 activities: add page for “What We Do”.
This is a first pass at content for the activities page, which is the
landing page for the top-bar menu item of “What We Do”.
2021-10-19 06:50:26 -07:00
ea035ced4e the class="MENU" goes with the <li> element, not <a> element. 2021-10-19 06:50:26 -07:00
fafc718086 Experiment to see if restoring class= for submenus fixes highlight. 2021-10-19 06:50:26 -07:00
0cdebcf8e5 Make copyleft compliance the term of the week. 2021-10-19 06:50:26 -07:00
b03ea99d4d Mailing list subscribe link should go to best we can get.
Ultimately, we'd like the button to be right on the front page, but
for now, at least go the subscribe page.
2021-10-19 06:50:25 -07:00
50296cf4f4 Note that special message is coming later today. 2021-10-19 06:50:25 -07:00
9f74456080 Make page look prettier. 2021-10-19 06:50:25 -07:00