From ff2c819ed3df2daa7c1cc8827e34b738188ff108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 27 Jun 2018 19:59:17 +0200 Subject: [PATCH 1/6] Move social buttons to the personal settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/Settings/Manager.php | 4 ++-- .../Settings/{Admin => Personal}/ServerDevNotice.php | 8 ++++---- settings/css/settings.scss | 6 +++--- .../settings/admin/server.development.notice.php | 3 --- .../personal/development.notice.php} | 2 ++ 5 files changed, 11 insertions(+), 12 deletions(-) rename lib/private/Settings/{Admin => Personal}/ServerDevNotice.php (86%) delete mode 100644 settings/templates/settings/admin/server.development.notice.php rename settings/templates/{settings.development.notice.php => settings/personal/development.notice.php} (98%) diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 4ee594c090..7040f87261 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -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 */ diff --git a/lib/private/Settings/Admin/ServerDevNotice.php b/lib/private/Settings/Personal/ServerDevNotice.php similarity index 86% rename from lib/private/Settings/Admin/ServerDevNotice.php rename to lib/private/Settings/Personal/ServerDevNotice.php index 22637729b0..fa5a736cde 100644 --- a/lib/private/Settings/Admin/ServerDevNotice.php +++ b/lib/private/Settings/Personal/ServerDevNotice.php @@ -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 . + * along with this program. If not, see . * */ -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'; } /** diff --git a/settings/css/settings.scss b/settings/css/settings.scss index cfca22d5bb..a573f94d49 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -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 2fr; } .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; } diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php deleted file mode 100644 index 42599c5445..0000000000 --- a/settings/templates/settings/admin/server.development.notice.php +++ /dev/null @@ -1,3 +0,0 @@ -
-

-
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings/personal/development.notice.php similarity index 98% rename from settings/templates/settings.development.notice.php rename to settings/templates/settings/personal/development.notice.php index 855c4dc26c..41f70c0a82 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings/personal/development.notice.php @@ -1,3 +1,4 @@ +

{linkclose}' )); ?>

+
\ No newline at end of file From 0ec483b668d14ec85ca23004cbc1ae1422909748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 27 Jun 2018 19:59:50 +0200 Subject: [PATCH 2/6] Fix padding in devices/sessions list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- settings/css/settings.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index a573f94d49..3620cf45c0 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -405,6 +405,9 @@ table.nostyle { } td { padding: 10px 10px 10px 0; + &:first-child { + padding: 10px; + } } } .token-list td { From d6947a56c0a3994e876f708a6f23dc32d10384af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 28 Jun 2018 13:15:35 +0200 Subject: [PATCH 3/6] 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 diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css new file mode 100644 index 0000000000..5313247227 --- /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 1388d5b2d7..280616ea43 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 e964f610ca..3d0b915c52 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 5494b35ce6..0c34ffc809 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 e9873f8f28..26d581aee0 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -46,12 +46,14 @@