]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b432ea2)
Deduplicate template code and do not translate the links
authorJoas Schilling <nickvergessen@gmx.de>
Mon, 9 Feb 2015 15:01:52 +0000 (16:01 +0100)
committerJoas Schilling <nickvergessen@gmx.de>
Mon, 9 Feb 2015 15:01:52 +0000 (16:01 +0100)
core/templates/layout.base.php patch | blob | history
core/templates/layout.guest.php patch | blob | history
core/templates/layout.noscript.warning.php [new file with mode: 0644] patch | blob
core/templates/layout.user.php patch | blob | history
settings/templates/admin.php patch | blob | history
settings/templates/personal.php patch | blob | history
settings/templates/settings.development.notice.php [new file with mode: 0644] patch | blob

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 768a965599b7a14aee1ce8fdb313f8602cd9b0c7..7069c0c2634411e081fc87481adfd746ecda9c84 100644 (file)
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -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>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 19b89e47e5e91a4e56aae931e79714de52923752..8deda443d9874456f01200ac02aee891f8fdeacd 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -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' ): ?>
diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php
new file mode 100644 (file)
index 0000000..ba781f5
--- /dev/null
+++ b/core/templates/layout.noscript.warning.php
@@ -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>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 34fad7e6cd236633718e135e272308d876f251e7..292fa5cf55e5177142228a3365d4ae8f3a60146f 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -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']): ?>
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 55887b0df461281b35b0cd60418bd9ff008aa06c..d3cf1dc972a815520f943193857076b90466b0cb 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -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">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d6bc1d2bb5c6dcd61dc9597e177b1a253b9e8d32..b98156a7c5b85e016035ab665aaad66de8946656 100644 (file)
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -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">
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
new file mode 100644 (file)
index 0000000..c88c90f
--- /dev/null
+++ b/settings/templates/settings.development.notice.php
@@ -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; ?>
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server