Merge pull request #75 from nextcloud/brand-to-nextcloud

Brand to nextcloud
This commit is contained in:
Lukas Reschke 2016-06-14 11:42:48 +02:00 committed by GitHub
commit d3374220f5
4 changed files with 9 additions and 21 deletions

View File

@ -25,12 +25,6 @@
$l = \OC::$server->getL10N('files_sharing');
$isIE8 = false;
preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
if (count($matches) > 0 && $matches[1] <= 9) {
$isIE8 = true;
}
$cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
$url = 'https://owncloud.org/federation#' . $cloudID;
$ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
@ -42,6 +36,6 @@ $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud F
$tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);
$tmpl->assign('reference', $url);
$tmpl->assign('cloudId', $cloudID);
$tmpl->assign('showShareIT', !$isIE8);
$tmpl->assign('showShareIT', false);
return $tmpl->fetchPage();

View File

@ -57,7 +57,7 @@ if ($_['showShareIT']) {
style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;">
<img src="<?php p($_['owncloud_logo_path']); ?>"
style="width:50px;position:relative;top:8px;">
<?php p($l->t('Share with me via ownCloud')); ?>
<?php p($l->t('Share with me via Nextcloud')); ?>
</a>
</p>
@ -67,7 +67,7 @@ if ($_['showShareIT']) {
style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;">
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>"
style="width:50px;position:relative;top:8px;">
<?php p($l->t('Share with me via ownCloud')); ?>
<?php p($l->t('Share with me via Nextcloud')); ?>
</a></xmp>
</p>

View File

@ -31,7 +31,7 @@ script(
<?php if($_['appstoreEnabled']): ?>
<li>
<a class="app-external" target="_blank" href="https://owncloud.org/dev"><?php p($l->t('Developer documentation'));?> ↗</a>
<a class="app-external" target="_blank" href="https://docs.nextcloud.org/server/9/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
</li>
<?php endif; ?>
</script>
@ -103,12 +103,12 @@ script(
{{#if missingMinOwnCloudVersion}}
<div class="app-dependencies">
<p><?php p($l->t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
<p><?php p($l->t('This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later.')); ?></p>
</div>
{{else}}
{{#if missingMaxOwnCloudVersion}}
<div class="app-dependencies">
<p><?php p($l->t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
<p><?php p($l->t('This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later.')); ?></p>
</div>
{{/if}}
{{/if}}

View File

@ -159,12 +159,6 @@ if($_['passwordChangeSupported']) {
</option>
<?php endforeach;?>
</select>
<?php if (OC_Util::getEditionString() === ''): ?>
<a href="https://www.transifex.com/projects/p/owncloud/"
target="_blank" rel="noreferrer">
<em><?php p($l->t('Help translate'));?></em>
</a>
<?php endif; ?>
</form>
<div id="clientsbox" class="section clientsbox">
@ -185,11 +179,11 @@ if($_['passwordChangeSupported']) {
<?php if (OC_Util::getEditionString() === ''): ?>
<p>
<?php print_unescaped($l->t('If you want to support the project
<a href="https://owncloud.org/contribute"
<a href="https://nextcloud.com/contribute"
target="_blank" rel="noreferrer">join development</a>
or
<a href="https://owncloud.org/promote"
target="_blank" rel="noreferrer">spread the word</a>!'));?>
<a href="https://help.nextcloud.com/"
target="_blank" rel="noreferrer">help other users</a>!'));?>
</p>
<?php endif; ?>