From e33c5013ec830fc3515e79e9b17e7f30aa3d8bb5 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Jun 08 2018 16:24:14 +0000 Subject: Cockpit UI Fixes This patch addresses these tickets: https://pagure.io/389-ds-base/issue/49741 - Fixed repl agreement edit form https://pagure.io/389-ds-base/issue/49740 - Set color-blind friendly colors. Also used Thumbs up/down icons for repl state https://pagure.io/389-ds-base/issue/49703 - Set default values in create instance form (also checks if default ports are available Reviewed by: vashirov(Thanks!) --- diff --git a/src/cockpit/389-console/css/ds.css b/src/cockpit/389-console/css/ds.css index 8b6db11..918513e 100644 --- a/src/cockpit/389-console/css/ds.css +++ b/src/cockpit/389-console/css/ds.css @@ -75,15 +75,15 @@ .ds-repl-state-good { margin: auto; - width: 70px; + width: 30px; height: 30px; - border-radius: 7px; + border-radius: 50%; font-size: 12px; font-weight: bold; color: white; line-height: 1; text-align: center; - background-color: green; + background-color: #4dac26; border-color: black; padding-top: 8px; align-content: center !important; @@ -92,15 +92,15 @@ .ds-repl-state-bad { margin: auto; - width: 70px; + width: 30px; height: 30px; - border-radius: 7px; + border-radius: 50%; font-size: 12px; font-weight: bold; color: white; line-height: 1; text-align: center; - background-color: #f11710 ; + background-color: #d01c8b; border-color: black; padding-top: 8px; align-content: center !important; @@ -121,18 +121,9 @@ margin-bottom: 15px; } -.ds-repl-agmt-good { - background-color: lightgreen !important; - color: black; -} - -.ds-repl-agmt-warning { - background-color: yellow !important; - color: black; -} -.ds-repl-agmt-bad { - background-color: lightsalmon !important; - color: black; +.ds-repl-lag-bad { + font-weight: bold; + color: #7b3294; } .ds-button-border { diff --git a/src/cockpit/389-console/index.html b/src/cockpit/389-console/index.html index 236ccb8..85a327b 100644 --- a/src/cockpit/389-console/index.html +++ b/src/cockpit/389-console/index.html @@ -285,15 +285,15 @@
+ Instance Name
+ Port
+ Secure Port
+ Directory Manager DN

-
'; @@ -27,10 +27,10 @@ var winsync_agmt_action_html = '' + '' + '' + '
'; @@ -397,17 +397,33 @@ $(document).ready( function() { e.preventDefault(); clear_agmt_wizard(); - // Update HTML table var data = repl_agmt_table.row( $(this).parents('tr') ).data(); var edit_agmt_name = data[0]; - // TODO Get agreement from DS + // TODO Get agreement from DS and populate form // Set agreement form values $("#agmt-wizard-title").html("Edit Replication Agreement"); // Open form - $("#agmt-form").css('display', 'block'); + $("#agmt-form").modal('toggle'); + }); + + // Edit Winsync Agreement + $(document).on('click', '.winsync-agmt-edit-btn', function(e) { + e.preventDefault(); + clear_winsync_agmt_wizard(); + + var data = repl_winsync_agmt_table.row( $(this).parents('tr') ).data(); + var edit_agmt_name = data[0]; + + // TODO Get agreement from DS and populate form + + // Set agreement form values + $("#winsync-label").html("Edit Winsync Agreement"); + + // Open form + $("#winsync-agmt-form").modal('toggle'); }); // Handle disabling/enabling of agmt schedule panel diff --git a/src/cockpit/389-console/js/servers.js b/src/cockpit/389-console/js/servers.js index 6e4d790..ea2a443 100644 --- a/src/cockpit/389-console/js/servers.js +++ b/src/cockpit/389-console/js/servers.js @@ -147,14 +147,14 @@ function clear_inst_input() { function clear_inst_form() { $(".ds-modal-error").hide(); $("#create-inst-serverid").val(""); - $("#create-inst-port").val(""); - $("#create-inst-secureport").val(""); - $("#create-inst-rootdn").val(""); + $("#create-inst-port").val("389"); + $("#create-inst-secureport").val("636"); + $("#create-inst-rootdn").val("cn=Directory Manager"); $("#create-inst-user").val("dirsrv"); $("#create-inst-group").val("dirsrv"); $("#rootdn-pw").val(""); $("#rootdn-pw-confirm").val(""); - $("#create-inst-tls").prop('checked', true); + $("#create-inst-tls").prop('checked', false); clear_inst_input(); } @@ -756,6 +756,7 @@ $(document).ready( function() { // Create instance form $("#create-server-btn").on("click", function() {; clear_inst_form(); + set_ports(); }); $("#no-inst-create-btn").on("click", function () { clear_inst_form(); diff --git a/src/cockpit/389-console/monitor.html b/src/cockpit/389-console/monitor.html index 0be0929..94249e4 100644 --- a/src/cockpit/389-console/monitor.html +++ b/src/cockpit/389-console/monitor.html @@ -626,18 +626,18 @@