sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10028 from nextcloud/feature/noid/settings-papercuts 

Fix some minor settings UI issues
pull/10061/head
Morris Jobke 2018-06-29 14:38:38 +07:00 committed by GitHub
parent a788f49114 94dcddc45e
commit c76c8a69dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 80 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/systemtags/css/settings.css
Unescape Escape View File

@ -0,0 +1,17 @@
.systemtag-input {
display: flex;
max-width: 500px;
}
#systemtags .select2-container {
width: 100%;
max-width: 500px;
}
#systemtag_name {
flex-grow: 1;
}
#systemtag_delete,
#systemtag_reset,
#systemtag_submit {
padding: 8px;
}

6
apps/systemtags/js/admin.js
Unescape Escape View File

@ -116,12 +116,14 @@
if (tagId > 0) {
$('#systemtags').attr('data-systemtag-id', tagId);
$('#systemtag_delete').removeClass('hidden');
$('#systemtag_submit').val(t('systemtags_manager', 'Update'));
$('#systemtag_submit span').text(t('systemtags_manager', 'Update'));
$('#systemtag_create').addClass('hidden');
} else {
$('#systemtag').select2('val', '');
$('#systemtags').attr('data-systemtag-id', '');
$('#systemtag_delete').addClass('hidden');
$('#systemtag_submit').val(t('systemtags_manager', 'Create'));
$('#systemtag_submit span').text(t('systemtags_manager', 'Create'));
$('#systemtag_create').removeClass('hidden');
}
},

31
apps/systemtags/templates/admin.php
Unescape Escape View File

@ -27,32 +27,31 @@ script('core', [
]);
script('systemtags', 'admin');
style('systemtags', 'settings');
/** @var \OCP\IL10N $l */
?>
<form id="systemtags" class="section" data-systemtag-id="">
<h2><?php p($l->t('Collaborative tags')); ?></h2>
<p class="settings-hint"><?php p($l->t('Create and edit collaborative tags. These tags affect all users.')); ?></p>
<p class="settings-hint"><?php p($l->t('Collaborative tags are available for all users. Restricted tags are visible to users but cannot be assigned by them. Invisible tags are for internal use, since users cannot see or assign them.')); ?></p>
<input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag …')); ?>" style="width: 400px;" />
<input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag …')); ?>" />
<br><br>
<h3 id="systemtag_create"><?php p($l->t('Create a new tag')); ?></h3>
<input type="text" id="systemtag_name" name="systemtag_name" placeholder="<?php p($l->t('Name')); ?>" style="width: 200px;">
<div class="systemtag-input">
<input type="text" id="systemtag_name" name="systemtag_name" placeholder="<?php p($l->t('Name')); ?>">
<span id="systemtag_delete" class="hidden">
<img src="<?php p(\OCP\Template::image_path('core', 'actions/delete.svg')); ?>" alt="<?php p($l->t('Delete')); ?>">
</span>
<select id="systemtag_level">
<option value="3"><?php p($l->t('Public')); ?></option>
<option value="2"><?php p($l->t('Restricted')); ?></option>
<option value="0"><?php p($l->t('Invisible')); ?></option>
</select>
<br>
<a id="systemtag_delete" class="hidden icon-delete"><span class="hidden-visually"><?php p($l->t('Delete')); ?></span></a>
<a id="systemtag_reset" class="icon-close"><span class="hidden-visually"><?php p($l->t('Reset')); ?></span></a>
<a id="systemtag_submit" class="icon-confirm"><span class="hidden-visually"><?php p($l->t('Create')); ?></span></a>
</div>
<select id="systemtag_level">
<option value="3"><?php p($l->t('Public')); ?></option>
<option value="2"><?php p($l->t('Restricted')); ?></option>
<option value="0"><?php p($l->t('Invisible')); ?></option>
</select>
<input type="button" id="systemtag_submit" value="<?php p($l->t('Create')); ?>">
<input type="button" id="systemtag_reset" value="<?php p($l->t('Reset')); ?>">
</form>

19
apps/workflowengine/css/admin.css
Unescape Escape View File

@ -11,6 +11,10 @@
.workflowengine .operation button {
margin-bottom: 0;
}
.workflowengine .operation-name {
width: 100%;
max-width: 500px;
}
.workflowengine .operation span.info {
padding: 7px;
color: #eee;
@ -34,10 +38,23 @@
background-color: #f8f8f8;
}
.workflowengine .operation-header .operation-name {
align-self: flex-start;
padding: 10px;
}
.workflowengine .operation-header {
display: flex;
}
.workflowengine .operation-header .select2-container {
align-self: flex-end;
}
.workflowengine .operation-header .icon-delete {
margin-left: auto;
}
.workflowengine .operation .button-delete,
.workflowengine .operation .button-delete-check {
opacity: 0.5;
padding: 7px;
padding: 11px;
}
.workflowengine .operation .button-delete:hover,
.workflowengine .operation .button-delete:focus,

16
apps/workflowengine/templates/admin.php
Unescape Escape View File

@ -46,12 +46,14 @@
<script type="text/template" id="operation-template">
<div class="operation{{#if hasChanged}} modified{{/if}}">
<input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}">
{{! delete only makes sense if the operation is already saved }}
{{#if operation.id}}
<span class="button-delete pull-right icon-delete"></span>
{{/if}}
<input type="text" class="pull-right operation-operation" value="{{operation.operation}}">
<div class="operation-header">
<input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}" />
<input type="text" class="operation-operation" value="{{operation.operation}}" />
{{! delete only makes sense if the operation is already saved }}
{{#if operation.id}}
<span class="button-delete icon-delete"></span>
{{/if}}
</div>
<div class="checks">
{{#each operation.checks}}
@ -67,7 +69,7 @@
{{/each}}
</select>
<input type="text" class="check-value" value="{{value}}">
<span class="button-delete-check pull-right icon-delete"></span>
<span class="button-delete-check icon-delete"></span>
</div>
{{/each}}
</div>

2
lib/composer/composer/autoload_classmap.php
Unescape Escape View File

@ -936,7 +936,6 @@ return array(
'OC\\Settings\\Admin\\Mail' => $baseDir . '/lib/private/Settings/Admin/Mail.php',
'OC\\Settings\\Admin\\Overview' => $baseDir . '/lib/private/Settings/Admin/Overview.php',
'OC\\Settings\\Admin\\Server' => $baseDir . '/lib/private/Settings/Admin/Server.php',
'OC\\Settings\\Admin\\ServerDevNotice' => $baseDir . '/lib/private/Settings/Admin/ServerDevNotice.php',
'OC\\Settings\\Admin\\Sharing' => $baseDir . '/lib/private/Settings/Admin/Sharing.php',
'OC\\Settings\\Application' => $baseDir . '/settings/Application.php',
'OC\\Settings\\BackgroundJobs\\VerifyUserData' => $baseDir . '/settings/BackgroundJobs/VerifyUserData.php',
@ -958,6 +957,7 @@ return array(
'OC\\Settings\\Personal\\Additional' => $baseDir . '/lib/private/Settings/Personal/Additional.php',
'OC\\Settings\\Personal\\PersonalInfo' => $baseDir . '/lib/private/Settings/Personal/PersonalInfo.php',
'OC\\Settings\\Personal\\Security' => $baseDir . '/lib/private/Settings/Personal/Security.php',
'OC\\Settings\\Personal\\ServerDevNotice' => $baseDir . '/lib/private/Settings/Personal/ServerDevNotice.php',
'OC\\Settings\\Section' => $baseDir . '/lib/private/Settings/Section.php',
'OC\\Setup' => $baseDir . '/lib/private/Setup.php',
'OC\\Setup\\AbstractDatabase' => $baseDir . '/lib/private/Setup/AbstractDatabase.php',

2
lib/composer/composer/autoload_static.php
Unescape Escape View File

@ -966,7 +966,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Settings\\Admin\\Mail' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Mail.php',
'OC\\Settings\\Admin\\Overview' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Overview.php',
'OC\\Settings\\Admin\\Server' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Server.php',
'OC\\Settings\\Admin\\ServerDevNotice' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/ServerDevNotice.php',
'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Sharing.php',
'OC\\Settings\\Application' => __DIR__ . '/../../..' . '/settings/Application.php',
'OC\\Settings\\BackgroundJobs\\VerifyUserData' => __DIR__ . '/../../..' . '/settings/BackgroundJobs/VerifyUserData.php',
@ -988,6 +987,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Settings\\Personal\\Additional' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Additional.php',
'OC\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/PersonalInfo.php',
'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Security.php',
'OC\\Settings\\Personal\\ServerDevNotice' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/ServerDevNotice.php',
'OC\\Settings\\Section' => __DIR__ . '/../../..' . '/lib/private/Settings/Section.php',
'OC\\Setup' => __DIR__ . '/../../..' . '/lib/private/Setup.php',
'OC\\Setup\\AbstractDatabase' => __DIR__ . '/../../..' . '/lib/private/Setup/AbstractDatabase.php',

4
lib/private/Settings/Manager.php
Unescape Escape View File

@ -262,8 +262,6 @@ class Manager implements IManager {
/** @var ISettings $form */
$form = new Admin\Overview($this->config);
$forms[$form->getPriority()] = [$form];
$form = new Admin\ServerDevNotice();
$forms[$form->getPriority()] = [$form];
}
if ($section === 'server') {
/** @var ISettings $form */
@ -305,6 +303,8 @@ class Manager implements IManager {
$this->l
);
$forms[$form->getPriority()] = [$form];
$form = new Personal\ServerDevNotice();
$forms[$form->getPriority()] = [$form];
}
if($section === 'security') {
/** @var ISettings $form */

8
lib/private/Settings/Admin/ServerDevNotice.php → lib/private/Settings/Personal/ServerDevNotice.php
Unescape Escape View File

@ -18,10 +18,10 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Settings\Admin;
namespace OC\Settings\Personal;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\Settings\ISettings;
@ -31,14 +31,14 @@ class ServerDevNotice implements ISettings {
* @return TemplateResponse
*/
public function getForm() {
return new TemplateResponse('settings', 'settings/admin/server.development.notice');
return new TemplateResponse('settings', 'settings/personal/development.notice');
}
/**
* @return string the section ID, e.g. 'sharing'
*/
public function getSection() {
return 'server';
return 'personal-info';
}
/**

9
settings/css/settings.scss
Unescape Escape View File

@ -96,14 +96,14 @@ input {
#personal-settings-avatar-container {
display: inline-grid;
grid-template-columns: 1fr;
grid-template-rows: 2fr 1fr 1fr;
grid-template-rows: 2fr 1fr;
vertical-align: top;
}
.profile-settings-container {
display: inline-grid;
grid-template-columns: 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr;
}
.personal-show-container {
@ -216,7 +216,7 @@ input {
.personal-settings-container {
display: inline-grid;
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr 1fr;
grid-template-rows: 1fr 1fr 1fr;
&:after {
clear: both;
}
@ -405,6 +405,9 @@ table.nostyle {
}
td {
padding: 10px 10px 10px 0;
&:first-child {
padding: 10px;
}
}
}
.token-list td {

3
settings/templates/settings/admin/server.development.notice.php
Unescape Escape View File

@ -1,3 +0,0 @@
<div class="section">
<p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
</div>

2
settings/templates/settings.development.notice.php → settings/templates/settings/personal/development.notice.php
Unescape Escape View File

@ -1,3 +1,4 @@
<div class="followupsection">
<p>
<?php print_unescaped(str_replace(
[
@ -62,3 +63,4 @@
{newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
)); ?>
</p>
</div>

2
tests/Settings/Controller/AdminSettingsControllerTest.php
Unescape Escape View File

@ -22,7 +22,7 @@
*/
namespace Tests\Settings\Controller;
use OC\Settings\Admin\ServerDevNotice;
use OC\Settings\Personal\ServerDevNotice;
use OC\Settings\Controller\AdminSettingsController;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\INavigationManager;