construct the foother in defaults.php so that we use always the same footer
Conflicts: settings/templates/admin.php
This commit is contained in:
parent
b19033b353
commit
23cc69b816
|
@ -87,8 +87,7 @@
|
|||
<?php endif; ?>
|
||||
</div>
|
||||
<footer>
|
||||
<p class="info"><a href="<?php p(OC_Defaults::getBaseUrl()); ?>"><?php p(OC_Defaults::getEntity()) ?></a>
|
||||
<?php OC_Util::getEditionString() === '' ? print_unescaped(' – ') : print_unescaped('<br/>'); ?>
|
||||
<?php p(OC_Defaults::getSlogan()); ?>
|
||||
<p class="info">
|
||||
<?php print_unescaped(OC_Defaults::getLongFooter()); ?>
|
||||
</p>
|
||||
</footer>
|
||||
|
|
|
@ -43,10 +43,7 @@
|
|||
</div>
|
||||
<footer>
|
||||
<p class="info">
|
||||
<?php OC_Util::getEditionString() === '' ? '' : p('© 2013 '); ?>
|
||||
<a href="<?php p(OC_Defaults::getBaseUrl())?>">
|
||||
<?php p(OC_Defaults::getEntity()); ?></a>
|
||||
<?php OC_Util::getEditionString() === '' ? print_unescaped(' – ') : print_unescaped('<br/>'); ?>
|
||||
<?php p(OC_Defaults::getSlogan()); ?></p></footer>
|
||||
<?php print_unescaped(OC_Defaults::getLongFooter()); ?>
|
||||
</p></footer>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -71,4 +71,26 @@ class OC_Defaults {
|
|||
}
|
||||
}
|
||||
|
||||
public static function getShortFooter() {
|
||||
if (OC_Util::getEditionString() === '') {
|
||||
$footer = "<a href=\"". self::getBaseUrl() . "\" target=\"_blank\">" .self::getEntity() . "</a>".
|
||||
' – ' . self::getSlogan();
|
||||
} else {
|
||||
$footer = "© 2013 <a href=\"".self::getBaseUrl()."\" target=\"_blank\">".self::getEntity()."</a>".
|
||||
" – " . self::getSlogan();
|
||||
}
|
||||
|
||||
return $footer;
|
||||
}
|
||||
|
||||
public static function getLongFooter() {
|
||||
if (OC_Util::getEditionString() === '') {
|
||||
$footer = self::getShortFooter();
|
||||
} else {
|
||||
$footer = "© 2013 <a href=\"".self::getBaseUrl()."\" target=\"_blank\">".self::getEntity()."</a>".
|
||||
"<br/>" . self::getSlogan();
|
||||
}
|
||||
return $footer;
|
||||
}
|
||||
|
||||
}
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue