From 47a032d531f52c9a1114a696585585a793e55ad6 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 16 Dec 2014 11:13:24 -0500 Subject: [PATCH] Replace all instances of crm.fsf.org with my.fsf.org. --- 2014/anti-harassment/index.html | 20 +-- 2014/call_for_sessions/confirmation.html | 8 +- 2014/call_for_sessions/index.html | 160 +++++++++++------------ 2014/confirmation.html | 8 +- 2014/exhibit/confirmation.html | 8 +- 2014/exhibit/index.html | 14 +- 2014/exhibit/payment_confirmation.html | 8 +- 2014/feedback_confirmation.html | 8 +- 2014/index.html | 8 +- 2014/live/confirmation-123.html | 8 +- 2014/live/confirmation-141.html | 8 +- 2014/live/confirmation-155.html | 8 +- 2014/live/menu.html | 18 +-- 2014/live/placeholder.html | 12 +- 2014/live/room123.html | 18 +-- 2014/live/room141.html | 18 +-- 2014/live/room155.html | 18 +-- 2014/logistics/index.html | 16 +-- 2014/program/exhibit_hall.html | 8 +- 2014/program/grid_schedule.html | 8 +- 2014/program/sessions.html | 10 +- 2014/program/speakers.html | 8 +- 2014/scholarships/confirmation.html | 8 +- 2014/scholarships/index.html | 8 +- 2014/video/index.html | 10 +- 2014/volunteer/confirmation.html | 8 +- 2014/volunteer/index.html | 24 ++-- 2015/call_for_sessions/index.html | 86 ++++++------ 2015/exhibit/index.html | 4 +- 2015/fixed.html | 10 +- 2015/scholarships/index.html | 8 +- 2015/volunteer/index.html | 14 +- server/2015/banner.html | 10 +- server/2015/exhibit_js.html | 2 +- server/2015/scholarship_js.html | 2 +- server/2015/volunteer_js.html | 2 +- server/staging/lp15/volunteer.html | 6 +- server/staging/lp15/volunteer_js.html | 70 +++++----- server/staging/lpc14/index.news.html | 24 ++-- server/staging/ssi/header.html | 8 +- 40 files changed, 352 insertions(+), 352 deletions(-) diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html index e7963e4d..17614d3a 100644 --- a/2014/anti-harassment/index.html +++ b/2014/anti-harassment/index.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
-
-

Miscellaneous

@@ -1063,7 +1063,7 @@ for="custom_127_attended_previous_conference(s)"> Attended previous conference(s) @@ -1071,13 +1071,13 @@
-
@@ -1146,7 +1146,7 @@ expenses.

-
- +

We will not publish or share your information with any party - outside the FSF. See our + outside the FSF. See our privacy policy for more information.

Please hit save when you complete the form, then check your @@ -1179,10 +1179,10 @@

- + diff --git a/2014/confirmation.html b/2014/confirmation.html index 5bc56ede..a612f443 100644 --- a/2014/confirmation.html +++ b/2014/confirmation.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/exhibit/confirmation.html b/2014/exhibit/confirmation.html index 1176e63d..fb7685ad 100644 --- a/2014/exhibit/confirmation.html +++ b/2014/exhibit/confirmation.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/exhibit/index.html b/2014/exhibit/index.html index b0b7a74d..4f5627fa 100644 --- a/2014/exhibit/index.html +++ b/2014/exhibit/index.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -97,7 +97,7 @@ -->
- +
@@ -184,7 +184,7 @@ for-profit organizations cost $800.

diff --git a/2014/exhibit/payment_confirmation.html b/2014/exhibit/payment_confirmation.html index 41743800..8d152796 100644 --- a/2014/exhibit/payment_confirmation.html +++ b/2014/exhibit/payment_confirmation.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/feedback_confirmation.html b/2014/feedback_confirmation.html index f6791d4e..e4f246c3 100644 --- a/2014/feedback_confirmation.html +++ b/2014/feedback_confirmation.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/index.html b/2014/index.html index f88c37b8..326ef9a2 100644 --- a/2014/index.html +++ b/2014/index.html @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -258,14 +258,14 @@ Watch and share our volunteer-created LibrePlanet video
- +

LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2014 will feature programming for all ages and experience levels.

This year, the theme of LibrePlanet is "Free Software, Free Society." How can free software protect journalists, whistleblowers, activists, and regular computer users from government and corporate surveillance? How can free software, or free software values like copyleft, community development, and transparency, be used by people fighting to create free societies around the world? What challenges are standing between us and our goal of free software ubiquity? With your help, we'll tackle these questions and more at LibrePlanet 2014, March 22-23 in Cambridge, MA.

-

FSF members and students attend LibrePlanet at no cost! Become a member now. We encourage you to register in advance, but registration will be available at the door on both days of the conference.

+

FSF members and students attend LibrePlanet at no cost! Become a member now. We encourage you to register in advance, but registration will be available at the door on both days of the conference.

There are two other events, with separate registration, taking place before and after the conference. On Friday, March 21st, community-members will hold the 0th SpinachCon, where users and developers will improve the user experience of free software programs. On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a GPL Enforcement and Legal Ethics seminar at Suffolk University in Boston.

diff --git a/2014/live/confirmation-123.html b/2014/live/confirmation-123.html index ec0ad150..747c519a 100644 --- a/2014/live/confirmation-123.html +++ b/2014/live/confirmation-123.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/live/confirmation-141.html b/2014/live/confirmation-141.html index 908fb21e..077d7537 100644 --- a/2014/live/confirmation-141.html +++ b/2014/live/confirmation-141.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/live/confirmation-155.html b/2014/live/confirmation-155.html index 1a5c9c7d..0918e46e 100644 --- a/2014/live/confirmation-155.html +++ b/2014/live/confirmation-155.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
diff --git a/2014/live/menu.html b/2014/live/menu.html index 7b91341e..8deb2123 100644 --- a/2014/live/menu.html +++ b/2014/live/menu.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -100,7 +100,7 @@
-
+

@@ -146,24 +146,24 @@

Which conference room would you like to stream?

- +
- + Room 141
- + Room 123
diff --git a/2014/live/placeholder.html b/2014/live/placeholder.html index 1297700a..e27030c0 100644 --- a/2014/live/placeholder.html +++ b/2014/live/placeholder.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -100,7 +100,7 @@
-
+

@@ -148,7 +148,7 @@

We're creating our most advanced-ever free software streaming system for LibrePlanet 2014. We'd appreciate your donations to help make it as great as possible. Can you chip in?

-

Donate to the FSF

+

Donate to the FSF


To tide you over until the conference, here's a video about the LibrePlanet, created by a volunteer who attended in 2013.

diff --git a/2014/live/room123.html b/2014/live/room123.html index fd34acde..7f4be901 100644 --- a/2014/live/room123.html +++ b/2014/live/room123.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -100,7 +100,7 @@
-
+

@@ -189,7 +189,7 @@ alt="[ Join FSF ]" >

-

+

[ Donate to the FSF ]

@@ -202,16 +202,16 @@

Sign up to receive updates about LibrePlanet 2015.

-
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=281" />
diff --git a/2014/live/room141.html b/2014/live/room141.html index f4f326c8..3e3ed137 100644 --- a/2014/live/room141.html +++ b/2014/live/room141.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -100,7 +100,7 @@
-
+

@@ -187,7 +187,7 @@ alt="[ Join FSF ]" >

-

+

[ Donate to the FSF ]

@@ -200,16 +200,16 @@

Sign up to receive updates about LibrePlanet 2015.

-
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=281" />
diff --git a/2014/live/room155.html b/2014/live/room155.html index 62a76b43..61ffdc12 100644 --- a/2014/live/room155.html +++ b/2014/live/room155.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -100,7 +100,7 @@
-
+

@@ -187,7 +187,7 @@ alt="[ Join FSF ]" >

-

+

[ Donate to the FSF ]

@@ -200,16 +200,16 @@

Sign up to receive updates about LibrePlanet 2015.

-
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=281" />
diff --git a/2014/logistics/index.html b/2014/logistics/index.html index fb691487..f4d22441 100644 --- a/2014/logistics/index.html +++ b/2014/logistics/index.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
+ value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
@@ -152,7 +152,7 @@
- +

Where to stay

Arriving in Boston

Getting to LibrePlanet and navigating the Boston/Cambridge Area

@@ -233,7 +233,7 @@ The MBTA website provides a very Red line: Kendall/MIT Station -
  • Directions: When you leave the station, turn west on Main Street (toward Ames street), turn left on Vassar Street, and then turn left. +
  • Directions: When you leave the station, turn west on Main Street (toward Ames street), turn left on Vassar Street, and then turn left. The Stata Center was famously designed by Frank Gehry; its unique look makes it easy to spot.
    • @@ -247,12 +247,12 @@ The Stata Center was famously designed by Frank Gehry; its - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    diff --git a/2014/program/grid_schedule.html b/2014/program/grid_schedule.html index caf311b3..e5ce103c 100644 --- a/2014/program/grid_schedule.html +++ b/2014/program/grid_schedule.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    diff --git a/2014/program/sessions.html b/2014/program/sessions.html index 04320e28..9b193695 100644 --- a/2014/program/sessions.html +++ b/2014/program/sessions.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    @@ -159,7 +159,7 @@
    - +

    Saturday sessions

    Sunday sessions

    Program threads

    diff --git a/2014/program/speakers.html b/2014/program/speakers.html index 029098e1..740d7824 100644 --- a/2014/program/speakers.html +++ b/2014/program/speakers.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    diff --git a/2014/scholarships/confirmation.html b/2014/scholarships/confirmation.html index 34a4acb1..d1f53d3c 100644 --- a/2014/scholarships/confirmation.html +++ b/2014/scholarships/confirmation.html @@ -2,10 +2,10 @@ - + - + LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    diff --git a/2014/scholarships/index.html b/2014/scholarships/index.html index 7d3c6fd1..02f24fb8 100644 --- a/2014/scholarships/index.html +++ b/2014/scholarships/index.html @@ -54,12 +54,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    @@ -168,7 +168,7 @@

    One of the goals of our scholarship program is to increase participation by marginalized groups in our conference. We ask for information about your gender, racial, ethnic, and other identities to help us meet this goal. All of these fields are optional.

    -
    @@ -837,7 +837,7 @@ cj(function() { countryID = "#country-Primary" stateProvinceID = "#state_province-Primary" - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cj(countryID).chainSelect(stateProvinceID, callbackURL, null); }); diff --git a/2014/video/index.html b/2014/video/index.html index eae6a88c..5ccd8bbc 100644 --- a/2014/video/index.html +++ b/2014/video/index.html @@ -2,10 +2,10 @@ - + - + Video — LibrePlanet 2014 @@ -32,12 +32,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    @@ -100,7 +100,7 @@
    -
    +

    diff --git a/2014/volunteer/confirmation.html b/2014/volunteer/confirmation.html index c05be7f8..91c55d94 100644 --- a/2014/volunteer/confirmation.html +++ b/2014/volunteer/confirmation.html @@ -2,10 +2,10 @@ - + - + Confirmation — Volunteer Registration — LibrePlanet 2014 @@ -31,12 +31,12 @@

    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    diff --git a/2014/volunteer/index.html b/2014/volunteer/index.html index 68fc8e25..4a4816d8 100644 --- a/2014/volunteer/index.html +++ b/2014/volunteer/index.html @@ -2,10 +2,10 @@ - + - + Volunteer Registration — LibrePlanet 2014 @@ -31,12 +31,12 @@
    + value="https://my.fsf.org/civicrm/profile?reset=1&gid=285" />
    @@ -151,7 +151,7 @@ use that in planning future events like LibrePlanet in different cities. We welcome you to use the #libreplanet channel on Freenode for informal communication.

    -
    -
    +
    - +
    - +
    - +
    - +
    + profile -->

    @@ -677,7 +677,7 @@ cj(function() { countryID = "#country-Primary" stateProvinceID = "#state_province-Primary" - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cj(countryID).chainSelect(stateProvinceID, callbackURL, null); }); diff --git a/2015/call_for_sessions/index.html b/2015/call_for_sessions/index.html index 8afabbcf..66623a91 100755 --- a/2015/call_for_sessions/index.html +++ b/2015/call_for_sessions/index.html @@ -48,12 +48,12 @@

    Other ways to engage

    There is also a place on the proposal form to indicate if you would like to participate in the conference in other ways in addition to your session – by framing and moderating a panel; facilitating a caucus space; sharing media-making skills; demonstrating something cool in the exhibit hall; or blogging about the conference. Please let us know about the community-building skills you have to share!

    -
    + value="https://my.fsf.org/civicrm/contact/view/delete?=&reset=1&delete=1&cid=743827" /> @@ -77,8 +77,8 @@ *
    -
    @@ -88,20 +88,20 @@ Last Name
    -
    - +
    - + id="current_employer" class="form-control" />
    @@ -117,19 +117,19 @@ *
    -
    - +
    -
    @@ -398,15 +398,15 @@

    Session information

    -
    -
    - +

    Individual presentations

    - +

    Presentations are typically 45 minutes in length. This is an opportunity to talk about your software project, organizing effort, licensing knowledge, or just something you've learned from using free @@ -492,7 +492,7 @@ promote free software, among others.

    -
    -
    The working title for your proposed session. If your session is accepted, we will contact you to finalize the title and description.
    - -
    -
    @@ -563,7 +563,7 @@ id="helprow-custom_140">

    Identity and demographics

    - +

    LibrePlanet is committed to increasing the diversity of the free software movement, and to making the diversity that already exists more visible. To that end, our CFS process takes demographic information @@ -577,43 +577,43 @@

    -
    -
    -
    -
    -
    -

    Miscellaneous

    @@ -634,7 +634,7 @@ for="custom_179_attended_previous_conference(s)"> Attended previous conference(s) @@ -642,7 +642,7 @@
    -
    -
    +

    We will not publish or share your information with any party - outside the FSF. See our + outside the FSF. See our privacy policy for more information.

    Please hit save when you complete the form, then check your @@ -732,10 +732,10 @@

    - + diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html index f6bb8248..b861a984 100755 --- a/2015/exhibit/index.html +++ b/2015/exhibit/index.html @@ -42,12 +42,12 @@ for-profit organizations cost $800.

    + value="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1/field/update?reset=1&action=update&id=2925&gid=326" /> diff --git a/2015/fixed.html b/2015/fixed.html index 18808379..b7cb7dd5 100755 --- a/2015/fixed.html +++ b/2015/fixed.html @@ -23,19 +23,19 @@
    - + href="https://my.fsf.org/civicrm/event/register?reset=1&id=20"> Register now diff --git a/2015/scholarships/index.html b/2015/scholarships/index.html index 3fd44dca..8803ac3d 100755 --- a/2015/scholarships/index.html +++ b/2015/scholarships/index.html @@ -13,13 +13,13 @@

    One of the goals of our scholarship program is to increase participation by marginalized groups in our conference, so we ask some questions about identity. Remember that all of these fields are optional.

    - +
    + value="https://my.fsf.org/civicrm/profile/create?gid=334&reset=1/update?action=update&id=334&reset=1&context=field" />
    @@ -435,7 +435,7 @@
    -
    @@ -598,7 +598,7 @@
    - +
    diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html index 52321189..ce2390e2 100755 --- a/2015/volunteer/index.html +++ b/2015/volunteer/index.html @@ -16,11 +16,11 @@

    If you are attending the conference, you'll need to register in addition to filling out this form. Email campaigns@fsf.org before registering if you'd like to take advantage of the gratis registration offered volunteers.

    -
    + value="https://my.fsf.org/civicrm/contact/view/delete?=&reset=1&delete=1&cid=744133" /> @@ -37,7 +37,7 @@
    -
    +
    - +
    - +
    - +
    + profile -->

    diff --git a/server/2015/banner.html b/server/2015/banner.html index c3630486..478916d1 100644 --- a/server/2015/banner.html +++ b/server/2015/banner.html @@ -19,19 +19,19 @@

    - + href="https://my.fsf.org/civicrm/event/register?reset=1&id=20"> Register now diff --git a/server/2015/exhibit_js.html b/server/2015/exhibit_js.html index 16b4dbb5..eabe390f 100644 --- a/server/2015/exhibit_js.html +++ b/server/2015/exhibit_js.html @@ -16,7 +16,7 @@ cj(function() { countryID = "#country-Primary" stateProvinceID = "#state_province-Primary" - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cj(countryID).chainSelect(stateProvinceID, callbackURL, null); }); diff --git a/server/2015/scholarship_js.html b/server/2015/scholarship_js.html index 124b8367..919901cb 100644 --- a/server/2015/scholarship_js.html +++ b/server/2015/scholarship_js.html @@ -23,7 +23,7 @@ src="/2015/assets/js/jquery.timeentry.pack.js"> stateProvinceID = cj( 'select[name="' + stateProvinceID + '"]' ).prop('id'); } - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cj( '#' + countryID ).chainSelect( '#' + stateProvinceID, diff --git a/server/2015/volunteer_js.html b/server/2015/volunteer_js.html index b31b41a5..5f1d1a2f 100644 --- a/server/2015/volunteer_js.html +++ b/server/2015/volunteer_js.html @@ -16,7 +16,7 @@ cjnc(function() { countryID = "#country-Primary" stateProvinceID = "#state_province-Primary" - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cjnc(countryID).chainSelect(stateProvinceID, callbackURL, null); }); diff --git a/server/staging/lp15/volunteer.html b/server/staging/lp15/volunteer.html index ce4c27e6..59d1cd5b 100755 --- a/server/staging/lp15/volunteer.html +++ b/server/staging/lp15/volunteer.html @@ -14,11 +14,11 @@

    We welcome you to use the #libreplanet channel on Freenode for informal communication with other volunteers before and during the conference. Please email Chrissie at resources@fsf.org with any questions.

    -
    + value="https://my.fsf.org/civicrm/contact/view/delete?=&reset=1&delete=1&cid=744133" /> @@ -39,7 +39,7 @@
    - If you would like to create an account on this site, check the box below and enter a Username and a password. If you already have an account please login instead. + If you would like to create an account on this site, check the box below and enter a Username and a password. If you already have an account please login instead.
    diff --git a/server/staging/lp15/volunteer_js.html b/server/staging/lp15/volunteer_js.html index 5898641d..ed1ab82c 100644 --- a/server/staging/lp15/volunteer_js.html +++ b/server/staging/lp15/volunteer_js.html @@ -16,7 +16,7 @@ cjnc(function() { countryID = "#country-Primary" stateProvinceID = "#state_province-Primary" - callbackURL = "https://crm.fsf.org/civicrm/ajax/jqState" + callbackURL = "https://my.fsf.org/civicrm/ajax/jqState" cjnc(countryID).chainSelect(stateProvinceID, callbackURL, null); }); @@ -25,39 +25,39 @@ src="/2015/assets/js/civicrm-4.4.Common.js"> --> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + +