From f565e4c25b375483a967cc617e6be679e124e7dd Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 12 Jun 2013 16:59:23 +0200
Subject: [PATCH] move common settings footer fieldset out of conditional
---
settings/templates/admin.php | 7 ++-----
settings/templates/personal.php | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a74849a2ec..1ed3f6ef47 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -230,15 +230,12 @@ endfor;?>
</fieldset>
+<fieldset class="personalblock credits-footer">
<?php if (OC_Util::getEditionString() === ''): ?>
-<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?><br/>
<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-</fieldset>
<?php else: ?>
-<fieldset class="personalblock credits-footer">
<p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
-</fieldset>
<?php endif; ?>
-
+</fieldset>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 75aab15760..d19623dde0 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -106,15 +106,13 @@ if($_['passwordChangeSupported']) {
print_unescaped($form);
};?>
+<fieldset class="personalblock credits-footer">
<?php if (OC_Util::getEditionString() === ''): ?>
-<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
<?php p(OC_Util::getEditionString()); ?> <br />
<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
-</fieldset>
<?php else: ?>
-<fieldset class="personalblock credits-footer">
<p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
-</fieldset>
<?php endif; ?>
+</fieldset>
--
GitLab