@@ -116,24 +116,24 @@ discard block |
||
| 116 | 116 | <?php } ?> |
| 117 | 117 | |
| 118 | 118 | <?php |
| 119 | - if( |
|
| 120 | - $members || |
|
| 119 | + if( |
|
| 120 | + $members || |
|
| 121 | 121 | (isset($constituencies) && count($constituencies) > 0) || |
| 122 | 122 | ($alertsearch) |
| 123 | - ) { |
|
| 124 | - /* We need to disambiguate the user's instructions */ |
|
| 125 | - $member_options = false; |
|
| 126 | - ?> |
|
| 123 | + ) { |
|
| 124 | + /* We need to disambiguate the user's instructions */ |
|
| 125 | + $member_options = false; |
|
| 126 | + ?> |
|
| 127 | 127 | <div class="alert-section alert-section--disambiguation"> |
| 128 | 128 | <div class="alert-section__primary"> |
| 129 | 129 | |
| 130 | 130 | <?php if ($members) { |
| 131 | - $member_options = true; ?> |
|
| 131 | + $member_options = true; ?> |
|
| 132 | 132 | <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3> |
| 133 | 133 | <ul> |
| 134 | 134 | <?php |
| 135 | 135 | foreach ($members as $row) { |
| 136 | - ?> |
|
| 136 | + ?> |
|
| 137 | 137 | <li> |
| 138 | 138 | <form action="<?= $actionurl ?>" method="post"> |
| 139 | 139 | <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>"> |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | <?php } ?> |
| 155 | 155 | |
| 156 | 156 | <?php if (isset($constituencies) && count($constituencies) > 0) { |
| 157 | - $member_options = true; ?> |
|
| 157 | + $member_options = true; ?> |
|
| 158 | 158 | <h3><?= sprintf(gettext('Sign up for alerts when MPs for constituencies matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3> |
| 159 | 159 | <ul> |
| 160 | 160 | <?php foreach ($constituencies as $constituency => $member) { ?> |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | are mentioned in the same debate.') ?> |
| 204 | 204 | <?php if (isset($member_alertsearch)) { |
| 205 | 205 | printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…')); |
| 206 | - } ?> |
|
| 206 | + } ?> |
|
| 207 | 207 | </em> |
| 208 | 208 | <?php } ?> |
| 209 | 209 | </li> |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | </div> |
| 83 | 83 | |
| 84 | 84 | <?php } else { |
| 85 | - $pc_form = ($type == 'mlas' || $type == 'msps' || $type == 'mss'); |
|
| 85 | + $pc_form = ($type == 'mlas' || $type == 'msps' || $type == 'mss'); |
|
| 86 | 86 | ?> |
| 87 | 87 | |
| 88 | 88 | <form action="/<?= $pc_form ? 'postcode' : 'search' ?>/"> |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | <div class="row nested-row"> |
| 42 | 42 | <div class="homepage-in-the-news homepage-content-section"> |
| 43 | 43 | <?php if ( $featured ) { |
| 44 | - include dirname(__FILE__) . "/../homepage/featured.php"; |
|
| 44 | + include dirname(__FILE__) . "/../homepage/featured.php"; |
|
| 45 | 45 | } ?> |
| 46 | 46 | </div> |
| 47 | 47 | <div class="homepage-create-alert homepage-content-section"> |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | include '_vote_description.php'; |
| 85 | 85 | |
| 86 | - } ?> |
|
| 86 | + } ?> |
|
| 87 | 87 | </ul> |
| 88 | 88 | |
| 89 | 89 | <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>’s voting record on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>’s full vote analysis page</a> for more.</p> |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | include '_vote_description.php'; |
| 133 | 133 | |
| 134 | - } ?> |
|
| 134 | + } ?> |
|
| 135 | 135 | </ul> |
| 136 | 136 | |
| 137 | 137 | <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>’s voting record on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>’s full vote analysis page</a> for more.</p> |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | include '_vote_description.php'; |
| 173 | 173 | |
| 174 | - } ?> |
|
| 174 | + } ?> |
|
| 175 | 175 | </ul> |
| 176 | 176 | |
| 177 | 177 | <p class="voting-information-provenance"> |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | printf(gettext('Voting information from <a href="%s">Public Whip</a>.'), "https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/ $member_id&showall=yes"); ?></p> |
| 414 | 414 | |
| 415 | 415 | <?php if($image && $image['exists']) { |
| 416 | - if(isset($data['photo_attribution_text'])) { ?> |
|
| 416 | + if(isset($data['photo_attribution_text'])) { ?> |
|
| 417 | 417 | <p> |
| 418 | 418 | <?php if(isset($data['photo_attribution_link'])) { ?> |
| 419 | 419 | <?= gettext('Profile photo:') ?> |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | <?php } ?> |
| 424 | 424 | </p> |
| 425 | 425 | <?php } |
| 426 | - } else { ?> |
|
| 426 | + } else { ?> |
|
| 427 | 427 | <p> |
| 428 | 428 | We’re missing a photo of <?= $full_name ?>. |
| 429 | 429 | If you have a photo <em>that you can release under |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | <?php |
| 22 | 22 | $lat = $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party']; |
| 23 | 23 | if ($latest_membership['current']) { |
| 24 | - if ($latest_membership['constituency']) { |
|
| 24 | + if ($latest_membership['constituency']) { |
|
| 25 | 25 | # First %s is party, second is type of rep (e.g. MS), third is constituency name |
| 26 | 26 | printf(gettext('<span class="person-header__about__position__role">%s %s</span> for <span class="person-header__about__position__constituency">%s</span>'), |
| 27 | 27 | $lat, $latest_membership['rep_name'], $latest_membership['constituency']); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $lat, $latest_membership['rep_name']); |
| 31 | 31 | } |
| 32 | 32 | } else { |
| 33 | - if ($latest_membership['constituency']) { |
|
| 33 | + if ($latest_membership['constituency']) { |
|
| 34 | 34 | printf(gettext('<span class="person-header__about__position__role">Former %s %s</span> for <span class="person-header__about__position__constituency">%s</span>'), |
| 35 | 35 | $lat, $latest_membership['rep_name'], $latest_membership['constituency']); |
| 36 | 36 | } else { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } else if ($the_users_mp) { |
| 70 | 70 | $wtt_url = $wtt_url . "?a=WMC&pc=" . _htmlentities(urlencode($user_postcode)); |
| 71 | 71 | } |
| 72 | - ?> |
|
| 72 | + ?> |
|
| 73 | 73 | <a href="<?= $wtt_url ?>" class="button" onclick="trackLinkClick(this, 'Links', 'WriteToThem', 'Person'); return false;"><?= gettext('Send a message') ?></a> |
| 74 | 74 | <?php } ?> |
| 75 | 75 | <?php if ($has_email_alerts) { ?> |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <p> |
| 2 | 2 | <a href="#for"><?= sprintf(gettext('%s for'), $division['for']) ?></a>, |
| 3 | 3 | <a href="#against"><?= sprintf(gettext('%s against'), $division['against']) ?></a><?php |
| 4 | - if ($division['both'] > 0) { ?>, |
|
| 4 | + if ($division['both'] > 0) { ?>, |
|
| 5 | 5 | <a href="#both"><?= sprintf(gettext('%s abstained'), $division['both']) ?></a><?php |
| 6 | - } |
|
| 7 | - if ($division['absent'] > 0) { ?>, |
|
| 6 | + } |
|
| 7 | + if ($division['absent'] > 0) { ?>, |
|
| 8 | 8 | <a href="#absent"><?= sprintf(gettext('%s absent'), $division['absent']) ?></a><?php |
| 9 | - } ?>. |
|
| 9 | + } ?>. |
|
| 10 | 10 | </p> |
@@ -1,15 +1,15 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | if (!function_exists('print_voter')) { |
| 4 | - function print_voter($vote){ |
|
| 4 | + function print_voter($vote){ |
|
| 5 | 5 | echo sprintf( |
| 6 | - '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>', |
|
| 7 | - $vote['person_id'], |
|
| 8 | - $vote['name'], |
|
| 9 | - $vote['party'], |
|
| 10 | - $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : '' |
|
| 6 | + '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>', |
|
| 7 | + $vote['person_id'], |
|
| 8 | + $vote['name'], |
|
| 9 | + $vote['party'], |
|
| 10 | + $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : '' |
|
| 11 | 11 | ); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | if (count($votes) > 0) { ?> |
@@ -18,18 +18,18 @@ discard block |
||
| 18 | 18 | <?php $tellers = array(); ?> |
| 19 | 19 | <ul class="division-names js-vote-accordion" data-show-all="<?= gettext('Show All') ?>"> |
| 20 | 20 | <?php foreach ($votes as $vote) { |
| 21 | - if ($vote['teller']) { |
|
| 22 | - $tellers[] = $vote; |
|
| 23 | - } else { |
|
| 21 | + if ($vote['teller']) { |
|
| 22 | + $tellers[] = $vote; |
|
| 23 | + } else { |
|
| 24 | 24 | print_voter($vote); |
| 25 | - } |
|
| 25 | + } |
|
| 26 | 26 | } ?> |
| 27 | 27 | </ul> |
| 28 | 28 | <?php if (count($tellers) > 0) { ?> |
| 29 | 29 | <h4><?= gettext('Tellers') ?></h4> |
| 30 | 30 | <ul class="division-names"> |
| 31 | 31 | <?php foreach($tellers as $teller) { |
| 32 | - print_voter($teller); |
|
| 32 | + print_voter($teller); |
|
| 33 | 33 | } ?> |
| 34 | 34 | </p> |
| 35 | 35 | <?php } ?> |