diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-03-28 01:37:47 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-29 18:23:23 +0200 |
| commit | 9a75714c22b406ef13c985bec567b9d88ce7dc84 (patch) | |
| tree | 7e95558e53586f52f5da70d4f514d857bc3733c2 /core/templates | |
| parent | 626d03e3d47994364500bd6cd5dd9a029b862fb7 (diff) | |
| download | nextcloud-server-9a75714c22b406ef13c985bec567b9d88ce7dc84.tar.gz nextcloud-server-9a75714c22b406ef13c985bec567b9d88ce7dc84.zip | |
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 | ||||
| -rw-r--r-- | core/templates/mail.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 4ae33341e2f..e2e61e67e2c 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -8,10 +8,10 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> - <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> + <meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>"> <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->getMailHeaderColor()); ?>"> + <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <?php if (isset($_['inline_ocjs'])): ?> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> <?php print_unescaped($_['inline_ocjs']); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 9b89ed6300f..1e2559d6960 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -9,10 +9,10 @@ <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> - <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> + <meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>"> <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->getMailHeaderColor()); ?>"> + <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <?php if (isset($_['inline_ocjs'])): ?> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> <?php print_unescaped($_['inline_ocjs']); ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 439567fe6a1..40e47c7e582 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -16,10 +16,10 @@ <meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>"> <meta name="mobile-web-app-capable" content="yes"> - <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> + <meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>"> <link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> <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->getMailHeaderColor()); ?>"> + <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 if (isset($_['inline_ocjs'])): ?> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> diff --git a/core/templates/mail.php b/core/templates/mail.php index 3721d50e27b..cda33490e85 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -2,7 +2,7 @@ <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> <tr> -<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>"> +<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>"> <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/> </td> </tr> |