@@ -111,8 +111,11 @@ |
||
| 111 | 111 | <?php foreach($_['navigation'] as $entry): ?> |
| 112 | 112 | <?php if($entry['showInHeader']): ?> |
| 113 | 113 | <li data-id="<?php p($entry['id']); ?>" class="in-header"> |
| 114 | - <?php else: ?> |
|
| 115 | - <li data-id="<?php p($entry['id']); ?>"> |
|
| 114 | + <?php else { |
|
| 115 | + : ?> |
|
| 116 | + <li data-id="<?php p($entry['id']); |
|
| 117 | +} |
|
| 118 | +?>"> |
|
| 116 | 119 | <?php endif; ?> |
| 117 | 120 | <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" |
| 118 | 121 | <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> |
@@ -4,9 +4,9 @@ |
||
| 4 | 4 | <meta charset="utf-8"> |
| 5 | 5 | <title> |
| 6 | 6 | <?php |
| 7 | - p(!empty($_['application'])?$_['application'].' - ':''); |
|
| 8 | - p($theme->getTitle()); |
|
| 9 | - ?> |
|
| 7 | + p(!empty($_['application'])?$_['application'].' - ':''); |
|
| 8 | + p($theme->getTitle()); |
|
| 9 | + ?> |
|
| 10 | 10 | </title> |
| 11 | 11 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 12 | 12 | <meta name="referrer" content="never"> |
@@ -4,7 +4,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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,7 +74,7 @@ discard block |
||
| 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> |
@@ -86,17 +86,17 @@ discard block |
||
| 86 | 86 | <nav role="navigation"><div id="navigation"> |
| 87 | 87 | <div id="apps"> |
| 88 | 88 | <ul> |
| 89 | - <?php foreach($_['navigation'] as $entry): ?> |
|
| 90 | - <?php if($entry['showInHeader']): ?> |
|
| 89 | + <?php foreach ($_['navigation'] as $entry): ?> |
|
| 90 | + <?php if ($entry['showInHeader']): ?> |
|
| 91 | 91 | <li data-id="<?php p($entry['id']); ?>" class="in-header"> |
| 92 | 92 | <?php else: ?> |
| 93 | 93 | <li data-id="<?php p($entry['id']); ?>"> |
| 94 | 94 | <?php endif; ?> |
| 95 | 95 | <a href="<?php print_unescaped($entry['href']); ?>" tabindex="3" |
| 96 | - <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> |
|
| 96 | + <?php if ($entry['active']): ?> class="active"<?php endif; ?>> |
|
| 97 | 97 | <svg width="32" height="32" viewBox="0 0 32 32"> |
| 98 | 98 | <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> |
| 99 | - <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> |
|
| 99 | + <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> |
|
| 100 | 100 | </svg> |
| 101 | 101 | <div class="icon-loading-dark" style="display:none;"></div> |
| 102 | 102 | <span> |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | <div id="header-right"> |
| 115 | 115 | <form class="searchbox" action="#" method="post" role="search" novalidate> |
| 116 | 116 | <label for="searchbox" class="hidden-visually"> |
| 117 | - <?php p($l->t('Search'));?> |
|
| 117 | + <?php p($l->t('Search')); ?> |
|
| 118 | 118 | </label> |
| 119 | 119 | <input id="searchbox" type="search" name="query" |
| 120 | 120 | value="" required |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> |
| 127 | 127 | <?php if ($_['userAvatarSet']): ?> |
| 128 | 128 | <img alt="" width="32" height="32" |
| 129 | - src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>" |
|
| 130 | - 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 | + src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>" |
|
| 130 | + 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" |
|
| 131 | 131 | > |
| 132 | 132 | <?php endif; ?> |
| 133 | 133 | </div> |
@@ -136,28 +136,28 @@ discard block |
||
| 136 | 136 | </div> |
| 137 | 137 | <div id="expanddiv"> |
| 138 | 138 | <ul> |
| 139 | - <?php foreach($_['settingsnavigation'] as $entry):?> |
|
| 139 | + <?php foreach ($_['settingsnavigation'] as $entry):?> |
|
| 140 | 140 | <li> |
| 141 | 141 | <a href="<?php print_unescaped($entry['href']); ?>" |
| 142 | - <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> |
|
| 143 | - <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> |
|
| 142 | + <?php if ($entry["active"]): ?> class="active"<?php endif; ?>> |
|
| 143 | + <img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"> |
|
| 144 | 144 | <?php p($entry['name']) ?> |
| 145 | 145 | </a> |
| 146 | 146 | </li> |
| 147 | 147 | <?php endforeach; ?> |
| 148 | - <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> |
|
| 148 | + <?php if (OC_User::isAdminUser(OC_User::getUser())): ?> |
|
| 149 | 149 | <li> |
| 150 | 150 | <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" |
| 151 | - <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> |
|
| 152 | - <img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" /> |
|
| 151 | + <?php if ($_['appsmanagement_active']): ?> class="active"<?php endif; ?>> |
|
| 152 | + <img src="<?php print_unescaped(image_path('settings', 'apps.svg').'?v='.$_['versionHash']); ?>" /> |
|
| 153 | 153 | <?php p($l->t('Apps')); ?> |
| 154 | 154 | </a> |
| 155 | 155 | </li> |
| 156 | 156 | <?php endif; ?> |
| 157 | 157 | <li> |
| 158 | 158 | <a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>> |
| 159 | - <img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>"> |
|
| 160 | - <?php p($l->t('Log out'));?> |
|
| 159 | + <img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg').'?v='.$_['versionHash']); ?>"> |
|
| 160 | + <?php p($l->t('Log out')); ?> |
|
| 161 | 161 | </a> |
| 162 | 162 | </li> |
| 163 | 163 | </ul> |