[PATCH] Bugfix UI: Change button text to indicate user network is generating
From: Wen Wang <wenwang@linux.vnet.ibm.com> When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working. Signed-off-by: Wen Wang <wenwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")", -- 1.7.1
Reviewed-by: Aline Manera <alinefm@linux.vnet.ibm.com> On 08/19/2014 02:42 AM, Wen Wang wrote:
From: Wen Wang <wenwang@linux.vnet.ibm.com>
When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working.
Signed-off-by: Wen Wang <wenwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")",
"KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")",
On 08/19/2014 01:42 PM, Wen Wang wrote:
From: Wen Wang <wenwang@linux.vnet.ibm.com>
When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working.
Signed-off-by: Wen Wang <wenwang@linux.vnet.ibm.com> Reviewed-by: Hongliang Wang <hlwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")",
"KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")",
When error occurs, the button is still "Creating" and disabled, we should change it back to "Create" and enable it for user to continue to operate. On 8/19/2014 1:42 PM, Wen Wang wrote:
From: Wen Wang <wenwang@linux.vnet.ibm.com>
When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working.
Signed-off-by: Wen Wang <wenwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")",
"KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")",
If I continue to change the "Network Name", then the button is enabled with text "Creating". On 8/19/2014 1:42 PM, Wen Wang wrote:
From: Wen Wang <wenwang@linux.vnet.ibm.com>
When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working.
Signed-off-by: Wen Wang <wenwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")",
"KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")",
Thanks Yu Xin, I have already sent a V2 that fix this. Best Regards Wang Wen On 8/20/2014 5:13 PM, Yu Xin Huo wrote:
If I continue to change the "Network Name", then the button is enabled with text "Creating".
On 8/19/2014 1:42 PM, Wen Wang wrote:
From: Wen Wang<wenwang@linux.vnet.ibm.com>
When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working.
Signed-off-by: Wen Wang<wenwang@linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")",
"KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")",
participants (4)
-
Aline Manera -
Hongliang Wang -
Wen Wang -
Yu Xin Huo