Skip to content

Commit c4ddc41

Browse files
nikosevnikosev
committed
Minor style adjustments
1 parent 3e86175 commit c4ddc41

10 files changed

Lines changed: 114 additions & 115 deletions

File tree

‎templates/policy.tpl.php‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,76 +16,76 @@
1616
<ol>
1717
<li>
1818
<?=
19-
strpos($this->t('{themevanilla:policy:purpose_head}'), 'not translated') === false
20-
? $this->t('{themevanilla:policy:purpose_head}')
21-
: ''
19+
strpos($this->t('{themevanilla:policy:purpose_head}'), 'not translated') === false
20+
? $this->t('{themevanilla:policy:purpose_head}')
21+
: ''
2222
?>
2323
</li>
2424
</ol>
2525
<?=
26-
strpos($this->t('{themevanilla:policy:purpose_body}'), 'not translated') === false
27-
? $this->t('{themevanilla:policy:purpose_body}')
28-
: ''
26+
strpos($this->t('{themevanilla:policy:purpose_body}'), 'not translated') === false
27+
? $this->t('{themevanilla:policy:purpose_body}')
28+
: ''
2929
?>
3030

3131
<ol start="2">
3232
<li>
3333
<?=
34-
strpos($this->t('{themevanilla:policy:cookie_list_head}'), 'not translated') === false
35-
? $this->t('{themevanilla:policy:cookie_list_head}')
36-
: ''
34+
strpos($this->t('{themevanilla:policy:cookie_list_head}'), 'not translated') === false
35+
? $this->t('{themevanilla:policy:cookie_list_head}')
36+
: ''
3737
?>
3838
</li>
3939
</ol>
4040
<?=
41-
strpos($this->t('{themevanilla:policy:cookie_list_body}'), 'not translated') === false
42-
? $this->t('{themevanilla:policy:cookie_list_body}')
43-
: ''
41+
strpos($this->t('{themevanilla:policy:cookie_list_body}'), 'not translated') === false
42+
? $this->t('{themevanilla:policy:cookie_list_body}')
43+
: ''
4444
?>
4545

4646
<table class="table">
4747
<thead>
4848
<tr>
4949
<th>
5050
<?=
51-
strpos($this->t('{themevanilla:policy:table_type}'), 'not translated') === false
52-
? $this->t('{themevanilla:policy:table_type}')
53-
: ''
51+
strpos($this->t('{themevanilla:policy:table_type}'), 'not translated') === false
52+
? $this->t('{themevanilla:policy:table_type}')
53+
: ''
5454
?>
5555
</th>
5656
<th>
5757
<?=
58-
strpos($this->t('{themevanilla:policy:table_provider}'), 'not translated') === false
59-
? $this->t('{themevanilla:policy:table_provider}')
60-
: ''
58+
strpos($this->t('{themevanilla:policy:table_provider}'), 'not translated') === false
59+
? $this->t('{themevanilla:policy:table_provider}')
60+
: ''
6161
?>
6262
</th>
6363
<th>
6464
<?=
65-
strpos($this->t('{themevanilla:policy:table_name}'), 'not translated') === false
66-
? $this->t('{themevanilla:policy:table_name}')
67-
: ''
65+
strpos($this->t('{themevanilla:policy:table_name}'), 'not translated') === false
66+
? $this->t('{themevanilla:policy:table_name}')
67+
: ''
6868
?>
6969
</th>
7070
<th>
7171
<?=
72-
strpos($this->t('{themevanilla:policy:table_third_party}'), 'not translated') === false
73-
? $this->t('{themevanilla:policy:table_third_party}')
74-
: ''
72+
strpos($this->t('{themevanilla:policy:table_third_party}'), 'not translated') === false
73+
? $this->t('{themevanilla:policy:table_third_party}')
74+
: ''
7575
?>
7676
</th>
7777
<th>
7878
<?=
79-
strpos($this->t('{themevanilla:policy:table_category}'), 'not translated') === false
80-
? $this->t('{themevanilla:policy:table_category}')
81-
: ''
79+
strpos($this->t('{themevanilla:policy:table_category}'), 'not translated') === false
80+
? $this->t('{themevanilla:policy:table_category}')
81+
: ''
8282
?>
8383
</th>
8484
<th>
8585
<?=
86-
strpos($this->t('{themevanilla:policy:table_purpose}'), 'not translated') === false
87-
? $this->t('{themevanilla:policy:table_purpose}')
88-
: ''
86+
strpos($this->t('{themevanilla:policy:table_purpose}'), 'not translated') === false
87+
? $this->t('{themevanilla:policy:table_purpose}')
88+
: ''
8989
?>
9090
</th>
9191
</tr>
@@ -96,7 +96,7 @@
9696
<td><?= isset($row['type']) ? $row['type'] : '' ?></td>
9797
<td><u><?= isset($row['provider']) ? $row['provider'] : '' ?></u></td>
9898
<td><?= isset($row['name']) ? $row['name'] : '' ?></td>
99-
<td><?= isset($row['thirdParty']) && $row['thirdParty'] ? 'Yes' : 'No' ?></td>
99+
<td><?= isset($row['thirdParty']) && $row['thirdParty'] ? 'Yes' : 'No' ?></td>
100100
<td><?= isset($row['category']) ? $row['category'] : '' ?></td>
101101
<td><?= isset($row['purpose']) ? $row['purpose'] : '' ?></td>
102102
</tr>
@@ -107,37 +107,38 @@
107107
<ol start="3">
108108
<li>
109109
<?=
110-
strpos($this->t('{themevanilla:policy:endurance_head}'), 'not translated') === false
111-
? $this->t('{themevanilla:policy:endurance_head}')
112-
: ''
110+
strpos($this->t('{themevanilla:policy:endurance_head}'), 'not translated') === false
111+
? $this->t('{themevanilla:policy:endurance_head}')
112+
: ''
113113
?>
114114
</li>
115115
</ol>
116116
<?=
117-
strpos($this->t('{themevanilla:policy:endurance_body}'), 'not translated') === false
118-
? $this->t('{themevanilla:policy:endurance_body}')
119-
: ''
117+
strpos($this->t('{themevanilla:policy:endurance_body}'), 'not translated') === false
118+
? $this->t('{themevanilla:policy:endurance_body}')
119+
: ''
120120
?>
121121

122122
<ol start="4">
123123
<li>
124124
<?=
125-
strpos($this->t('{themevanilla:policy:disable_cookie_head}'), 'not translated') === false
126-
? $this->t('{themevanilla:policy:disable_cookie_head}')
127-
: ''
125+
strpos($this->t('{themevanilla:policy:disable_cookie_head}'), 'not translated') === false
126+
? $this->t('{themevanilla:policy:disable_cookie_head}')
127+
: ''
128128
?>
129129
</li>
130130
</ol>
131131
<?=
132-
strpos($this->t('{themevanilla:policy:disable_cookie_body}'), 'not translated') === false
133-
? $this->t('{themevanilla:policy:disable_cookie_body}')
134-
: ''
132+
strpos($this->t('{themevanilla:policy:disable_cookie_body}'), 'not translated') === false
133+
? $this->t('{themevanilla:policy:disable_cookie_body}')
134+
: ''
135135
?>
136136
<?=
137-
strpos($this->t('{themevanilla:policy:note}'), 'not translated') === false
138-
? $this->t('{themevanilla:policy:note}')
139-
: ''
137+
strpos($this->t('{themevanilla:policy:note}'), 'not translated') === false
138+
? $this->t('{themevanilla:policy:note}')
139+
: ''
140140
?>
141141
</div>
142142

143-
<?php $this->includeAtTemplateBase('includes/footer.php');
143+
<?php
144+
$this->includeAtTemplateBase('includes/footer.php');

‎themes/ssp/authX509/X509error.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
<?php if ($this->data['errorcode'] !== null) : ?>
99
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
10-
<img src="/<?= $this->data['baseurlpath'] ?>resources/icons/experience/gtk-dialog-error.48x48.png"
10+
<img
11+
src="/<?= $this->data['baseurlpath'] ?>resources/icons/experience/gtk-dialog-error.48x48.png"
1112
class="float-l"
1213
style="margin: 15px"
1314
alt=""

‎themes/ssp/authorize/authorize_403.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@
2121
<p><a href="<?= htmlspecialchars($this->data['LogoutURL']) ?>"><?= $this->t('{status:logout}') ?></a></p>
2222
<?php endif ?>
2323

24-
<?php $this->includeAtTemplateBase('includes/footer.php');
24+
<?php
25+
$this->includeAtTemplateBase('includes/footer.php');

‎themes/ssp/consent/consentform.php‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<?php
6464
echo $this->data['attributes_html'] = present_attributes_ssp($t, $attributes, '');
6565

66-
6766
/**
6867
* Recursive attribute array listing function
6968
*
@@ -99,15 +98,14 @@ function present_attributes_ssp($t, $attributes, $nameParent)
9998
$parentName = preg_replace('/^child_/', '', $nameRaw);
10099
foreach ($value as $child) {
101100
$str .= "\n" . '<tr class="odd ssp--table--tr__odd"><td>' .
102-
present_attributes_ssp($t, $child, $parentName) . '</td></tr>';
101+
present_attributes_ssp($t, $child, $parentName) . '</td></tr>';
103102
}
104103
} else {
105104
// insert values directly
106105

107106
$str .= "\n" . '<tr class="' . $alternate[($i++ % 2)] .
108107
'"><td><div class="attrname ssp-table--attrname">' . htmlspecialchars($name) . '</div>';
109108

110-
111109
$isHidden = in_array($nameRaw, $t->data['hiddenAttributes'], true);
112110
if ($isHidden) {
113111
$hiddenId = \SimpleSAML\Utils\Random::generateID();
@@ -144,8 +142,8 @@ function present_attributes_ssp($t, $attributes, $nameParent)
144142

145143
if ($isHidden) {
146144
$str .= '<div class="attrvalue consent_showattribute" id="visible_' . $hiddenId . '">';
147-
$str .= '<a class="consent_showattributelink ssp-btn__show-more" '
148-
. 'href="javascript:SimpleSAML_show(\'hidden_' . $hiddenId;
145+
$str .= '<a class="consent_showattributelink ssp-btn__show-more"'
146+
. ' href="javascript:SimpleSAML_show(\'hidden_' . $hiddenId;
149147
$str .= '\'); SimpleSAML_hide(\'visible_' . $hiddenId . '\');"'
150148
. ' data-toggle="tooltip" data-placement="right" title="'
151149
. $t->t('{consent:consent:show_attribute}') . '">';
@@ -155,8 +153,8 @@ function present_attributes_ssp($t, $attributes, $nameParent)
155153
}
156154

157155
$str .= '</td></tr>';
158-
} // end else: not child table
159-
} // end foreach
156+
} // end else: not child table
157+
} // end foreach
160158
$str .= isset($attributes) ? '</table></div>' : '';
161159
return $str;
162160
}
@@ -169,7 +167,6 @@ function present_attributes_ssp($t, $attributes, $nameParent)
169167
}
170168
?>
171169

172-
173170
<div class="ssp-btns-container">
174171
<form
175172
id="consent_yes"
@@ -211,8 +208,7 @@ class="ssp-btn ssp-btn__secondary btn ssp-btns-container--btn__right text-upperc
211208
<?= htmlspecialchars($this->t('{consent:consent:no}')) ?>
212209
</button>
213210
</form>
214-
</div>
215-
<!--/ssp-btns-container-->
211+
</div> <!-- /ssp-btns-container -->
216212
</div> <!-- /ssp-content-group -->
217213
</div> <!-- /row -->
218214

‎themes/ssp/consent/noconsent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
if ($this->data['aboutService']) {
22-
echo ('<a href="' . htmlspecialchars($this->data['aboutService']) . '" class="ssp-btn btn text-uppercase" >');
22+
echo ('<a href="' . htmlspecialchars($this->data['aboutService']) . '" class="ssp-btn btn text-uppercase">');
2323
echo ($this->t('{consent:consent:noconsent_goto_about}'));
2424
echo ('</a>');
2525
}

‎themes/ssp/default/error.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</textarea>
6464
</p>
6565
<p>
66-
<input type="hidden" name="reportId" value="<?= $this->data['error']['reportId'] ?>" />
66+
<input type="hidden" name="reportId" value="<?= $this->data['error']['reportId'] ?>"/>
6767
<button type="submit" name="send" class="btn"><?= $this->t('report_submit') ?></button>
6868
</p>
6969
</form>
@@ -74,4 +74,5 @@
7474
var clipboard = new Clipboard('#btntrackid');
7575
</script>
7676

77-
<?php $this->includeAtTemplateBase('includes/footer.php');
77+
<?php
78+
$this->includeAtTemplateBase('includes/footer.php');

‎themes/ssp/default/includes/footer.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<?= $this->t('{themevanilla:discopower:cookies_text}') ?>
2020
<?php
2121
if (
22-
strpos($this->t('{themevanilla:discopower:cookies_link_text}'), 'not translated')
23-
=== false
22+
strpos($this->t('{themevanilla:discopower:cookies_link_text}'), 'not translated') === false
2423
) : ?>
2524
<a
2625
href="<?= $this->t('{themevanilla:discopower:cookies_link_url}') ?>"
27-
target="_blank"><?= $this->t('{themevanilla:discopower:cookies_link_text}') ?>
26+
target="_blank"
27+
>
28+
<?= $this->t('{themevanilla:discopower:cookies_link_text}') ?>
2829
</a>
2930
<?php endif ?>
3031
</p>
@@ -35,6 +36,7 @@
3536
</div>
3637
<!-- /cookies popup -->
3738
<?php endif ?>
39+
3840
<footer class="ssp-footer text-center">
3941
<div class="container ssp-footer--container">
4042
<div class="row ssp-content-group--footer">
@@ -134,20 +136,21 @@ class="ssp-footer__item__logo"
134136
<div class="ssp-footer__item__copyright">
135137
Copyright &copy;
136138
<?=
137-
strpos($this->t('{themevanilla:discopower:copyright_year_start}'), 'not translated') === false
138-
? $this->t('{themevanilla:discopower:copyright_year_start}') . '-'
139-
: ''
140-
. date("Y")
139+
strpos($this->t('{themevanilla:discopower:copyright_year_start}'), 'not translated') === false
140+
? $this->t('{themevanilla:discopower:copyright_year_start}') . '-'
141+
: ''
142+
. date("Y")
141143
?>
142144
</div>
143145
</div>
144146
<div class="col-sm-3 ssp-footer__item">
145147
<div class="ssp-footer__item__powered">
146148
Powered by <a href="https://github.com/rciam">RCIAM</a>
147149
</div>
148-
</div>
149-
</div> <!-- /container-fluid -->
150+
</div>
151+
</div> <!-- /container-fluid -->
150152
</footer>
153+
151154
<script
152155
type="text/javascript"
153156
src="<?= htmlspecialchars(SimpleSAML\Module::getModuleURL('themevanilla/resources/js/cookie.js')) ?>"

0 commit comments

Comments
 (0)