diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-26 17:56:19 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-01 10:46:00 +0200 |
| commit | 23cc69b816f5df465c7c9d0df5630d00abfaf6d0 (patch) | |
| tree | 4e094a7b3b637719ed73a557285308af76d6d1a4 /settings | |
| parent | b19033b3533ce4726763aac6247aa156eb0a87d6 (diff) | |
| download | nextcloud-server-23cc69b816f5df465c7c9d0df5630d00abfaf6d0.tar.gz nextcloud-server-23cc69b816f5df465c7c9d0df5630d00abfaf6d0.zip | |
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/admin.php | 14 | ||||
| -rw-r--r-- | settings/templates/personal.php | 14 |
2 files changed, 17 insertions, 11 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 1ed3f6ef47f..0eba6862e6b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -230,12 +230,16 @@ 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/> + <strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?> + (<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/> +<?php if (OC_Util::getEditionString() === ''): ?> <?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>.')); ?> -<?php else: ?> - <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p> <?php endif; ?> </fieldset> +<fieldset class="personalblock credits-footer"> +<p> + <?php print_unescaped(OC_Defaults::getShortFooter()); ?> +</p> +</fieldset> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index a9457399d5d..5d0bb77c78e 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -111,13 +111,15 @@ 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 /> + <strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> +<?php if (OC_Util::getEditionString() === ''): ?> <?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>.')); ?> -<?php else: ?> - <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p> <?php endif; ?> </fieldset> +<fieldset class="personalblock credits-footer"> +<p> + <?php print_unescaped(OC_Defaults::getShortFooter()); ?> +</p> +</fieldset> |