diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-06 10:12:54 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-06 10:12:54 +0200 |
| commit | fa0c45b005665876d9365674c247fc9212f05df9 (patch) | |
| tree | 8546c0c5dbd5884477ca164019850bc46aa9918e /core/templates | |
| parent | b8275691e77f6328da29770ae95fddccc70862a8 (diff) | |
| parent | fce614b82c61a0d2e45ffe05bbe030d842f3ca16 (diff) | |
| download | nextcloud-server-fa0c45b005665876d9365674c247fc9212f05df9.tar.gz nextcloud-server-fa0c45b005665876d9365674c247fc9212f05df9.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.guest.php | 6 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 7ba7abdbf12..7f5a4d50fc6 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,6 +4,9 @@ <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> @@ -11,6 +14,9 @@ var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; </script> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script> + <?php endif ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index e9d105ed043..8f6c029007f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -4,6 +4,9 @@ <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> @@ -12,6 +15,9 @@ var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; var oc_current_user = '<?php echo OC_User::getUser() ?>'; </script> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script> + <?php endif ?> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> |