From d6947a56c0a3994e876f708a6f23dc32d10384af Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Thu, 28 Jun 2018 13:15:35 +0200 Subject: Adjust collaborative tags and automated tagging settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/systemtags/css/settings.css | 17 +++++++++++++++++ apps/systemtags/js/admin.js | 8 ++++++-- apps/systemtags/templates/admin.php | 31 +++++++++++++++---------------- apps/workflowengine/css/admin.css | 19 ++++++++++++++++++- apps/workflowengine/templates/admin.php | 16 +++++++++------- 5 files changed, 65 insertions(+), 26 deletions(-) create mode 100644 apps/systemtags/css/settings.css (limited to 'apps') diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css new file mode 100644 index 00000000000..5313247227c --- /dev/null +++ b/apps/systemtags/css/settings.css @@ -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; +} \ No newline at end of file diff --git a/apps/systemtags/js/admin.js b/apps/systemtags/js/admin.js index 1388d5b2d7c..280616ea432 100644 --- a/apps/systemtags/js/admin.js +++ b/apps/systemtags/js/admin.js @@ -116,12 +116,16 @@ 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_reset').removeClass('hidden'); + $('#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_reset').addClass('hidden'); + $('#systemtag_submit span').text(t('systemtags_manager', 'Create')); + $('#systemtag_create').removeClass('hidden'); } }, diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index e964f610ca1..3d0b915c52c 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -27,32 +27,31 @@ script('core', [ ]); script('systemtags', 'admin'); +style('systemtags', 'settings'); /** @var \OCP\IL10N $l */ ?>

t('Collaborative tags')); ?>

-

t('Create and edit collaborative tags. These tags affect all users.')); ?>

+

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.')); ?>

- + -

+

t('Create a new tag')); ?>

- +
+ - + -
+ + + t('Create')); ?> +
- - - -
diff --git a/apps/workflowengine/css/admin.css b/apps/workflowengine/css/admin.css index 5494b35ce69..0c34ffc8097 100644 --- a/apps/workflowengine/css/admin.css +++ b/apps/workflowengine/css/admin.css @@ -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, diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php index e9873f8f289..26d581aee03 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -46,12 +46,14 @@