Deduplicate template code and do not translate the links

This commit is contained in:
Joas Schilling 2015-02-09 16:01:52 +01:00
parent b432ea29c9
commit 4172ba48d4
7 changed files with 35 additions and 11 deletions

View File

@ -24,7 +24,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="body-public">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
<?php include('layout.noscript.warning.php'); ?>
<?php print_unescaped($_['content']); ?>
</body>
</html>

View File

@ -25,7 +25,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
<?php include('layout.noscript.warning.php'); ?>
<div class="wrapper"><!-- for sticky footer -->
<div class="v-align"><!-- vertically centred box -->
<?php if ($_['bodyid'] === 'body-login' ): ?>

View File

@ -0,0 +1,11 @@
<noscript>
<div id="nojavascript">
<div>
<?php print_unescaped(str_replace(
['{linkstart}', '{linkend}'],
['<a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">', '</a>'],
$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
)); ?>
</div>
</div>
</noscript>

View File

@ -32,7 +32,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
<?php include('layout.noscript.warning.php'); ?>
<div id="notification-container">
<div id="notification"></div>
<?php if ($_['updateAvailable']): ?>

View File

@ -515,11 +515,7 @@ if ($_['suggestedOverwriteCliUrl']) {
<div class="section">
<h2><?php p($l->t('Version'));?></h2>
<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
<?php if (OC_Util::getEditionString() === ''): ?>
<p>
<?php print_unescaped($l->t('Developed by the <a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank" rel="noreferrer">source code</a> is licensed under the <a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
</p>
<?php endif; ?>
<?php include('settings.development.notice.php'); ?>
</div>
<div class="section credits-footer">

View File

@ -286,9 +286,7 @@ if($_['passwordChangeSupported']) {
<div class="section">
<h2><?php p($l->t('Version'));?></h2>
<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
<?php if (OC_Util::getEditionString() === ''): ?>
<?php print_unescaped($l->t('Developed by the <a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank" rel="noreferrer">source code</a> is licensed under the <a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
<?php endif; ?>
<?php include('settings.development.notice.php'); ?>
</div>
<div class="section credits-footer">

View File

@ -0,0 +1,19 @@
<?php if (OC_Util::getEditionString() === ''): ?>
<p>
<?php print_unescaped(str_replace(
[
'{communityopen}',
'{githubopen}',
'{licenseopen}',
'{linkclose}',
],
[
'<a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">',
'<a href="https://github.com/owncloud" target="_blank" rel="noreferrer">',
'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">',
'</a>',
],
$l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
)); ?>
</p>
<?php endif; ?>