Skip to content
This repository has been archived by the owner on Oct 18, 2022. It is now read-only.

Update California page with "Victory!" #215

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ a {
text-align: center;
}

.text-success {
color: $team-internet-green;
}

.flex-center {
display: flex;
align-items: center;
Expand Down
4 changes: 0 additions & 4 deletions assets/data/callpower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
}
]
},
"californiaPage": {
"stateCampaigns": [],
"defaultCampaign": "California-SB-822 ROUND 2"
},
"scoreboardPage": {
"stateCampaigns": [],
"defaultCampaign": "BattleForTheNet_BadBills2019"
Expand Down
228 changes: 134 additions & 94 deletions assets/data/strings.json

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions components/CallForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ export default {
switch (this.campaign) {
case 'daily':
return 1
case 'california':
return 'California-SB-822'
case 'fftf':
default:
return this.campaign
Expand Down
9 changes: 2 additions & 7 deletions components/CallScript.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ hr {
<hr>
<h3>Done calling? Do these things, too!</h3>
<div class="buttons">
<a v-if="page != 'california'" class="btn btn-events" href="https://events.battleforthenet.com/" target="_blank" @click="$trackEvent('call_script_events_button', 'click')">
<a class="btn btn-events" href="https://events.battleforthenet.com/" target="_blank" @click="$trackEvent('call_script_events_button', 'click')">
<img src="~/assets/images/map-marker.svg" alt="">
Join an event near you
</a>
Expand All @@ -116,12 +116,7 @@ export default {
...mapState(['org']),

callScript() {
if (this.page === 'california') {
return "I'm calling to ask Governor Jerry Brown to sign SB 822 which restores net neutrality protections to California. We need these protections to ensure an open internet for all Californians, including small business owners, activists and entrepreneurs."
}
else {
return "I'm calling to ask my lawmakers to reject proposals from Representatives Latta, McMorris Rodgers and Walden that will weaken net neutrality. I want real net neutrality protections, NOT laws written by cable company lobbyists. Thank you."
}
return "I'm calling to ask my lawmakers to reject proposals from Representatives Latta, McMorris Rodgers and Walden that will weaken net neutrality. I want real net neutrality protections, NOT laws written by cable company lobbyists. Thank you."
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion locales/en/pages/california.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: California can still save net neutrality
intro_html: |
Victory! The California Legislature just passed SB 822, the strongest net neutrality bill in the country. Now Governor Jerry Brown has 30 days to decide whether to sign it, and lobbyists for big telecoms like AT&T and Comcast will be pushing hard for a veto. Call the Governor right now and tell him to sign SB 822 and restore net neutrality!
<span class="text-success">Victory!</span> The California Legislature passed SB 822, the strongest net neutrality bill in the country. Governor Jerry Brown signed the bill into law on 9/30/2018.

scoreboard_form:
title: Do your California lawmakers support net neutrality?
Expand Down
12 changes: 0 additions & 12 deletions locales/en/pages/call/california.yml

This file was deleted.

3 changes: 0 additions & 3 deletions pages/california.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="container">
<h1>{{ $lt('title') }}</h1>
<div v-html="$lt('intro_html')" class="intro"></div>
<CallForm page="california" />
</div>
</section>
<section id="rep">
Expand Down Expand Up @@ -65,15 +64,13 @@

<script>
import axios from 'axios'
import CallForm from '~/components/CallForm'
import VideoRoll from '~/components/VideoRoll'
import ScoreboardLegend from '~/components/ScoreboardLegend'
import ScoreboardGroup from '~/components/ScoreboardGroup'
import { createMetaTags } from '~/assets/js/helpers'

export default {
components: {
CallForm,
ScoreboardGroup,
ScoreboardLegend,
VideoRoll
Expand Down
73 changes: 0 additions & 73 deletions pages/call/california.vue

This file was deleted.

3 changes: 0 additions & 3 deletions plugins/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ export default ({ app, store, isDev }) => {
redalert: require('~/locales/en/pages/redalert.yml'),
augustrecess: require('~/locales/en/pages/augustrecess.yml'),
california: require('~/locales/en/pages/california.yml'),
call: {
california: require('~/locales/en/pages/call/california.yml')
},
map: require('~/locales/en/pages/map.yml'),
scoreboard: {
index: require('~/locales/en/pages/scoreboard/index.yml'),
Expand Down
3 changes: 0 additions & 3 deletions scripts/generate-strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ const messages = formatStrings({
redalert: loadStrings('pages/redalert.yml'),
augustrecess: loadStrings('pages/augustrecess.yml'),
california: loadStrings('pages/california.yml'),
call: {
california: loadStrings('pages/call/california.yml')
},
map: loadStrings('pages/map.yml'),
scoreboard: {
index: loadStrings('pages/scoreboard/index.yml'),
Expand Down