diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 19:26:38 +0400 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 19:26:38 +0400 |
| commit | 63472aed3fa157bbcf3be0bf64a5646982d5a03b (patch) | |
| tree | 3082dc18c87833ccd916aae9612e9eba9a667717 /settings/templates | |
| parent | 2141c41d0d76e0363324018d52272ebb82fa7b36 (diff) | |
| parent | f565e4c25b375483a967cc617e6be679e124e7dd (diff) | |
Merge branch 'template_updates' of github.com:owncloud/core into template_updates
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/admin.php | 7 | ||||
| -rw-r--r-- | 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 a74849a2ecc..1ed3f6ef47f 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 26bb87fa49e..6b9a0833e87 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -108,15 +108,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> |