From 57c4fa63ad48a663ad6c35de39fc5dbd991072fa Mon Sep 17 00:00:00 2001 From: Kate Pimenova Date: Fri, 13 May 2016 17:53:02 +0300 Subject: [PATCH] Updated documentation links Closes-bug: #1545744 Change-Id: I2f63c9b4c00d415689c08d69f8bbb46fd3885a0a (cherry picked from commit 10a79870b55118a954ea5e03d9afec5afab8f678) --- static/translations/core.json | 10 ++----- static/utils.js | 4 --- .../views/cluster_page_tabs/dashboard_tab.js | 17 ++---------- static/views/dialogs.js | 27 +++---------------- static/views/plugins_page.js | 11 ++------ 5 files changed, 9 insertions(+), 60 deletions(-) diff --git a/static/translations/core.json b/static/translations/core.json index 07ae0a42b..ed783c9b3 100644 --- a/static/translations/core.json +++ b/static/translations/core.json @@ -310,7 +310,6 @@ "centos": "CentOS", "more_info": "For more information, visit", "plugins_catalog": "Plugins Catalog", - "plugins_documentation": "Plugins Documentation", "no_plugins": "There are no plugins installed.", "unsupported_plugin": "Plugin is incompatible with all supported releases" }, @@ -650,7 +649,7 @@ "openstack_documentation": "OpenStack Documentation", "documentation_description": "Quick access to the documentation on how to deploy and configure your OpenStack environment:", "no_nodes_warning_add_them": "No nodes found in this environment. Please add nodes in the Nodes tab and try again.", - "plugin_documentation": "Plugin Documentation", + "plugin_documentation": "Plugin Developer Documentation", "technical_bulletins": "Technical Bulletins", "cluster_information": "Cluster Information", "summary": "Summary", @@ -666,11 +665,9 @@ "no_nodes_instruction": "You must add at least one node to your environment in order to deploy. See the ", "locked_settings_alert": "Before proceeding with deployment please verify that the nodes have disk partitioning and network interfaces configured properly. You will not be able to change these via UI after the cloud is deployed.", "redeployment_alert": "You have made configuration changes which will now be applied to nodes in this environment. Please note that during settings change some services on OpenStack nodes may be restarted, availability of some APIs and resources may be interrupted. For Production clouds, please make sure that the cloud is properly set into maintenance mode prior to performing configuration changes.", - "package_information": "Packages and updates are fetched from the repositories defined in the Settings tab. If your environment uses the default external repositories, verify that the Fuel Master node can access the Internet. If the Fuel Master node is not connected to the Internet, you must set up a local mirror and configure Fuel to upload packages from the local mirror. Fuel must have network access to the local mirror. You may also configure alternate repositories for installation. For more information, see ", + "package_information": "Packages and updates are fetched from the repositories defined in the Settings tab. If your environment uses the default external repositories, verify that the Fuel Master node can access the Internet. If the Fuel Master node is not connected to the Internet, you must set up a local mirror and configure Fuel to upload packages from the local mirror. Fuel must have network access to the local mirror. You may also configure alternate repositories for installation.", "user_guide": "User Guide", - "operations_guide": "Operations Guide", "for_more_information_roles": "for more information on how to assign roles to nodes and add them to an OpenStack environment.", - "for_more_information_configuration": " for more information on how to configure an OpenStack environment and node settings.", "and_vcenter": "and VCenter", "nova_with": "Nova Network with", "neutron_with": "Neutron with", @@ -1483,7 +1480,6 @@ "centos": "CentOS", "more_info": "详情请访问：", "plugins_catalog": "插件类别", - "plugins_documentation": "插件文档", "no_plugins": "未安装插件。" }, "clusters_page": { @@ -1819,9 +1815,7 @@ "locked_settings_alert": "在继续前，请重新检查环境配置包括节点磁盘分区和网络配置，在Fuel部署完该OpenStack环境后这些设置均无法更改", "package_information": "Packages and updates are fetched from the repositories defined in the Settings tab. If your environment uses the default external repositories, verify that the Fuel Master node can access the Internet. If the Fuel Master node is not connected to the Internet, you must set up a local mirror and configure Fuel to upload packages from the local mirror. Fuel must have network access to the local mirror. You may also configure alternate repositories for installation. For more information, see ", "user_guide": "用户指南", - "operations_guide": "操作指南", "for_more_information_roles": "有关如何将角色分配给节点并将它们添加到OpenStack环境的详细信息", - "for_more_information_configuration": "关于如何配置OpenStack环境和节点设置的详细信息", "and_vcenter": "和VCenter", "nova_with": "Nova Network with", "neutron_with": "Neutron with", diff --git a/static/utils.js b/static/utils.js index 072e36083..b1fcd0414 100644 --- a/static/utils.js +++ b/static/utils.js @@ -318,10 +318,6 @@ var utils = { } return options.desc ? -result : result; }, - composeDocumentationLink(link) { - return 'https://docs.fuel-infra.org/openstack/fuel/fuel-' - + app.version.get('release') + '/' + link; - }, makePath(...args) { return args.join('.'); }, diff --git a/static/views/cluster_page_tabs/dashboard_tab.js b/static/views/cluster_page_tabs/dashboard_tab.js index dab10d524..094ee527a 100644 --- a/static/views/cluster_page_tabs/dashboard_tab.js +++ b/static/views/cluster_page_tabs/dashboard_tab.js @@ -597,10 +597,6 @@ var ClusterActionsPanel = React.createClass({ deploy: }; @@ -799,10 +795,6 @@ var ClusterActionsPanel = React.createClass({

{i18n(ns + 'new_environment_welcome')}

@@ -1329,15 +1321,10 @@ var InstructionElement = React.createClass({ }; }, render() { - var {description, isAlert, link, explanation} = this.props; + var {description, isAlert, explanation} = this.props; return (
- {i18n(ns + description) + (link ? ' ' : '')} - {link && - - {i18n(ns + link.title)} - - } + {i18n(ns + description)} {explanation ? ' ' + i18n(ns + explanation) : '.'}
); diff --git a/static/views/dialogs.js b/static/views/dialogs.js index 07ad65859..3e4502837 100644 --- a/static/views/dialogs.js +++ b/static/views/dialogs.js @@ -473,14 +473,7 @@ export var DeployClusterDialog = React.createClass({
- {i18n(warningNs + 'package_information') + ' '} - - {i18n(warningNs + 'operations_guide')} - - {i18n(warningNs + 'for_more_information_configuration')} + {i18n(warningNs + 'package_information')}
@@ -548,14 +541,7 @@ export var ProvisionNodesDialog = React.createClass({
- {i18n('cluster_page.dashboard_tab.package_information') + ' '} - - {i18n('cluster_page.dashboard_tab.operations_guide')} - - {i18n('cluster_page.dashboard_tab.for_more_information_configuration')} + {i18n('cluster_page.dashboard_tab.package_information')}
@@ -621,14 +607,7 @@ export var DeployNodesDialog = React.createClass({
- {i18n('cluster_page.dashboard_tab.package_information') + ' '} - - {i18n('cluster_page.dashboard_tab.operations_guide')} - - {i18n('cluster_page.dashboard_tab.for_more_information_configuration')} + {i18n('cluster_page.dashboard_tab.package_information')}
diff --git a/static/views/plugins_page.js b/static/views/plugins_page.js index 7b17b35db..471806809 100644 --- a/static/views/plugins_page.js +++ b/static/views/plugins_page.js @@ -129,10 +129,6 @@ var PluginsPage = React.createClass({ ); }, render() { - var links = { - catalog: 'http://stackalytics.com/report/driverlog?project_id=openstack%2Ffuel', - documentation: utils.composeDocumentationLink('plugin-dev.html') - }; return (
@@ -149,12 +145,9 @@ var PluginsPage = React.createClass({ {!this.props.plugins.length && i18n('plugins_page.no_plugins')}{' '} {i18n('plugins_page.more_info')}{' '} - + {i18n('plugins_page.plugins_catalog')} - {' '} - {i18n('common.and')}{' '} - - {i18n('plugins_page.plugins_documentation')}