Completed
Pull Request — master (#6700)
by Jan-Christoph
12:19
created
apps/files/templates/simplelist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@
 block discarded – undo
19 19
 		<tr>
20 20
 			<th id='headerName' class="hidden column-name">
21 21
 				<div id="headerName-container">
22
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
22
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
23 23
 				</div>
24 24
 			</th>
25 25
 			<th id="headerSize" class="hidden column-size">
26 26
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
27 27
 			</th>
28 28
 			<th id="headerDate" class="hidden column-mtime">
29
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
29
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
30 30
 					<span class="selectedActions"><a href="" class="delete-selected">
31 31
 						<?php p($l->t('Delete'))?>
32 32
 						<img class="svg" alt=""
Please login to merge, or discard this patch.
apps/files/templates/list.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 		<div class="actions creatable hidden">
3 3
 			<div id="uploadprogresswrapper">
4 4
 				<div id="uploadprogressbar">
5
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading @'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
5
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading @')); ?></span><span class="mobile"><?php p($l->t('…')); ?></span></em>
6 6
 				</div>
7 7
 				<button class="stop icon-close" style="display:none">
8 8
 					<span class="hidden-visually"><?php p($l->t('Cancel upload')) ?></span>
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 	*/ ?>
19 19
 	<input type="hidden" name="permissions" value="" id="permissions">
20 20
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
21
-	<?php if(isset($_['dirToken'])):?>
21
+	<?php if (isset($_['dirToken'])):?>
22 22
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
23 23
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
24
-	<?php endif;?>
24
+	<?php endif; ?>
25 25
 	<input type="hidden" class="max_human_file_size"
26 26
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
27 27
 </div>
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 					<label for="select_all_files">
48 48
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
49 49
 					</label>
50
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
50
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
51 51
 					<span id="selectedActionsList" class="selectedActions">
52 52
 						<a href="" class="copy-move">
53 53
 							<span class="icon icon-external"></span>
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
65 65
 			</th>
66 66
 			<th id="headerDate" class="hidden column-mtime">
67
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
67
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
68 68
 					<span class="selectedActions"><a href="" class="delete-selected">
69 69
 						<span><?php p($l->t('Delete'))?></span>
70 70
 						<span class="icon icon-delete"></span>
@@ -84,6 +84,6 @@  discard block
 block discarded – undo
84 84
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
85 85
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
86 86
 	<p>
87
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
87
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
88 88
 	</p>
89 89
 </div>
Please login to merge, or discard this patch.
core/templates/layout.user.php 1 patch
Spacing   +15 added lines, -15 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>
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 						<li data-id="<?php p($entry['id']); ?>" class="hidden">
47 47
 							<a href="<?php print_unescaped($entry['href']); ?>"
48 48
 								<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
49
-								<img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"
49
+								<img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"
50 50
 									 class="app-icon" alt="<?php p($entry['name']); ?>" />
51 51
 								<div class="icon-loading-small-dark"
52 52
 									 style="display:none;"></div>
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 					<div id="navigation" style="display: none;">
69 69
 						<div id="apps">
70 70
 							<ul>
71
-								<?php foreach($_['navigation'] as $entry): ?>
71
+								<?php foreach ($_['navigation'] as $entry): ?>
72 72
 									<li data-id="<?php p($entry['id']); ?>">
73 73
 									<a href="<?php print_unescaped($entry['href']); ?>"
74
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
74
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
75 75
 										<svg width="16" height="16" viewBox="0 0 16 16">
76 76
 											<defs><filter id="invert-<?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>
77
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
77
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
78 78
 										</svg>
79 79
 										<div class="icon-loading-small-dark" style="display:none;"></div>
80 80
 										<span><?php p($entry['name']); ?></span>
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
 			<div class="header-right">
92 92
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
93 93
 					<label for="searchbox" class="hidden-visually">
94
-						<?php p($l->t('Search'));?>
94
+						<?php p($l->t('Search')); ?>
95 95
 					</label>
96 96
 					<input id="searchbox" type="search" name="query"
97 97
 						value="" required
98 98
 						autocomplete="off">
99
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
99
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
100 100
 				</form>
101 101
 				<div id="contactsmenu">
102 102
 					<div class="icon-contacts menutoggle" tabindex="0" role="link"></div>
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
108 108
 							<?php if ($_['userAvatarSet']): ?>
109 109
 								<img alt="" width="32" height="32"
110
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
111
-								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"
110
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
111
+								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"
112 112
 								>
113 113
 							<?php endif; ?>
114 114
 						</div>
@@ -116,11 +116,11 @@  discard block
 block discarded – undo
116 116
 					</div>
117 117
 					<div id="expanddiv" style="display:none;">
118 118
 					<ul>
119
-					<?php foreach($_['settingsnavigation'] as $entry):?>
119
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
120 120
 						<li>
121 121
 							<a href="<?php print_unescaped($entry['href']); ?>"
122
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
123
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
122
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
123
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
124 124
 								<?php p($entry['name']) ?>
125 125
 							</a>
126 126
 						</li>
Please login to merge, or discard this patch.