Completed
Pull Request — master (#9224)
by Jan-Christoph
26:53 queued 06:23
created
core/templates/layout.user.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 		<meta charset="utf-8">
5 5
 		<title>
6 6
 			<?php
7
-				p(!empty($_['application'])?$_['application'].' - ':'');
7
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
8 8
 				p($theme->getTitle());
9 9
 			?>
10 10
 		</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
15 15
 		<meta name="apple-mobile-web-app-capable" content="yes">
16 16
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
17
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
17
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
18 18
 		<meta name="mobile-web-app-capable" content="yes">
19 19
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
20 20
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		<?php emit_script_loading_tags($_); ?>
26 26
 		<?php print_unescaped($_['headers']); ?>
27 27
 	</head>
28
-	<body id="<?php p($_['bodyid']);?>">
28
+	<body id="<?php p($_['bodyid']); ?>">
29 29
 	<?php include 'layout.noscript.warning.php'; ?>
30 30
 	<div id="notification-container">
31 31
 		<div id="notification"></div>
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 					id="nextcloud">
37 37
 					<div class="logo logo-icon">
38 38
 						<h1 class="hidden-visually">
39
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
39
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
40 40
 						</h1>
41 41
 					</div>
42 42
 				</a>
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 										<?php if ($_['themingInvertMenu']) { ?>
52 52
 										<defs><filter id="invertMenuMain-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>
53 53
 										<?php } ?>
54
-										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon" />
54
+										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon" />
55 55
 									</svg>
56 56
 								<div class="icon-loading-small-dark"
57 57
 									 style="display:none;"></div>
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 					<div id="navigation" style="display: none;"  aria-label="<?php p($l->t('More apps menu')); ?>">
75 75
 						<div id="apps">
76 76
 							<ul>
77
-								<?php foreach($_['navigation'] as $entry): ?>
77
+								<?php foreach ($_['navigation'] as $entry): ?>
78 78
 									<li data-id="<?php p($entry['id']); ?>">
79 79
 									<a href="<?php print_unescaped($entry['href']); ?>"
80
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>
80
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>
81 81
 										aria-label="<?php p($entry['name']); ?>">
82 82
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
83 83
 											<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
84
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
84
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
85 85
 										</svg>
86 86
 										<div class="icon-loading-small" style="display:none;"></div>
87 87
 										<span><?php p($entry['name']); ?></span>
@@ -98,43 +98,43 @@  discard block
 block discarded – undo
98 98
 			<div class="header-right">
99 99
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
100 100
 					<label for="searchbox" class="hidden-visually">
101
-						<?php p($l->t('Search'));?>
101
+						<?php p($l->t('Search')); ?>
102 102
 					</label>
103 103
 					<input id="searchbox" type="search" name="query"
104 104
 						value="" required
105 105
 						autocomplete="off">
106
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
106
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
107 107
 				</form>
108 108
 				<div id="contactsmenu">
109 109
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
110 110
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
111
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?>
111
+						<span class="hidden-visually"><?php p($l->t('Contacts')); ?>
112 112
 					</div>
113 113
 					<div id="contactsmenu-menu" class="menu"
114
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
114
+						aria-label="<?php p($l->t('Contacts menu')); ?>"></div>
115 115
 				</div>
116 116
 				<div id="settings">
117 117
 					<div id="expand" tabindex="0" role="button" class="menutoggle"
118
-						aria-label="<?php p($l->t('Settings'));?>"
118
+						aria-label="<?php p($l->t('Settings')); ?>"
119 119
 						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
120 120
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
121 121
 							<?php if ($_['userAvatarSet']): ?>
122 122
 								<img alt="" width="32" height="32"
123
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
124
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
123
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
124
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
125 125
 								>
126 126
 							<?php endif; ?>
127 127
 						</div>
128 128
 						<div id="expandDisplayName" class="icon-settings-white"></div>
129 129
 					</div>
130 130
 					<nav id="expanddiv" style="display:none;"
131
-						aria-label="<?php p($l->t('Settings menu'));?>">
131
+						aria-label="<?php p($l->t('Settings menu')); ?>">
132 132
 					<ul>
133
-					<?php foreach($_['settingsnavigation'] as $entry):?>
133
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
134 134
 						<li>
135 135
 							<a href="<?php print_unescaped($entry['href']); ?>"
136
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
137
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
136
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
137
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
138 138
 								<?php p($entry['name']) ?>
139 139
 							</a>
140 140
 						</li>
Please login to merge, or discard this patch.