summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-07-11 16:38:07 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-07-11 16:38:07 +0200
commitaacca494c504d97be4ba0eb93289604b392d946f (patch)
treeee06a764dcfaaf057087654fa39e77d5e547995f /core
parentc5f2ea9a9511e78d724bb1c90748f894bb8b57af (diff)
downloadnextcloud-server-aacca494c504d97be4ba0eb93289604b392d946f.tar.gz
nextcloud-server-aacca494c504d97be4ba0eb93289604b392d946f.zip
introduce shortname themable string and split from title, use for image alt text
Diffstat (limited to 'core')
-rw-r--r--core/templates/layout.base.php2
-rw-r--r--core/templates/layout.guest.php6
-rw-r--r--core/templates/layout.user.php6
-rw-r--r--core/templates/mail.php2
4 files changed, 8 insertions, 8 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 09e1006d507..2399512eacd 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -10,7 +10,7 @@
<head>
<title>
- <?php p($defaults->getName()); ?>
+ <?php p($defaults->getTitle()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 329744e3824..e20d28970a5 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -10,7 +10,7 @@
<head data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
- <?php p($defaults->getName()); ?>
+ <?php p($defaults->getTitle()); ?>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
@@ -22,7 +22,7 @@
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
<?php endforeach; ?>
-
+
<?php foreach($_['headers'] as $header): ?>
<?php
print_unescaped('<'.$header['tag'].' ');
@@ -37,7 +37,7 @@
<body id="body-login">
<div id="login">
<header><div id="header">
- <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
+ <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($defaults->getName()); ?>" />
<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
</div></header>
<?php print_unescaped($_['content']); ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index dacbe79bd34..87c02a83d3b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -7,11 +7,11 @@
<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
+
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
<title>
<?php p(!empty($_['application'])?$_['application'].' | ':'');
- p($defaults->getName());
+ p($defaults->getTitle());
p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
</title>
<meta charset="utf-8">
@@ -45,7 +45,7 @@
</div>
<header><div id="header">
<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="ownCloud" /></a>
+ src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($defaults->getName()); ?>" /></a>
<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
<ul id="settings" class="svg">
<span id="expand" tabindex="0" role="link">
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 562ad82e953..a9fdff06067 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -5,7 +5,7 @@
<tr>
<td bgcolor="#1d2d44" width="20px">&nbsp;</td>
<td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/>
+<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($defaults->getName()); ?>"/>
</td>
</tr>
<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>