Skip to content

Add more hints to settings #4540

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
MorrisJobke merged 1 commit into from
Apr 27, 2017
Merged

Add more hints to settings #4540

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
2 changes: 2 additions & 0 deletions apps/federatedfilesharing/templates/settings-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<a target="_blank" rel="noreferrer" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>

<p>
<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
Expand Down
3 changes: 2 additions & 1 deletion apps/federatedfilesharing/templates/settings-personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<?php if ($_['outgoingServer2serverShareEnabled']): ?>
<div id="fileSharingSettings" class="section">
<h2><?php p($l->t('Federated Cloud')); ?></h2>
<p class="settings-hint"><?php p($l->t('You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p>
Copy link
Member

@MariusBluem MariusBluem Apr 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well ... if we do this here (Hint to Nextcloud and ownCloud, Pydio) then we need to do that everywhere, don't we? Wouldn't be a more neutral word like "supported federation server" better? 😬

Copy link
Member Author

@jancborchardt jancborchardt Apr 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's tech-speak and unhelpful though. The question is mainly to @karlitschek if we can/should use the word "ownCloud" there.

Copy link
Member

@MorrisJobke MorrisJobke Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say it is fine, but @karlitschek has the last decision here.

Copy link
Member

@karlitschek karlitschek Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general it is fine of course to show the name of other projects. It is a shared standard after all. But on a different note. I think we should hide product names all together, including Nextcloud, when using branding?

Copy link
Member

@MorrisJobke MorrisJobke Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should hide product names all together, including Nextcloud, when using branding?

Makes sense.

Copy link
Member

@MorrisJobke MorrisJobke Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me remove this for now and merge the PR. We should look into the branding of this text in a separate PR.

Copy link
Member

@MorrisJobke MorrisJobke Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#4561


<p>
<?php p($l->t('Your Federated Cloud ID:')); ?>
Expand All @@ -19,7 +20,7 @@

<?php if ($_['showShareIT']) {?>
<p>
<?php p($l->t('Share it:')); ?><br>
<?php p($l->t('Share it so your friends can share files with you:')); ?><br>
<button class="social-facebook pop-up"
data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
Facebook
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
'appname' => 'files_external',
'script' => 'list.php',
'order' => 30,
'name' => $l->t('External storage'),
'name' => $l->t('External storages'),
];
});

Expand Down
1 change: 0 additions & 1 deletion apps/files_external/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#global_credentials {
padding: 0 30px;
margin-bottom: 0px;
}

#files_external {
Expand Down
5 changes: 4 additions & 1 deletion apps/workflowengine/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@
?>
<div id="<?php p($_['appid']); ?>" class="section workflowengine">
<h2 class="inlineblock"><?php p($_['heading']); ?></h2>

<?php if (!empty($_['docs'])): ?>
<a target="_blank" rel="noreferrer" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs($_['docs'])); ?>">
</a>
<?php endif; ?>

<?php if (!empty($_['settings-hint'])): ?>
Copy link
Member

@nickvergessen nickvergessen Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is what description below is for....

Copy link
Member

@nickvergessen nickvergessen Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So please revert and add the class to the actual description

Copy link
Member Author

@jancborchardt jancborchardt Apr 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nickvergessen I disagree. We need to separate these into two paragraphs for readability. One is an explanation for what you can use it for, the other is a description for how to use it. The first one is important for anyone who wants to find out if this is useful. The second one we actually could show below the form because it’s only relevant when you decided you want to use it.

Copy link
Member

@MorrisJobke MorrisJobke Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @jancborchardt here too.

<p class="settings-hint"><?php p($_['settings-hint']); ?></p>
<?php endif; ?>

<?php if (!empty($_['description'])): ?>
<p><?php p($_['description']); ?></p>
<?php endif; ?>
Expand Down
4 changes: 2 additions & 2 deletions settings/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@

<div id="sessions" class="section">
<h2><?php p($l->t('Sessions'));?></h2>
<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
<table class="icon-loading">
<thead class="token-list-header">
<tr>
Expand All @@ -289,7 +289,7 @@

<div id="apppasswords" class="section">
<h2><?php p($l->t('App passwords'));?></h2>
<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
<table class="icon-loading">
<thead class="hidden-when-empty">
<tr>
Expand Down