[Issue 296 V3 0/2] Issue#296 debug report: kimchi UI should not waiting while generating reports
by Wang Wen
Issue#296 debug report: kimchi UI should not waiting while generating reports
V2 -> V3
Change the layout of the grid: Removed the frist column that has line number
Changed the progress bar layout that make the whole table more consistant.
V1 -> V2
Accroding to Yu Xin, this patch move the progress bar to the top of the
grid and use ellipsis for hiding the name that is too long for the
generating progress bar.
1) Removed the dialogue window when generating a debug report.
2) Designed an animation bar indicate user there is a report generating
during the generating progress.
3) Disable the buttons' functions in debug report area when generating a new
report in case there might be any conflict. Meanwhile user can operate
on other parts of Kimchi.
4) Enable all buttonss' functions in debug report area after generating
progress.
Wang Wen (2):
Remove the first column of debug report grid
Added the generating progress indicator
ui/css/theme-default/host.css | 11 +++++++----
ui/css/theme-default/report-add.css | 9 +--------
ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
ui/js/src/kimchi.host.js | 6 +-----
ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
ui/pages/i18n.html.tmpl | 1 +
6 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 ui/images/theme-default/progress.gif
9 years, 10 months
[PATCH V4 0/2] Issue#296 UI redesign when generating debug reports
by Wang Wen
Issue#296 debug report: kimchi UI should not waiting while generating reports
V3 -> V4
Changed generating logo(Hong Liang Wang)
V2 -> V3
Change the layout of the grid: Removed the frist column that has line number
Changed the progress bar layout that make the whole table more consistant.
V1 -> V2
Accroding to Yu Xin, this patch move the progress bar to the top of the
grid and use ellipsis for hiding the name that is too long for the
generating progress bar.
1) Removed the dialogue window when generating a debug report.
2) Designed an animation bar indicate user there is a report generating
during the generating progress.
3) Disable the buttons' functions in debug report area when generating a new
report in case there might be any conflict. Meanwhile user can operate
on other parts of Kimchi.
4) Enable all buttonss' functions in debug report area after generating
progress.
Wang Wen (2):
Remove the first column of debug report grid
Added the generating progress indicator
ui/css/theme-default/host.css | 11 ++++++---
ui/css/theme-default/report-add.css | 9 +-------
ui/images/theme-default/kimchi-loading.gif | Bin 6181 -> 6181 bytes
ui/images/theme-default/kimchi-loading15x15.gif | Bin 0 -> 1653 bytes
ui/js/src/kimchi.host.js | 6 +----
ui/js/src/kimchi.report_add_main.js | 26 ++++++++++++++++++----
ui/pages/i18n.html.tmpl | 1 +
7 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 ui/images/theme-default/kimchi-loading15x15.gif
9 years, 10 months
[PATCH V2 0/5] add a new login page.
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V1 -> V2:
when username or password is wrong, back to login page with an error message.
when session time out, back to login page with an error message.
ShaoHe Feng (5):
create a new login page
redirect the URL to login page when session timeout or first login
when login successfully, redirect to the last page.
login page prompts error when username or password is wrong
login page prompts error when session timeout
src/kimchi/auth.py | 39 ++++++--
src/kimchi/config.py.in | 3 +
src/kimchi/root.py | 38 ++++++--
ui/images/progressing.gif | Bin 0 -> 1152 bytes
ui/js/src/kimchi.main.js | 13 ++-
ui/pages/login.html.tmpl | 228 ++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 299 insertions(+), 22 deletions(-)
create mode 100644 ui/images/progressing.gif
create mode 100644 ui/pages/login.html.tmpl
--
1.9.3
9 years, 10 months
[Issue 296 V2 0/2] *** SUBJECT HERE ***
by Wang Wen
*** BLURB HERE ***
Issue#296 debug report: kimchi UI should not waiting while generating reports
Wang Wen (2):
Remove the first column of debug report grid
Added the generating progress indicator
ui/css/theme-default/host.css | 11 +++++++----
ui/css/theme-default/report-add.css | 9 +--------
ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
ui/js/src/kimchi.host.js | 6 +-----
ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
ui/pages/i18n.html.tmpl | 1 +
6 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 ui/images/theme-default/progress.gif
9 years, 10 months
[PATCH V2] Issue #296 [enhance]kimchi UI should not waiting while generating reports
by Wang Wen
From: Wen Wang <wenwang(a)linux.vnet.ibm.com>
V1 -> V2
Accroding to Yu Xin, this patch move the progress bar to the top of the
grid and use ellipsis for hiding the name that is too long for the
generating progress bar.
1) Removed the dialogue window when generating a debug report.
2) Designed an animation bar indicate user there is a report generating
during the generating progress.
3) Disable the buttons' functions in debug report area when generating a new
report in case there might be any conflict. Meanwhile user can operate
on other parts of Kimchi.
4) Enable all buttonss' functions in debug report area after generating
progress.
---
ui/css/theme-default/host.css | 28 ++++++++++++++++++++++++++++
ui/js/src/kimchi.report_add_main.js | 30 +++++++++++++++++++++++++-----
2 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css
index ed28d25..4e319cb 100644
--- a/ui/css/theme-default/host.css
+++ b/ui/css/theme-default/host.css
@@ -219,6 +219,34 @@
width: 200px;
}
+#id-generate-bar {
+ text-align: center;
+ vertical-align: middle;
+}
+
+#id-generate-panel {
+ vertical-align: middle;
+ margin: 0 auto;
+ text-align: center;
+ height: 20px;
+ width: 250px;
+ border: 1px solid #ccc;
+ background-color: #5af;
+ color: #fff;
+ background: #5af url(../../images/theme-default/loading.gif) 25px
+ center no-repeat;
+ padding-left: 26px;
+}
+
+#id-generating > span{
+ display: inline-block;
+ text-align: center;
+ vertical-align: middle;
+ max-width: 120px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
/* End of Debug Report */
/* Software Updates */
diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js
index 8759c2b..f8149ea 100644
--- a/ui/js/src/kimchi.report_add_main.js
+++ b/ui/js/src/kimchi.report_add_main.js
@@ -1,4 +1,5 @@
kimchi.report_add_main = function() {
+ var reportGridID = 'available-reports-grid';
var addReportForm = $('#form-report-add');
var submitButton = $('#button-report-add');
var nameTextbox = $('input[name="name"]', addReportForm);
@@ -13,12 +14,31 @@ kimchi.report_add_main = function() {
return false;
}
var formData = addReportForm.serializeObject();
- submitButton
- .text(i18n['KCHDR6007M'])
- .prop('disabled', true);
- nameTextbox.prop('disabled', true);
+ kimchi.window.close();
+ var reportGrid = null;
+ $('#' + reportGridID + '-generate-button').prop('disabled',true);
+ $('#' + reportGridID + '-remove-button').prop('disabled',true);
+ $('#' + reportGridID + '-download-button').prop('disabled',true);
+ $('#' + reportGridID + '-rename-button').prop('disabled',true);
+ $('#' + reportGridID).find('.grid-body').find('table').find('tr').click(function() {
+ $('#' + reportGridID + '-remove-button').prop('disabled',true);
+ $('#' + reportGridID + '-download-button').prop('disabled',true);
+ $('#' + reportGridID + '-rename-button').prop('disabled',true);
+ });
+ $('#available-reports-grid').find('.grid-frozen-body-view').find('table').prepend('<tr id="temp-row-col1"><td></td></tr>');
+ $('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr id="temp-row-col2"><td id="id-generate-bar"; colspan="2"></td></tr>');
+ var textboxValue = $('#report-name-textbox').val();
+ $('#id-generate-bar').append('<div id="id-generate-panel"></div>');
+ if (textboxValue != "") {
+ $('#id-generate-panel').append('<div id="id-generating"><span>"' + textboxValue + '</span><span>" is ' + i18n['KCHDR6007M'] + '</span></div>');
+ }
+ else {
+ $('#id-generate-panel').append('<div id="id-generating">' + i18n['KCHDR6007M'] + '</div>');
+ }
kimchi.createReport(formData, function(result) {
- kimchi.window.close();
+ $('#temp-row-col1').remove();
+ $('#temp-row-col2').remove();
+ $('#' + reportGridID + '-generate-button').prop('disabled',false);
kimchi.topic('kimchi/debugReportAdded').publish({
result: result
});
--
1.7.1
9 years, 10 months
[PATCH] Fix Text Truncated Problem of Login Button
by Hongliang Wang
Long text in some languages of login button is truncated. Fix it in this patch.
Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
---
ui/css/theme-default/login-window.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css
index 8a21090..f4ad5f8 100644
--- a/ui/css/theme-default/login-window.css
+++ b/ui/css/theme-default/login-window.css
@@ -69,7 +69,7 @@
#login-window .login-panel button {
font-size: 18px;
height: 40px;
- width: 160px;
+ min-width: 160px;
float: right;
}
--
1.8.1.4
9 years, 10 months
[PATCH v2] Fix text alignment on storage pool type combo boxes
by Crístian Viana
The storage pool type list does not have a left padding like the
other combo boxes in Kimchi, bringing the text very close to the UI
component's border.
The SCSI device list on the same window has the same alignment problem.
Apply a common CSS class to the combo boxes so they look like the other
objects in the application.
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
ui/pages/storagepool-add.html.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl
index 977db66..ba85e6e 100644
--- a/ui/pages/storagepool-add.html.tmpl
+++ b/ui/pages/storagepool-add.html.tmpl
@@ -44,7 +44,7 @@
<div class="storage-type-wrapper-controls">
<div id="poolTypeId">
<input id="poolTypeInputId" name="type" type="hidden" value="dir"/>
- <span id="pool-type-label"></span><span class="arrow"></span>
+ <span id="pool-type-label" class="text"></span><span class="arrow"></span>
<div>
<ul id="storagePool-list">
</ul>
@@ -142,7 +142,7 @@
<div class="storage-type-wrapper-controls">
<div id="scsiAdapter">
<input type="hidden"/>
- <span></span><span class="arrow"></span>
+ <span class="text"></span><span class="arrow"></span>
<div><ul></ul></div>
</div>
</div>
--
1.9.0
9 years, 10 months
[PATCH] Remove button "Cancel" from modal dialog
by Crístian Viana
Only one of the modal dialogs in Kimchi has a "Cancel" button along with
the form submit button. That button layout is inconsistent with the rest of
the application and it provides the same functionality as the "X" button
present at the top of every dialog.
Remove the button "Cancel" from the dialog "Edit template".
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
ui/js/src/kimchi.template_edit_main.js | 4 ----
ui/pages/template-edit.html.tmpl | 1 -
2 files changed, 5 deletions(-)
diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js
index f0f4718..9ff8bcc 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -104,10 +104,6 @@ kimchi.template_edit_main = function() {
});
});
- $('#tmpl-edit-button-cancel').on('click', function() {
- kimchi.window.close();
- });
-
$('#template-edit-storagePool').change(function() {
storagepool = $(this).val();
var storageArray = storagepool.split("/");
diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl
index 434d938..8a4f0e4 100644
--- a/ui/pages/template-edit.html.tmpl
+++ b/ui/pages/template-edit.html.tmpl
@@ -141,7 +141,6 @@
</div>
<footer>
<div class="btn-group">
- <a id="tmpl-edit-button-cancel" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Cancel")</span></a>
<a id="tmpl-edit-button-save" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Save")</span></a>
</div>
</footer>
--
1.9.0
9 years, 10 months
[PATCH v2] Update README with the correct FF ESR version.
by Adam King
The README should indicate that Kimchi now supports FF 24 ESR which was released late in 2013.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
---
docs/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/README.md b/docs/README.md
index 63ac760..c658637 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -14,7 +14,7 @@ Desktop Browser Support:
-----------------------
* **Internet Explorer:** IE9+
* **Chrome:** Current-1 version
-* **Firefox:** Current-1 version Firefox 17ESR
+* **Firefox:** Current-1 version Firefox 24ESR
* **Safari:** Current-1 version
* **Opera:** Current-1 version
--
1.9.0
9 years, 10 months
[PATCH v2] VM template: add disk size error message
by Zhou Zheng Sheng
The schema checker needs to report an error message when the disk size
is less than 1GB. Currently this message is missing, so it reports an
KeyError. This patch adds the error message.
How to trigger this bug:
1. In Web UI, create a template as usual.
2. Edit the template, define the disk size as 0.5.
v2:
v1 adds the error to "disks", but the error is not raised against it.
v2 correctly adds the error message to the "size" constraint.
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
src/kimchi/API.json | 6 ++++--
src/kimchi/i18n.py | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/kimchi/API.json b/src/kimchi/API.json
index b9d371a..76c94ab 100644
--- a/src/kimchi/API.json
+++ b/src/kimchi/API.json
@@ -379,7 +379,8 @@
"size": {
"description": "Size (GB) of the disk",
"type": "number",
- "minimum": 1
+ "minimum": 1,
+ "error": "KCHTMPL0022E"
}
}
},
@@ -549,7 +550,8 @@
"size": {
"description": "Size (GB) of the disk",
"type": "number",
- "minimum": 1
+ "minimum": 1,
+ "error": "KCHTMPL0022E"
}
}
},
diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py
index 25b703f..e105e50 100644
--- a/src/kimchi/i18n.py
+++ b/src/kimchi/i18n.py
@@ -119,6 +119,7 @@ messages = {
"KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"),
"KCHTMPL0020E": _("Unable to create template due error: %(err)s"),
"KCHTMPL0021E": _("Unable to delete template due error: %(err)s"),
+ "KCHTMPL0022E": _("Disk size must be greater than 1GB."),
"KCHPOOL0001E": _("Storage pool %(name)s already exists"),
"KCHPOOL0002E": _("Storage pool %(name)s does not exist"),
--
1.9.0
9 years, 10 months
