Skip to content

Fix design of settings page #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Jan 3, 2020
Merged

Fix design of settings page #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions css/personalsettings.css
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions css/personalsettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.clientslinks {
margin-top: 20px;
margin-bottom: 20px;

.button {
display: inline-block;
padding: 0.7rem 1rem;

.appsmall {
vertical-align: sub;
margin-right: 0.2rem;
}
}
}

.clipboardButton {
display: inline-block;
padding-left: 36px;
background-position: 12px;
}

#endpoint-url {
width: 250px;
}
18 changes: 8 additions & 10 deletions templates/personal-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div id="clientsbox" class="section clientsbox">
<h2><?php p($l->t('Get the apps to sync your files'));?></h2>

<p><?php p($l->t('%s gives you access to your files wherever you are. Our easy to use desktop and mobile clients are available for all major platforms at zero cost.', [$theme->getName()])); ?></p>
<p class="settings-hint"><?php p($l->t('%s gives you access to your files wherever you are. Our easy to use desktop and mobile clients are available for all major platforms at zero cost.', [$theme->getName()])); ?></p>

<div class="clientslinks">
<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer noopener" target="_blank">
Expand All @@ -51,12 +51,12 @@
$macOSProfile = \OCP\Util::linkToRemote('dav') . 'provisioning/apple-provisioning.mobileconfig';
$usesTLS = \OC::$server->getRequest()->getServerProtocol() === 'https';
?>
<p><?php print_unescaped($l->t('Setup sync clients using an <a href="%s">app password</a>. That way you can make sure you are able to revoke access in case you lose that device.', [$appPasswordUrl])); ?></p>
<p><?php print_unescaped($l->t('Set up sync clients using an <a href="%s">app password</a>. That way you can make sure you are able to revoke access in case you lose that device.', [$appPasswordUrl])); ?></p>
</div>
<div class="followupsection">
<div class="section">
<h2><?php p($l->t('Connect other apps to %s', array($theme->getName()))); ?></h2>

<p><?php print_unescaped($l->t('Besides the sync clients you can connect any other software that supports the WebDAV/CalDAV/CardDAV protocols to %s.', [$theme->getName()])); ?></p>
<p class="settings-hint"><?php print_unescaped($l->t('Besides the mobile apps and desktop client you can connect any other software that supports the WebDAV/CalDAV/CardDAV protocols to %s.', [$theme->getName()])); ?></p>

<div class="clientslinks">
<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-calendars')) ?>" rel="noreferrer noopener">
Expand All @@ -83,13 +83,11 @@
<?php endif; ?>
</div>
</div>
<div class="followupsection">
<div class="section">
<h2><?php p($l->t('Server address')); ?></h2>

<p><?php p($l->t('Use this link to connect your apps and desktop client to this server:')); ?></p>
<div>
<input type="text" readonly="readonly" id="endpoint-url" value="<?php echo p($_['url']); ?>" />
<a class="clipboardButton icon icon-clippy" data-clipboard-target="#endpoint-url"></a>
</div>
<p class="settings-hint"><?php p($l->t('Use this link to connect your apps and desktop client to this server:')); ?></p>

<input type="text" readonly="readonly" id="endpoint-url" value="<?php echo p($_['url']); ?>" />
<a class="button clipboardButton icon-clippy" data-clipboard-target="#endpoint-url"><?php p($l->t('Copy link')); ?></a>
</div>