Completed
Pull Request — master (#10004)
by Jan-Christoph
303:26 queued 284:42
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
 
31 31
 	<a href="#app-content" class="button primary skip-navigation skip-content">Skip to main content</a>
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 					id="nextcloud">
41 41
 					<div class="logo logo-icon">
42 42
 						<h1 class="hidden-visually">
43
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
43
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
44 44
 						</h1>
45 45
 					</div>
46 46
 				</a>
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 										<?php if ($_['themingInvertMenu']) { ?>
56 56
 										<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>
57 57
 										<?php } ?>
58
-										<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" />
58
+										<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" />
59 59
 									</svg>
60 60
 								<div class="icon-loading-small-dark"
61 61
 									 style="display:none;"></div>
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 					<div id="navigation" style="display: none;"  aria-label="<?php p($l->t('More apps menu')); ?>">
79 79
 						<div id="apps">
80 80
 							<ul>
81
-								<?php foreach($_['navigation'] as $entry): ?>
81
+								<?php foreach ($_['navigation'] as $entry): ?>
82 82
 									<li data-id="<?php p($entry['id']); ?>">
83 83
 									<a href="<?php print_unescaped($entry['href']); ?>"
84
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>
84
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>
85 85
 										aria-label="<?php p($entry['name']); ?>">
86 86
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
87 87
 											<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>
88
-											<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>
88
+											<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>
89 89
 										</svg>
90 90
 										<div class="icon-loading-small" style="display:none;"></div>
91 91
 										<span><?php p($entry['name']); ?></span>
@@ -102,43 +102,43 @@  discard block
 block discarded – undo
102 102
 			<div class="header-right">
103 103
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
104 104
 					<label for="searchbox" class="hidden-visually">
105
-						<?php p($l->t('Search'));?>
105
+						<?php p($l->t('Search')); ?>
106 106
 					</label>
107 107
 					<input id="searchbox" type="search" name="query"
108 108
 						value="" required class="hidden"
109 109
 						autocomplete="off">
110
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
110
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
111 111
 				</form>
112 112
 				<div id="contactsmenu">
113 113
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
114 114
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
115
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?>
115
+						<span class="hidden-visually"><?php p($l->t('Contacts')); ?>
116 116
 					</div>
117 117
 					<div id="contactsmenu-menu" class="menu"
118
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
118
+						aria-label="<?php p($l->t('Contacts menu')); ?>"></div>
119 119
 				</div>
120 120
 				<div id="settings">
121 121
 					<div id="expand" tabindex="0" role="button" class="menutoggle"
122
-						aria-label="<?php p($l->t('Settings'));?>"
122
+						aria-label="<?php p($l->t('Settings')); ?>"
123 123
 						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
124 124
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
125 125
 							<?php if ($_['userAvatarSet']): ?>
126 126
 								<img alt="" width="32" height="32"
127
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
128
-								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"
127
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
128
+								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"
129 129
 								>
130 130
 							<?php endif; ?>
131 131
 						</div>
132 132
 						<div id="expandDisplayName" class="icon-settings-white"></div>
133 133
 					</div>
134 134
 					<nav id="expanddiv" style="display:none;"
135
-						aria-label="<?php p($l->t('Settings menu'));?>">
135
+						aria-label="<?php p($l->t('Settings menu')); ?>">
136 136
 					<ul>
137
-					<?php foreach($_['settingsnavigation'] as $entry):?>
137
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
138 138
 						<li data-id="<?php p($entry['id']); ?>">
139 139
 							<a href="<?php print_unescaped($entry['href']); ?>"
140
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
141
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
140
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
141
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
142 142
 								<?php p($entry['name']) ?>
143 143
 							</a>
144 144
 						</li>
Please login to merge, or discard this patch.