@@ -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 | |
@@ -129,22 +129,22 @@ discard block |
||
| 129 | 129 | </div> |
| 130 | 130 | <?php } elseif ($step !== '') { ?> |
| 131 | 131 | <?php include '_alert_form.php'; |
| 132 | - } elseif ($this_step == '') { |
|
| 133 | - if( |
|
| 134 | - !$results && ( |
|
| 135 | - $members || |
|
| 132 | + } elseif ($this_step == '') { |
|
| 133 | + if( |
|
| 134 | + !$results && ( |
|
| 135 | + $members || |
|
| 136 | 136 | (isset($constituencies) && count($constituencies) > 0) || |
| 137 | 137 | ($alertsearch) |
| 138 | - ) |
|
| 139 | - ) { |
|
| 140 | - /* We need to disambiguate the user's instructions */ |
|
| 141 | - $member_options = false; |
|
| 142 | - ?> |
|
| 138 | + ) |
|
| 139 | + ) { |
|
| 140 | + /* We need to disambiguate the user's instructions */ |
|
| 141 | + $member_options = false; |
|
| 142 | + ?> |
|
| 143 | 143 | <div class="alert-section alert-section--disambiguation"> |
| 144 | 144 | <div class="alert-section__primary"> |
| 145 | 145 | |
| 146 | 146 | <?php if ($members) { |
| 147 | - $member_options = true; ?> |
|
| 147 | + $member_options = true; ?> |
|
| 148 | 148 | <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3> |
| 149 | 149 | <ul> |
| 150 | 150 | <?php |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | <input type="hidden" name="pid" value="<?= $row['person_id'] ?>"> |
| 158 | 158 | <input type="hidden" name="ignore_speaker_votes" value="<?= $ignore_speaker_votes ?>"> |
| 159 | 159 | <?php |
| 160 | - $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); |
|
| 160 | + $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']); |
|
| 161 | 161 | if ($row['constituency']) { |
| 162 | 162 | $name .= ' (' . gettext($row['constituency']) . ')'; |
| 163 | 163 | } |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | <?php } ?> |
| 172 | 172 | |
| 173 | 173 | <?php if (isset($constituencies) && count($constituencies) > 0) { |
| 174 | - $member_options = true; ?> |
|
| 174 | + $member_options = true; ?> |
|
| 175 | 175 | <h3><?= sprintf(gettext('Sign up for alerts when MPs for constituencies matching <i>%s</i> speaks'), _htmlspecialchars($search_term)) ?></h3> |
| 176 | 176 | <ul> |
| 177 | 177 | <?php foreach ($constituencies as $constituency => $member) { ?> |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | <?php } ?> |
| 190 | 190 | |
| 191 | 191 | <?php if ($alertsearch) { |
| 192 | - if (!$member_options) { ?> |
|
| 192 | + if (!$member_options) { ?> |
|
| 193 | 193 | <h3><?= gettext('That doesn’t match a person, postcode or constituency. Search again to refine your email alert.') ?></h3> |
| 194 | 194 | <ul> |
| 195 | 195 | <?php if (isset($mistakes['postcode_and'])) { ?> |
@@ -200,8 +200,8 @@ discard block |
||
| 200 | 200 | want? You will only get an alert if all of these |
| 201 | 201 | are mentioned in the same debate.') ?> |
| 202 | 202 | <?php if (isset($member_alertsearch)) { |
| 203 | - printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…')); |
|
| 204 | - } ?> |
|
| 203 | + printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…')); |
|
| 204 | + } ?> |
|
| 205 | 205 | </em> |
| 206 | 206 | </li> |
| 207 | 207 | <?php } ?> |