Merge pull request #6278 from nickvergessen/issue/6263
[issue/6263] layout.user.php code is not valid markup
This commit is contained in:
commit
299a8285bd
|
@ -686,7 +686,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
|
||||||
/* Apps management as sticky footer, less obtrusive in the list */
|
/* Apps management as sticky footer, less obtrusive in the list */
|
||||||
#navigation .wrapper {
|
#navigation .wrapper {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
margin: 0 auto -72px;
|
margin: 0 auto -82px 0;
|
||||||
}
|
}
|
||||||
#apps-management, #navigation .push {
|
#apps-management, #navigation .push {
|
||||||
height: 72px;
|
height: 72px;
|
||||||
|
|
|
@ -48,15 +48,16 @@
|
||||||
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
|
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
|
||||||
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
|
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
|
||||||
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
||||||
<ul id="settings" class="svg">
|
<div id="settings" class="svg">
|
||||||
<span id="expand" tabindex="0" role="link">
|
<span id="expand" tabindex="0" role="link">
|
||||||
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
|
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
|
||||||
<img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
|
<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
|
||||||
<?php if ($_['enableAvatars']): ?>
|
|
||||||
<div class="avatardiv"></div>
|
|
||||||
<?php endif; ?>
|
|
||||||
</span>
|
</span>
|
||||||
|
<?php if ($_['enableAvatars']): ?>
|
||||||
|
<div class="avatardiv"></div>
|
||||||
|
<?php endif; ?>
|
||||||
<div id="expanddiv">
|
<div id="expanddiv">
|
||||||
|
<ul>
|
||||||
<?php foreach($_['settingsnavigation'] as $entry):?>
|
<?php foreach($_['settingsnavigation'] as $entry):?>
|
||||||
<li>
|
<li>
|
||||||
<a href="<?php print_unescaped($entry['href']); ?>" title=""
|
<a href="<?php print_unescaped($entry['href']); ?>" title=""
|
||||||
|
@ -72,8 +73,9 @@
|
||||||
<?php p($l->t('Log out'));?>
|
<?php p($l->t('Log out'));?>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
</div>
|
||||||
|
|
||||||
<form class="searchbox" action="#" method="post">
|
<form class="searchbox" action="#" method="post">
|
||||||
<input id="searchbox" class="svg" type="search" name="query"
|
<input id="searchbox" class="svg" type="search" name="query"
|
||||||
|
@ -83,37 +85,40 @@
|
||||||
</div></header>
|
</div></header>
|
||||||
|
|
||||||
<nav><div id="navigation">
|
<nav><div id="navigation">
|
||||||
<ul id="apps" class="svg">
|
<div id="apps" class="svg">
|
||||||
<div class="wrapper"><!-- for sticky footer of apps management -->
|
<ul class="wrapper"><!-- for sticky footer of apps management -->
|
||||||
<?php foreach($_['navigation'] as $entry): ?>
|
<?php foreach($_['navigation'] as $entry): ?>
|
||||||
<li data-id="<?php p($entry['id']); ?>">
|
<li data-id="<?php p($entry['id']); ?>">
|
||||||
<a href="<?php print_unescaped($entry['href']); ?>" title=""
|
<a href="<?php print_unescaped($entry['href']); ?>" title=""
|
||||||
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
|
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
|
||||||
<img class="icon svg" src="<?php print_unescaped($entry['icon']); ?>"/>
|
<img class="icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"/>
|
||||||
<span>
|
<span>
|
||||||
<?php p($entry['name']); ?>
|
<?php p($entry['name']); ?>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
||||||
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
|
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
|
||||||
<div class="push"></div><!-- for for sticky footer of apps management -->
|
<li class="push"></li><!-- for sticky footer of apps management -->
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</div>
|
</ul>
|
||||||
|
|
||||||
<!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
|
<!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
|
||||||
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
|
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
|
||||||
<li id="apps-management">
|
<ul id="apps-management">
|
||||||
|
<li>
|
||||||
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
|
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
|
||||||
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
|
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
|
||||||
<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
|
<img class="icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
|
||||||
<span>
|
<span>
|
||||||
<?php p($l->t('Apps')); ?>
|
<?php p($l->t('Apps')); ?>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
</ul>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</ul>
|
</div>
|
||||||
</div></nav>
|
</div></nav>
|
||||||
|
|
||||||
<div id="content-wrapper">
|
<div id="content-wrapper">
|
||||||
|
|
Loading…
Reference in New Issue