|
@@ -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,16 +14,16 @@ 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->getMailHeaderColor()); ?>"> |
|
20
|
20
|
<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> |
|
21
|
21
|
<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> |
|
22
|
22
|
<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="#0082c9"> |
|
23
|
|
- <?php foreach($_['cssfiles'] as $cssfile): ?> |
|
|
23
|
+ <?php foreach ($_['cssfiles'] as $cssfile): ?> |
|
24
|
24
|
<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> |
|
25
|
25
|
<?php endforeach; ?> |
|
26
|
|
- <?php foreach($_['printcssfiles'] as $cssfile): ?> |
|
|
26
|
+ <?php foreach ($_['printcssfiles'] as $cssfile): ?> |
|
27
|
27
|
<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> |
|
28
|
28
|
<?php endforeach; ?> |
|
29
|
29
|
<?php if (isset($_['inline_ocjs'])): ?> |
|
@@ -31,12 +31,12 @@ discard block |
|
|
block discarded – undo |
|
31
|
31
|
<?php print_unescaped($_['inline_ocjs']); ?> |
|
32
|
32
|
</script> |
|
33
|
33
|
<?php endif; ?> |
|
34
|
|
- <?php foreach($_['jsfiles'] as $jsfile): ?> |
|
|
34
|
+ <?php foreach ($_['jsfiles'] as $jsfile): ?> |
|
35
|
35
|
<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> |
|
36
|
36
|
<?php endforeach; ?> |
|
37
|
37
|
<?php print_unescaped($_['headers']); ?> |
|
38
|
38
|
</head> |
|
39
|
|
- <body id="<?php p($_['bodyid']);?>"> |
|
|
39
|
+ <body id="<?php p($_['bodyid']); ?>"> |
|
40
|
40
|
<?php include('layout.noscript.warning.php'); ?> |
|
41
|
41
|
<div id="notification-container"> |
|
42
|
42
|
<div id="notification"></div> |
|
@@ -54,7 +54,7 @@ discard block |
|
|
block discarded – undo |
|
54
|
54
|
|
|
55
|
55
|
<a href="#" class="header-appname-container menutoggle" tabindex="2"> |
|
56
|
56
|
<h1 class="header-appname"> |
|
57
|
|
- <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?> |
|
|
57
|
+ <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?> |
|
58
|
58
|
</h1> |
|
59
|
59
|
<div class="icon-caret"></div> |
|
60
|
60
|
</a> |
|
@@ -62,11 +62,11 @@ discard block |
|
|
block discarded – undo |
|
62
|
62
|
<div id="appmenu"> |
|
63
|
63
|
<ul> |
|
64
|
64
|
<?php $headerIconCount = 8; ?> |
|
65
|
|
- <?php foreach($_['headernavigation'] as $entry): ?> |
|
|
65
|
+ <?php foreach ($_['headernavigation'] as $entry): ?> |
|
66
|
66
|
<li data-id="<?php p($entry['id']); ?>"> |
|
67
|
67
|
<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" |
|
68
|
|
- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> |
|
69
|
|
- <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" /> |
|
|
68
|
+ <?php if ($entry['active']): ?> class="active"<?php endif; ?>> |
|
|
69
|
+ <img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon" /> |
|
70
|
70
|
<div class="icon-loading-dark" style="display:none;"></div> |
|
71
|
71
|
<span> |
|
72
|
72
|
<?php p($entry['name']); ?> |
|
@@ -74,17 +74,17 @@ discard block |
|
|
block discarded – undo |
|
74
|
74
|
</a> |
|
75
|
75
|
</li> |
|
76
|
76
|
<?php endforeach; ?> |
|
77
|
|
- <li id="more-apps" class="menutoggle<?php if (!(count($_['navigation']) > $headerIconCount || (OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation'])>=$headerIconCount))): ?> hidden<?php endif; ?>"> |
|
|
77
|
+ <li id="more-apps" class="menutoggle<?php if (!(count($_['navigation']) > $headerIconCount || (OC_User::isAdminUser(OC_User::getUser()) && count($_['navigation']) >= $headerIconCount))): ?> hidden<?php endif; ?>"> |
|
78
|
78
|
<a href="#"> |
|
79
|
79
|
<div class="icon-more-white"></div> |
|
80
|
80
|
<span><?php p($l->t('More apps')); ?></span> |
|
81
|
81
|
</a> |
|
82
|
82
|
</li> |
|
83
|
|
- <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> |
|
84
|
|
- <li <?php if(count($_['navigation'])>$headerIconCount-1): ?> class="hidden apps-management"<?php else: ?> class="apps-management" <?php endif; ?>> |
|
|
83
|
+ <?php if (OC_User::isAdminUser(OC_User::getUser())): ?> |
|
|
84
|
+ <li <?php if (count($_['navigation']) > $headerIconCount - 1): ?> class="hidden apps-management"<?php else: ?> class="apps-management" <?php endif; ?>> |
|
85
|
85
|
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" |
|
86
|
|
- <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> |
|
87
|
|
- <img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" /> |
|
|
86
|
+ <?php if ($_['appsmanagement_active']): ?> class="active"<?php endif; ?>> |
|
|
87
|
+ <img src="<?php print_unescaped(image_path('settings', 'apps.svg').'?v='.$_['versionHash']); ?>" /> |
|
88
|
88
|
<div class="icon-loading-dark" style="display:none;"></div> |
|
89
|
89
|
<span><?php p($l->t('Apps')); ?></span> |
|
90
|
90
|
</a> |
|
@@ -96,17 +96,17 @@ discard block |
|
|
block discarded – undo |
|
96
|
96
|
<nav role="navigation"><div id="navigation"> |
|
97
|
97
|
<div id="apps"> |
|
98
|
98
|
<ul> |
|
99
|
|
- <?php foreach($_['navigation'] as $entry): ?> |
|
100
|
|
- <?php if($entry['showInHeader']): ?> |
|
|
99
|
+ <?php foreach ($_['navigation'] as $entry): ?> |
|
|
100
|
+ <?php if ($entry['showInHeader']): ?> |
|
101
|
101
|
<li data-id="<?php p($entry['id']); ?>" class="in-header"> |
|
102
|
102
|
<?php else: ?> |
|
103
|
103
|
<li data-id="<?php p($entry['id']); ?>"> |
|
104
|
104
|
<?php endif; ?> |
|
105
|
105
|
<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" |
|
106
|
|
- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> |
|
|
106
|
+ <?php if ($entry['active']): ?> class="active"<?php endif; ?>> |
|
107
|
107
|
<svg width="32" height="32" viewBox="0 0 32 32"> |
|
108
|
108
|
<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> |
|
109
|
|
- <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image> |
|
|
109
|
+ <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon"></image> |
|
110
|
110
|
</svg> |
|
111
|
111
|
<div class="icon-loading-dark" style="display:none;"></div> |
|
112
|
112
|
<span> |
|
@@ -117,14 +117,14 @@ discard block |
|
|
block discarded – undo |
|
117
|
117
|
<?php endforeach; ?> |
|
118
|
118
|
<?php |
|
119
|
119
|
/* show "More apps" link to app administration directly in app navigation, as last entry */ |
|
120
|
|
- if(OC_User::isAdminUser(OC_User::getUser())): |
|
|
120
|
+ if (OC_User::isAdminUser(OC_User::getUser())): |
|
121
|
121
|
?> |
|
122
|
122
|
<li class="apps-management"> |
|
123
|
123
|
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4" |
|
124
|
|
- <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> |
|
|
124
|
+ <?php if ($_['appsmanagement_active']): ?> class="active"<?php endif; ?>> |
|
125
|
125
|
<svg width="32" height="32" viewBox="0 0 32 32" class="app-icon"> |
|
126
|
126
|
<defs><filter id="invert-appsmanagement"><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> |
|
127
|
|
- <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image> |
|
|
127
|
+ <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg').'?v='.$_['versionHash']); ?>"></image> |
|
128
|
128
|
</svg> |
|
129
|
129
|
<div class="icon-loading-dark" style="display:none;"></div> |
|
130
|
130
|
<span> |
|
@@ -143,7 +143,7 @@ discard block |
|
|
block discarded – undo |
|
143
|
143
|
<div id="header-right"> |
|
144
|
144
|
<form class="searchbox" action="#" method="post" role="search" novalidate> |
|
145
|
145
|
<label for="searchbox" class="hidden-visually"> |
|
146
|
|
- <?php p($l->t('Search'));?> |
|
|
146
|
+ <?php p($l->t('Search')); ?> |
|
147
|
147
|
</label> |
|
148
|
148
|
<input id="searchbox" type="search" name="query" |
|
149
|
149
|
value="" required |
|
@@ -155,8 +155,8 @@ discard block |
|
|
block discarded – undo |
|
155
|
155
|
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> |
|
156
|
156
|
<?php if ($_['userAvatarSet']): ?> |
|
157
|
157
|
<img alt="" width="32" height="32" |
|
158
|
|
- src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>" |
|
159
|
|
- 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" |
|
|
158
|
+ src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>" |
|
|
159
|
+ 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" |
|
160
|
160
|
> |
|
161
|
161
|
<?php endif; ?> |
|
162
|
162
|
</div> |
|
@@ -165,19 +165,19 @@ discard block |
|
|
block discarded – undo |
|
165
|
165
|
</div> |
|
166
|
166
|
<div id="expanddiv"> |
|
167
|
167
|
<ul> |
|
168
|
|
- <?php foreach($_['settingsnavigation'] as $entry):?> |
|
|
168
|
+ <?php foreach ($_['settingsnavigation'] as $entry):?> |
|
169
|
169
|
<li> |
|
170
|
170
|
<a href="<?php print_unescaped($entry['href']); ?>" |
|
171
|
|
- <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> |
|
172
|
|
- <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> |
|
|
171
|
+ <?php if ($entry["active"]): ?> class="active"<?php endif; ?>> |
|
|
172
|
+ <img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"> |
|
173
|
173
|
<?php p($entry['name']) ?> |
|
174
|
174
|
</a> |
|
175
|
175
|
</li> |
|
176
|
176
|
<?php endforeach; ?> |
|
177
|
177
|
<li> |
|
178
|
178
|
<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>> |
|
179
|
|
- <img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>"> |
|
180
|
|
- <?php p($l->t('Log out'));?> |
|
|
179
|
+ <img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg').'?v='.$_['versionHash']); ?>"> |
|
|
180
|
+ <?php p($l->t('Log out')); ?> |
|
181
|
181
|
</a> |
|
182
|
182
|
</li> |
|
183
|
183
|
</ul> |