@@ -139,22 +139,22 @@ discard block |
||
| 139 | 139 | </div> |
| 140 | 140 | <?php } elseif ($step !== '') { ?> |
| 141 | 141 | <?php include '_alert_form.php'; |
| 142 | - } elseif ($this_step == '') { |
|
| 143 | - if( |
|
| 144 | - !$results && ( |
|
| 145 | - $members || |
|
| 142 | + } elseif ($this_step == '') { |
|
| 143 | + if( |
|
| 144 | + !$results && ( |
|
| 145 | + $members || |
|
| 146 | 146 | (isset($constituencies) && count($constituencies) > 0) || |
| 147 | 147 | ($alertsearch) |
| 148 | - ) |
|
| 149 | - ) { |
|
| 150 | - /* We need to disambiguate the user's instructions */ |
|
| 151 | - $member_options = false; |
|
| 152 | - ?> |
|
| 148 | + ) |
|
| 149 | + ) { |
|
| 150 | + /* We need to disambiguate the user's instructions */ |
|
| 151 | + $member_options = false; |
|
| 152 | + ?> |
|
| 153 | 153 | <div class="alert-section alert-section--disambiguation"> |
| 154 | 154 | <div class="alert-section__primary"> |
| 155 | 155 | |
| 156 | 156 | <?php if ($members) { |
| 157 | - $member_options = true; ?> |
|
| 157 | + $member_options = true; ?> |
|
| 158 | 158 | <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3> |
| 159 | 159 | <ul> |
| 160 | 160 | <?php |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | <input type="hidden" name="pid" value="<?= $row['person_id'] ?>"> |
| 168 | 168 | <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>"> |
| 169 | 169 | <?php |
| 170 | - $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); |
|
| 170 | + $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); |
|
| 171 | 171 | if ($row['constituency']) { |
| 172 | 172 | $name .= ' (' . gettext($row['constituency']) . ')'; |
| 173 | 173 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | <?php } ?> |
| 183 | 183 | |
| 184 | 184 | <?php if ($alertsearch) { |
| 185 | - if (!$member_options) { ?> |
|
| 185 | + if (!$member_options) { ?> |
|
| 186 | 186 | <h3><?= gettext('That doesn’t match a person, postcode or constituency. Search again to refine your email alert.') ?></h3> |
| 187 | 187 | <ul> |
| 188 | 188 | <?php if (isset($mistakes['postcode_and'])) { ?> |
@@ -193,8 +193,8 @@ discard block |
||
| 193 | 193 | want? You will only get an alert if all of these |
| 194 | 194 | are mentioned in the same debate.') ?> |
| 195 | 195 | <?php if (isset($member_alertsearch)) { |
| 196 | - printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…')); |
|
| 197 | - } ?> |
|
| 196 | + printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…')); |
|
| 197 | + } ?> |
|
| 198 | 198 | </em> |
| 199 | 199 | </li> |
| 200 | 200 | <?php } ?> |
@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3> |
| 21 | 21 | <ul> |
| 22 | 22 | <?php |
| 23 | - foreach ($members as $row) { |
|
| 24 | - ?> |
|
| 23 | + foreach ($members as $row) { |
|
| 24 | + ?> |
|
| 25 | 25 | <li> |
| 26 | 26 | <form action="<?= $actionurl ?>" method="post"> |
| 27 | 27 | <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>"> |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>"> |
| 31 | 31 | <?php |
| 32 | 32 | $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); |
| 33 | - if ($row['constituency']) { |
|
| 34 | - $name .= ' (' . gettext($row['constituency']) . ')'; |
|
| 35 | - } |
|
| 36 | - printf(gettext('When %s speaks.'), $name); |
|
| 37 | - ?> |
|
| 33 | + if ($row['constituency']) { |
|
| 34 | + $name .= ' (' . gettext($row['constituency']) . ')'; |
|
| 35 | + } |
|
| 36 | + printf(gettext('When %s speaks.'), $name); |
|
| 37 | + ?> |
|
| 38 | 38 | <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>"></form> |
| 39 | 39 | </form> |
| 40 | 40 | </li> |
@@ -137,10 +137,10 @@ |
||
| 137 | 137 | <h3><?= gettext('Current keywords in this alert:') ?></h3> |
| 138 | 138 | <ul class="keyword-list"> |
| 139 | 139 | <?php foreach ($keywords as $word) { |
| 140 | - if (!in_array($word, $skip_keyword_terms)) { ?> |
|
| 140 | + if (!in_array($word, $skip_keyword_terms)) { ?> |
|
| 141 | 141 | <li class="keyword-list__tag keyword-list__tag--included"><?= _htmlspecialchars($word) ?> |
| 142 | 142 | <?php } |
| 143 | - } ?> |
|
| 143 | + } ?> |
|
| 144 | 144 | </ul> |
| 145 | 145 | </div> |
| 146 | 146 | |