move common settings footer fieldset out of conditional

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a74849a2ecc45c75d462d8658dafee4e5b13123b..1ed3f6ef47fffbd5b900af9e889286a19e4e5d0b 100644 (file)
--- 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 75aab157605ca08fb65701659c78d97d3e2e3909..d19623dde04814d2aafebba35e01f9ec017a83e9 100644 (file)
--- 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>