diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-14 11:29:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 11:29:25 -0500 |
| commit | 8eb955d5c6f77d93f2e0cb38e1795d79e4ec2782 (patch) | |
| tree | 4219fefb3356238f438956cd326891cfe9b4634e /core/templates | |
| parent | 07bfedb062f651ff061a9e7d39dba2c382fff6de (diff) | |
| parent | 0d320fba4b2ff940975fc9fa415e2d20c6da961f (diff) | |
| download | nextcloud-server-8eb955d5c6f77d93f2e0cb38e1795d79e4ec2782.tar.gz nextcloud-server-8eb955d5c6f77d93f2e0cb38e1795d79e4ec2782.zip | |
Merge pull request #4993 from michaelletzgus/emit_css-tags
Emit css tags
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.base.php | 7 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 7 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 7eb1cf5ffa4..7c1fe79e79d 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -12,12 +12,7 @@ <link rel="icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> - <?php foreach ($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> - <?php endforeach; ?> - <?php foreach($_['printcssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> - <?php endforeach; ?> + <?php emit_css_loading_tags($_); ?> <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index dc56edb0061..d97da109842 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -13,12 +13,7 @@ <link rel="icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> - <?php foreach($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> - <?php endforeach; ?> - <?php foreach($_['printcssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> - <?php endforeach; ?> + <?php emit_css_loading_tags($_); ?> <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index aad9875f375..7d54d9b21f7 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -21,12 +21,7 @@ <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>"> - <?php foreach($_['cssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> - <?php endforeach; ?> - <?php foreach($_['printcssfiles'] as $cssfile): ?> - <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> - <?php endforeach; ?> + <?php emit_css_loading_tags($_); ?> <?php emit_script_loading_tags($_); ?> <?php print_unescaped($_['headers']); ?> </head> |