move common settings footer fieldset out of conditional

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0aba0c746a2bcdbfc8a78f8e729a52c5cae605d8..f319df375198c9dfdaaf8875829d312272906f70 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -225,16 +225,13 @@ 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()); ?>
        (<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<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 161a482b9152115967a90f5c5fe3cab6e0e528dc..a158bd8f5ba15085186e5527df39872b81d06e41 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>