Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: converted docs mapping files to properties ......................................................................
userportal, webadmin: converted docs mapping files to properties Converted the userportal and webadmin context-sensitive help mappings files from CSV format to Java properties format. Filled in the properties files with the current set of all hashnames found in the UI model code. (These new properties files are generated by a python script that I will push in a separate patch.) These files can now act as nice templates for adding context-sensitive help. Change-Id: I6b96d005684007125d5f3940abdbec25d4cae81f Bug-Url: https://bugzilla.redhat.com/1014859 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java D packaging/manual/DocumentationPath.csv D packaging/manual/UserPortalDocumentationPath.csv A packaging/manual/UserPortalDocumentationPath.properties A packaging/manual/WebadminDocumentationPath.properties 7 files changed, 723 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/20793/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java index cb0e958..c189874 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java @@ -23,13 +23,16 @@ String[] lines = fileContent.split("\n"); //$NON-NLS-1$ for (String line : lines) { - String[] parts = line.split(","); //$NON-NLS-1$ + line = line.trim(); + if (line.length() > 0 && !line.startsWith("#")) { //$NON-NLS-1$ + String[] parts = line.split("="); //$NON-NLS-1$ - if (parts.length > 1) { - String name = parts[0] != null && !parts[0].isEmpty() ? parts[0] : null; - String path = parts[1] != null && !parts[1].isEmpty() ? parts[1] : null; - if (name != null && path != null && !documentationPathMap.containsKey(name)) { - documentationPathMap.put(name, path); + if (parts.length == 2) { + String name = parts[0] != null && !parts[0].isEmpty() ? parts[0].trim() : null; + String path = parts[1] != null && !parts[1].isEmpty() ? parts[1].trim() : null; + if (name != null && path != null && !documentationPathMap.containsKey(name)) { + documentationPathMap.put(name, path); + } } } } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java index b8c333e..207b1ab 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java @@ -153,7 +153,7 @@ } protected void fetchDocumentationFile() { - fetchFile(getDocumentationBaseURL() + "UserPortalDocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ + fetchFile(getDocumentationBaseURL() + "UserPortalDocumentationPath.properties", documentationFileFetchedEvent); //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java index 25890e5..ced30ef 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java @@ -100,7 +100,7 @@ } protected void fetchDocumentationFile() { - fetchFile(getDocumentationBaseURL() + "DocumentationPath.csv", documentationFileFetchedEvent); //$NON-NLS-1$ + fetchFile(getDocumentationBaseURL() + "WebadminDocumentationPath.properties", documentationFileFetchedEvent); //$NON-NLS-1$ } } diff --git a/packaging/manual/DocumentationPath.csv b/packaging/manual/DocumentationPath.csv deleted file mode 100644 index e69de29..0000000 --- a/packaging/manual/DocumentationPath.csv +++ /dev/null diff --git a/packaging/manual/UserPortalDocumentationPath.csv b/packaging/manual/UserPortalDocumentationPath.csv deleted file mode 100644 index e69de29..0000000 --- a/packaging/manual/UserPortalDocumentationPath.csv +++ /dev/null diff --git a/packaging/manual/UserPortalDocumentationPath.properties b/packaging/manual/UserPortalDocumentationPath.properties new file mode 100644 index 0000000..ff68b80 --- /dev/null +++ b/packaging/manual/UserPortalDocumentationPath.properties @@ -0,0 +1,245 @@ +# Vms/Templates > Permissions Sub-Tab > Add Permission +add_permission_to_user= + +# Vms > Change CD +change_cd= + +# Vms > Snapshots Tabs > Create Snapshot +create_snapshot= + +# Vms > Console Options +editConsole= + +# Vms > Edit Desktop +edit_desktop= + +# Templates > Logical Network Sub-Tab > Edit Network Interface +edit_network_interface_tmps= + +# Vms > Logical Network Sub-Tab > Edit Network Interface +edit_network_interface_vms= + +# Vms > Edit Server +edit_server= + +# Templates > Edit Template +edit_template= + +# Vms > Virtual Disks Sub-Tab > Edit Virtual Disk +edit_virtual_disk= + +# Vms > New Desktop +new_desktop= + +# Templates > Logical Network Sub-Tab > New Network Interface +new_network_interface_tmps= + +# Vms > Logical Network Sub-Tab > New Network Interface +new_network_interface_vms= + +# Vms > New Server +new_server= + +# Vms > Make Template +new_template= + +# Vms > Virtual Disks Sub-Tab > New Virtual Disk +new_virtual_disk= + +# Vms > Disks Sub-Tab > Remove Disk(s) +remove_disk= + +# Templates > Logical Network Sub-Tab > Remove Network Interface(s) +remove_network_interface_tmps= + +# Vms > Logical Network Sub-Tab > Remove Network Interface(s) +remove_network_interface_vms= + +# Vms/Templates > Permissions Sub-Tab > Remove Permission +remove_permission= + +# Templates > Remove Template(s) +remove_template= + +# Vms > Remove Desktop(s) +remove_virtual_machine= + +# Vms > Run Virtual Machine(s) +run_virtual_machine= + +SanStorageModelBase= +_remove_network_qos= +add_bricks= +add_bricks_confirmation= +add_event_notification= +add_hosts= +add_provider= +add_system_permission_to_user= +add_users_and_groups= +applications= +assign_network= +assign_networks= +assign_tags_hosts= +assign_tags_users= +assign_tags_vms= +assign_users_and_groups_to_quota= +bond_network_interfaces= +brick_advanced= +brick_details_not_supported= +bricks= +cannot_add_bricks= +change_cluster_compatibility_version= +change_cpu_level= +change_data_center_compatibility_version= +change_data_center_quota_enforcement_mode= +change_quota_disks= +clone_vm_from_snapshot= +clusters= +configure= +configure_local_storage= +confirm_console_connect= +console_disconnected= +copy_disk= +copy_disks= +data_center= +data_center_re-initialize= +delete_snapshot= +destroy_storage_domain= +detach_gluster_hosts= +detach_network_interfaces= +detach_storage= +detach_virtual_machine= +directory_groups= +disable_cpu_thread_support= +disable_hooks= +discover_networks= +disks= +edit_and_approve_host= +edit_bookmark= +edit_cluster= +edit_data_center= +edit_domain= +edit_host= +edit_logical_network= +edit_management_network= +edit_management_network_interface= +edit_network_interface_hosts= +edit_network_qos= +edit_provider= +edit_tag= +edit_vm= +edit_vnic_profile= +event_details= +event_notifier= +events= +export_disks= +export_virtual_machine= +force_lun_disk_creation= +force_remove_data_center= +force_storage_domain_creation= +general= +gluster_bricks= +gluster_hook_resolve_conflicts= +gluster_hooks= +gluster_swift= +hardware= +host_hooks= +host_setup_networks= +hosts= +images= +import_conflict= +import_images= +import_networks= +import_pre-configured_domain= +import_provider_certificates= +import_template= +import_virtual_machine= +install_host= +logical_networks= +maintenance_host= +manage_gluster_swift= +manage_policy_units= +manual_fence_are_you_sure= +migrate_virtual_machine= +monitor= +move_disk= +move_disks= +network_interfaces= +network_qos= +networks= +new_bookmark= +new_cluster= +new_cluster_-_guide_me= +new_data_center= +new_data_center_-_guide_me= +new_domain= +new_host= +new_host_guide_me= +new_local_domain= +new_logical_network= +new_network_interface_vms_guide= +new_network_qos= +new_pool= +new_quota= +new_tag= +new_virtual_machine_-_guide_me= +new_vm= +new_vnic_profile= +parameters= +permissions= +power_management_configuration= +preview_snapshot= +profiles= +providers= +quota= +remove_backed_up_template= +remove_backed_up_vm= +remove_bookmark= +remove_cluster= +remove_cluster_policy= +remove_data_center= +remove_host= +remove_logical_network= +remove_network_qos= +remove_pool= +remove_provider= +remove_quota= +remove_quota_assignment_from_user= +remove_role= +remove_storage= +remove_system_permission= +remove_tag= +remove_template_disks= +remove_user= +remove_vnic_prfoile= +remove_volume= +replace_brick= +reset_all_options= +reset_option= +restart_host= +save_network_configuration= +select_host= +services= +sessions= +set_unlimited_specific_quota= +shut_down_virtual_machine= +snapshots= +sso_did_not_succeeded= +stop_host= +stop_virtual_machine= +storage= +template_import= +template_not_found_on_export_domain= +templates= +users= +view_gluster_hook= +virtual_machines= +vm_import= +vms= +vnicProfiles= +volume_rebalance_stop= +volume_remove_bricks= +volume_remove_bricks_commit= +volume_remove_bricks_stop= +volume_retain_brick= +volume_stop= diff --git a/packaging/manual/WebadminDocumentationPath.properties b/packaging/manual/WebadminDocumentationPath.properties new file mode 100644 index 0000000..465185b --- /dev/null +++ b/packaging/manual/WebadminDocumentationPath.properties @@ -0,0 +1,467 @@ +# Login Screen > Main > About RHEV Manager +about_rhev_manager= + +# Volumes Tab > Bricks Sub-Tab > Add Brick +add_bricks= + +# Users Tab > Event Notifier > Add Events Notification +add_event_notification= + +# Each Main Tab > Permissions Sub-Tab > Add Permission +add_permission_to_user= + +# Configure > Add System Permission to User > Add System Permission +add_system_permission_to_user= + +# Users Tab > Add Users & Groups +add_users_and_groups= + +# Cluster Tab > Logical Network Sub-Tab > Assign Networks +assign_networks= + +# Host Tab > Assign Tags +assign_tags_hosts= + +# Users Tab > Assign Tags +assign_tags_users= + +# VMs Tab > Assign Tags +assign_tags_vms= + +# Quota Tab > Users Sub-Tab > Assign Users/Groups to Quota +assign_users_and_groups_to_quota= + +# Data Center Tab > Logical Network Sub-Tab > New/Edit Logical Network > Attach/Detach Network to/from Cluster(s) Confirmation +attach_detach_network_to_from_clusters= + +# Data Center Tab > Storage Sub-Tab > Attach Export Domain +attach_export_domain= + +# Data Center Tab > Storage Sub-Tab > Attach ISO Library +attach_iso_library= + +# Data Center Tab > Storage Sub-Tab > Attach Data Domain +attach_storage= + +# Host Tab > Logical Network Sub-Tab > Bond Network Interfaces +bond_network_interfaces= + +# VMs Tab > Change CD +change_cd= + +# Cluster Tab > Edit > Confirm Cluster Compatibility Version Change +change_cluster_compatibility_version= + +# Data Center Tab > Edit > Confirm Data Center Compatibility Version Change +change_data_center_compatibility_version= + +# Quota Tab > Clone Quota +clone_quota= + +# VMs Tab > Snapshots Sub-Tab > Clone VM From Snapshot +clone_vm_from_snapshot= + +# Main > Configure +configure= + +# Host Tab > Configure Local Storage +configure_local_storage= + +# VMs Tab > Console Disconnected +console_disconnected= + +# Templates Tab > Virtual Disks Sub-Tab > Copy Template +copy_disk= + +# Disks Tab > Copy Disk(s) +copy_disks= + +# Configure > Roles > Copy Role +copy_role= + +# VMs Tab > Snapshots Tabs > Create Snapshot +create_snapshot= + +# Data Center Tab > Data Center Re-Initialize +data_center_re-initialize= + +# VMs Tab > Snapshots Tabs > Delete Snapshot +delete_snapshot= + +# Storage Tab > Destroy Storage Domain +destroy_storage_domain= + +# Host Tab > Logical Network Sub-Tab > Detach Network Interfaces +detach_network_interfaces= + +# Storage Tab > Data Center Sub-Tab > Detach Storage +detach_storage= + +# Pools Tab > Virtual Machine Sub-Tab > Detach Virtual Machine(s) +detach_virtual_machine= + +# Host Tab > Edit/Approve Host +edit_and_approve_host= + +# Main > Bookmark > Edit Bookmark +edit_bookmark= + +# Cluster Tab > Edit +edit_cluster= + +# Data Center Tab > Edit Data Center +edit_data_center= + +# VMs Tab > Edit Desktop +edit_desktop= + +# Storage Tab > Edit Domain +edit_domain= + +# Host Tab > Edit Host +edit_host= + +# Data Center Tab > Logical Network Sub-Tab > Edit Logical Network +edit_logical_network= + +# Host Tab > Logical Network Sub-Tab > Edit Management Network +edit_management_network= + +# Host Tab > Logical Network Sub-Tab > Edit Management Network Interface > Confirm Management Network Disconnect +edit_management_network_interface= + +# Host Tab > Logical Network Sub-Tab > Edit Network Interface +edit_network_interface_hosts= + +# Templates Tab > Logical Network Sub-Tab > Edit Network Interface +edit_network_interface_tmps= + +# VMs Tab > Logical Network Sub-Tab > Edit Network Interface +edit_network_interface_vms= + +# Cluster Tab > Hosts Sub-Tab > Edit Policy +edit_policy= + +# Pools Tab > Edit Pool +edit_pool= + +# Quota Tab > Edit Quota +edit_quota= + +# Configure > Roles > Edit Role +edit_role= + +# VMs Tab > Edit Server +edit_server= + +# Main > tags > Edit Tag +edit_tag= + +# Templates Tab > Edit Template +edit_template= + +# VMs Tab > Virtual Disks Sub-Tab > Edit Virtual Disk +edit_virtual_disk= + +# VMs Tab > Export Virtual Machine +export_virtual_machine= + +# Data Center Tab > Force Remove Data Center +force_remove_data_center= + +# Storage Tab > New Domain > Confirm LUNs in Use +force_storage_domain_creation= + +# Host Tab > Logical Network Sub-Tab > Setup Host Networks +host_setup_networks= + +# Storage Tab > Import Pre-Configured Domain +import_pre-configured_domain= + +# Storage Tab > Import Template > Import Template(s) +import_template= + +# Storage Tab > Import VM > Import Virtual Machine(s) +import_virtual_machine= + +# Host Tab > General Sub-Tab > Install Host +install_host= + +# Host Tab > Maintain Host(s) +maintenance_host= + +# Host Tab > Confirm Host has been Rebooted +manual_fence_are_you_sure= + +# VMs Tab > Migrate Virtual Machine(s) +migrate_virtual_machine= + +# VMs Tab > Virtual Disks Sub-Tab > Move Virtual Disk +move_disk= + +# Disks Tab > Move Disk(s) +move_disks= + +# Main > Bookmark > New Bookmark +new_bookmark= + +# Cluster Tab > New +new_cluster= + +# Cluster Tab > Guide Me +new_cluster_-_guide_me= + +# Data Center Tab > New Data Center +new_data_center= + +# Data Center Tab > Guide Me +new_data_center_-_guide_me= + +# VMs Tab > New Desktop +new_desktop= + +# Storage Tab > New Domain +new_domain= + +# Host Tab > New Host +new_host= + +# Data Center Tab > Data Center Guide Me > Add Host +new_host_guide_me= + +# Storage Tab > New Local Domain +new_local_domain= + +# Data Center Tab > Logical Network Sub-Tab > New Logical Network +new_logical_network= + +# Templates Tab > Logical Network Sub-Tab > New Network Interface +new_network_interface_tmps= + +# VMs Tab > Logical Network Sub-Tab > New Network Interface +new_network_interface_vms= + +# VMs Tab > Guide Me > New Network Interface +new_network_interface_vms_guide= + +# Pools Tab > New Pool +new_pool= + +# Quota Tab > New Quota +new_quota= + +# Configure > Roles > New Role +new_role= + +# VMs Tab > New Server +new_server= + +# Main > tags > New Tag +new_tag= + +# VMs Tab > Make Template +new_template= + +# VMs Tab > Virtual Disks Sub-Tab > New Virtual Disk +new_virtual_disk= + +# VMs Tab > Guide Me +new_virtual_machine_-_guide_me= + +# Host Tab > Power Management Configuration +power_management_configuration= + +# Storage Tab > Import Template > Remove Backed up Template(s) +remove_backed_up_template= + +# Storage Tab > Import VM > Remove Backed up VM(s) +remove_backed_up_vm= + +# Main > Bookmark > Remove Bookmark(s) +remove_bookmark= + +# Volumes Tab > Bricks Sub-Tab > Remove Bricks +remove_bricks= + +# Volumes Tab > Bricks Sub-Tab > Remove Invalid Bricks +remove_bricks_invalid= + +# Cluster Tab > Remove +remove_cluster= + +# Data Center Tab > Remove Data Center(s) +remove_data_center= + +# VMs Tab > Disks Sub-Tab > Remove Disk(s) +remove_disk= + +# Host Tab > Remove Host(s) +remove_host= + +# Data Center Tab > Logical Network Sub-Tab > Remove Logical Network(s) +remove_logical_network= + +# Templates Tab > Logical Network Sub-Tab > Remove Network Interface(s) +remove_network_interface_tmps= + +# VMs Tab > Logical Network Sub-Tab > Remove Network Interface(s) +remove_network_interface_vms= + +# Each Main Tab > Permissions Sub-Tab > Remove Permission +remove_permission= + +# Pools Tab > Remove Pool(s) +remove_pool= + +# Quota Tab > Remove Quota +remove_quota= + +# Quota Tab > Users Sub-Tab > Detach Users/Groups from Quota +remove_quota_assignment_from_user= + +# Configure > Roles > Remove Role(s) +remove_role= + +# Storage Tab > Remove Storage(s) +remove_storage= + +# Configure > Add System Permission to User > Remove System Permission +remove_system_permission= + +# Main > tags > Remove Tag(s) +remove_tag= + +# Templates Tab > Remove Template(s) +remove_template= + +# Templates Tab > Storage Sub-Tab > Remove Disk Instance From Storage +remove_template_disks= + +# Users Tab > Remove User(s) +remove_user= + +# VMs Tab > Remove Desktop(s) +remove_virtual_machine= + +# Volumes Tab > Remove Volume +remove_volume= + +# Volumes Tab > Bricks Sub-Tab > Replace Bricks +replace_brick= + +# Volumes Tab > Parameters Sub-Tab > Reset All Options +reset_all_options= + +# Volumes Tab > Parameters Sub-Tab > Reset Option +reset_option= + +# Host Tab > Power Management Menu > Restart Host(s) +restart_host= + +# VMs Tab > Run Virtual Machine(s) +run_virtual_machine= + +# Cluster Tab > Data Center Sub-Tab > Guide Me > Select Host +select_host= + +# VMs Tab > Shut down Virtual Machine(s) +shut_down_virtual_machine= + +# Host Tab > Stop Host(s) +stop_host= + +# VMs Tab > Stop Virtual Machine(s) +stop_virtual_machine= + +# VMs Tab > Export VM(s) > Confirm VM's Template not on Export Domain +template_not_found_on_export_domain= + +# Volumes Tab > Stop Volume +volume_stop= + +SanStorageModelBase= +_remove_network_qos= +add_bricks_confirmation= +add_hosts= +add_provider= +applications= +assign_network= +brick_advanced= +brick_details_not_supported= +bricks= +cannot_add_bricks= +change_cpu_level= +change_data_center_quota_enforcement_mode= +change_quota_disks= +clusters= +confirm_console_connect= +data_center= +detach_gluster_hosts= +directory_groups= +disable_cpu_thread_support= +disable_hooks= +discover_networks= +disks= +editConsole= +edit_network_qos= +edit_provider= +edit_vm= +edit_vnic_profile= +event_details= +event_notifier= +events= +export_disks= +force_lun_disk_creation= +general= +gluster_bricks= +gluster_hook_resolve_conflicts= +gluster_hooks= +gluster_swift= +hardware= +host_hooks= +hosts= +images= +import_conflict= +import_images= +import_networks= +import_provider_certificates= +logical_networks= +manage_gluster_swift= +manage_policy_units= +monitor= +network_interfaces= +network_qos= +networks= +new_network_qos= +new_vm= +new_vnic_profile= +parameters= +permissions= +preview_snapshot= +profiles= +providers= +quota= +remove_cluster_policy= +remove_network_qos= +remove_provider= +remove_vnic_prfoile= +save_network_configuration= +services= +sessions= +set_unlimited_specific_quota= +snapshots= +sso_did_not_succeeded= +storage= +template_import= +templates= +users= +view_gluster_hook= +virtual_machines= +vm_import= +vms= +vnicProfiles= +volume_rebalance_stop= +volume_remove_bricks= +volume_remove_bricks_commit= +volume_remove_bricks_stop= +volume_retain_brick= -- To view, visit http://gerrit.ovirt.org/20793 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b96d005684007125d5f3940abdbec25d4cae81f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
