This specific field adds very little to the user experience in comparison with the effort required to mantain it. This patch removes it from the UI, making the "Add a Storage Device to VM" window simpler. Backend support of specifying dev name is left as is because it can be helpful in testing/debugging. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; --- po/de_DE.po | 3 --- po/en_US.po | 3 --- po/es_ES.po | 3 --- po/fr_FR.po | 3 --- po/it_IT.po | 3 --- po/ja_JP.po | 3 --- po/kimchi.pot | 3 --- po/ko_KR.po | 3 --- po/pt_BR.po | 3 --- po/ru_RU.po | 3 --- po/zh_CN.po | 3 --- po/zh_TW.po | 3 --- ui/js/src/kimchi.guest_storage_add.main.js | 7 +++---- ui/pages/guest-storage-add.html.tmpl | 17 ++++------------- 14 files changed, 7 insertions(+), 53 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 06d8c38..da6fe9d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1183,9 +1183,6 @@ msgstr "Löschen" msgid "Add a Storage Device to VM" msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" -msgid "Device Name" -msgstr "Einheitenname" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/en_US.po b/po/en_US.po index 11fcec9..459af07 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1057,9 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/es_ES.po b/po/es_ES.po index 4aec448..96027dc 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1201,9 +1201,6 @@ msgstr "Suprimir" msgid "Add a Storage Device to VM" msgstr "Añadir un dispositivo de almacenamiento a VM" -msgid "Device Name" -msgstr "Nombre de dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/fr_FR.po b/po/fr_FR.po index 6b2bd2d..35de2b5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1189,9 +1189,6 @@ msgstr "Supprimer" msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" -msgid "Device Name" -msgstr "Nom de Périphérique" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/it_IT.po b/po/it_IT.po index 3293fa2..672ba1b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1170,9 +1170,6 @@ msgstr "Elimina" msgid "Add a Storage Device to VM" msgstr "Aggiungi un dispositivo di memoria alla VM" -msgid "Device Name" -msgstr "Nome dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ja_JP.po b/po/ja_JP.po index a2740bf..2915b2a 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1182,9 +1182,6 @@ msgstr "削除" msgid "Add a Storage Device to VM" msgstr "VM にストレージ・デバイスを追加" -msgid "Device Name" -msgstr "デバイス名" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/kimchi.pot b/po/kimchi.pot index cd0a1ac..5421615 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1057,9 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ko_KR.po b/po/ko_KR.po index 20e8a0f..b9f8268 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1113,9 +1113,6 @@ msgstr "삭제" msgid "Add a Storage Device to VM" msgstr "스토리지 장치를 VM에 추가" -msgid "Device Name" -msgstr "장치 이름" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d18a2d..4661585 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1189,9 +1189,6 @@ msgstr "Remover" msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" -msgid "Device Name" -msgstr "Nome do dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ru_RU.po b/po/ru_RU.po index 069e083..d10ed6c 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1113,9 +1113,6 @@ msgstr "Удалить" msgid "Add a Storage Device to VM" msgstr "Добавить устройство хранения в VM" -msgid "Device Name" -msgstr "Имя устройства" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/zh_CN.po b/po/zh_CN.po index e6f9ac7..636dd46 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1076,9 +1076,6 @@ msgstr "删除" msgid "Add a Storage Device to VM" msgstr "为虚拟机添加一个存储设备" -msgid "Device Name" -msgstr "设备名称" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/zh_TW.po b/po/zh_TW.po index 69e1c9a..5994802 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1060,9 +1060,6 @@ msgstr "刪除" msgid "Add a Storage Device to VM" msgstr "將儲存裝置新增至 VM" -msgid "Device Name" -msgstr "裝置名稱" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..54ae748 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -28,7 +28,6 @@ kimchi.guest_storage_add_main = function() { var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); - var nameTextbox = $('input[name="dev"]', storageAddForm); var typeTextbox = $('input[name="type"]', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); @@ -139,7 +138,7 @@ kimchi.guest_storage_add_main = function() { }; $(submitButton).prop('disabled', true); - $.each([nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', true); val = $(c).val() if (val && val != '') { @@ -150,7 +149,7 @@ kimchi.guest_storage_add_main = function() { validateSpecifiedForm = validator[settings['type']]; if (!validateSpecifiedForm(settings)) { $(submitButton).prop('disabled', false); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); return false; @@ -167,7 +166,7 @@ kimchi.guest_storage_add_main = function() { result['responseJSON']['reason']; kimchi.message.error(errText); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); $(submitButton).removeClass('loading').text(i18n['KCHVMCD6002M']); diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index ca064fc..c991f42 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -29,16 +29,7 @@ <div class="content"> <form id="form-guest-storage-add"> <section class="form-section"> - <h2>1. $_("Device Name")</h2> - <div class="field"> - <p class="text-help"> - $_("The name used to identify the device. If omitted, a name will be chosen automatically.") - </p> - <input type="text" class="text" name="dev" /> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Device Type")</h2> + <h2>1. $_("Device Type")</h2> <div class="field"> <p class="text-help"> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.") @@ -55,7 +46,7 @@ </section> <div class="volume-section hidden"> <section class="form-section"> - <h2>4. $_("Storage Pool")</h2> + <h2>2. $_("Storage Pool")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage pool which volume located in") @@ -70,7 +61,7 @@ </div> </section> <section class="form-section"> - <h2>5. $_("Storage Volume")</h2> + <h2>3. $_("Storage Volume")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage volume to be attached") @@ -87,7 +78,7 @@ </div> <div class="path-section"> <section class="form-section"> - <h2>4. $_("File Path")</h2> + <h2>2. $_("File Path")</h2> <div class="field"> <p class="text-help"> $_("The ISO file path in the server for CDROM.") -- 1.8.3.1