Skip to content
Snippets Groups Projects
Commit e5382eec authored by Yas Naoi's avatar Yas Naoi Committed by Yas Naoi
Browse files

Issue #3323738 by yas, Chandreshgiri Gauswami, Xiaohua Guan, Masami,...

Issue #3323738 by yas, Chandreshgiri Gauswami, Xiaohua Guan, Masami, baldwinlouie, Ryo Yamashita, sekinet: Fix typos (5)
parent 4c82502f
No related branches found
No related tags found
No related merge requests found
Showing
with 55 additions and 55 deletions
......@@ -90,7 +90,7 @@ services:
composer config minimum-stability dev
composer config prefer-stable true
# Now we can require drupal/cloud, specifing the branch name we created
# Now we can require drupal/cloud, specifying the branch name we created
# above that uses the "${TUGBOAT_REPO_ID}" environment variable.
composer require "drupal/cloud:dev-${TUGBOAT_REPO_ID}"
......
......@@ -40,7 +40,7 @@ CHANGE HISTORY
2018/11/08 8.x-1.x-dev
- Cannot create a volume.
- Add permission "view published cloud service provider entities.
- Add permission 'view published cloud service provider entities'.
2018/11/07 8.x-1.x-dev
- Add trim() to remove white spaces in a textfield.
......
......@@ -3,7 +3,7 @@ Introduction
Cloud is a set of modules to enable Cloud orchestration: A Drupal-based
Cloud dashboard for _AWS_, _Kubernetes_, _OpenStack_, _VMware_ and _Terraform
Cloud_ as a one stop portal to manage multiple cloud service providers.
Cloud_ as a one-stop portal to manage multiple cloud service providers.
Requirements
============
......@@ -143,7 +143,7 @@ Basic Setup (AWS)
Go to `Structure` > `Cloud service providers` and click
`+ Add cloud service provider` for _AWS Cloud_
2. Enter all required configuration parameters. The system will automatically
setup all regions from your AWS account. There are three options for
set up all regions from your AWS account. There are three options for
specifying AWS credentials:
1. Instance credentials - If cloud module is running on an EC2 instance and
......
......@@ -30,7 +30,7 @@ cloud.menu.design_links:
weight: 110
# Structure | Cloud service provider
cluod.admin_structure:
cloud.admin_structure:
title: 'Cloud service providers'
description: 'Add and manage cloud service providers.'
route_name: entity.cloud_config.collection
......@@ -40,39 +40,39 @@ cluod.admin_structure:
cloud.cloud_config.add_form:
title: 'Add cloud service provider'
description: 'Add a cloud service provider.'
parent: cluod.admin_structure
parent: cloud.admin_structure
route_name: entity.cloud_config.add_page
weight: 10
# Structure | Cloud service providers | Cloud service provider types.
cluod.admin_structure.cloud_service_provider_types:
cloud.admin_structure.cloud_service_provider_types:
title: 'Cloud service provider types'
description: 'Add and manage cloud service provider types.'
parent: cluod.admin_structure
parent: cloud.admin_structure
route_name: entity.cloud_config_type.collection
weight: 20
# Structure | Cloud service providers | Cloud launch template types.
cluod.admin_structure.cloud_server_template_types:
cloud.admin_structure.cloud_server_template_types:
title: 'Launch template types'
description: 'Add a launch template type.'
parent: cluod.admin_structure
parent: cloud.admin_structure
route_name: entity.cloud_server_template_type.collection
weight: 30
# Structure | Cloud service providers | Cloud project types.
cluod.admin_structure.cloud_project_types:
cloud.admin_structure.cloud_project_types:
title: 'Cloud project types'
description: 'Add a cloud project type.'
parent: cluod.admin_structure
parent: cloud.admin_structure
route_name: entity.cloud_project_type.collection
weight: 40
# Structure | Cloud service providers | Cloud store types.
cluod.admin_structure.cloud_store_types:
cloud.admin_structure.cloud_store_types:
title: 'Cloud store types'
description: 'Add a cloud store type.'
parent: cluod.admin_structure
parent: cloud.admin_structure
route_name: entity.cloud_store_type.collection
weight: 50
......@@ -81,15 +81,15 @@ cluod.admin_structure.cloud_store_types:
cloud.cloud_service_provider_types.add_form:
title: 'Add cloud service provider type'
description: 'Add a cloud service provider type.'
parent: cluod.admin_structure.cloud_service_provider_types
parent: cloud.admin_structure.cloud_service_provider_types
route_name: entity.cloud_config_type.add_form
# Structure | Cloud service providers | Cloud launch template types |
# Add cloud launch template type.
cloud.cloud_server_tepmlate_types.add_form:
cloud.cloud_server_template_types.add_form:
title: 'Add launch template type'
description: 'Add a launch template type.'
parent: cluod.admin_structure.cloud_server_template_types
parent: cloud.admin_structure.cloud_server_template_types
route_name: entity.cloud_server_template_type.add_form
# Structure | Cloud service providers | cloud project types |
......@@ -97,7 +97,7 @@ cloud.cloud_server_tepmlate_types.add_form:
cloud.cloud_project_types.add_form:
title: 'Add cloud project types'
route_name: entity.cloud_project_type.add_form
parent: cluod.admin_structure.cloud_project_types
parent: cloud.admin_structure.cloud_project_types
# Structure | Cloud service providers | cloud store types |
......@@ -105,7 +105,7 @@ cloud.cloud_project_types.add_form:
cloud.cloud_store_types.add_form:
title: 'Add cloud store types'
route_name: entity.cloud_store_type.add_form
parent: cluod.admin_structure.cloud_store_types
parent: cloud.admin_structure.cloud_store_types
# Configuration | Web services | Cloud.
# Admin settings for cloud.
......
......@@ -525,7 +525,7 @@ function cloud_user_predelete($account): void {
* Implements hook_user_cancel_methods_alter().
*
* Add additional description informing users that cloud related
* entities are not deleted from the system. They are will be reassigned.
* entities are not deleted from the system. They will be reassigned.
*/
function cloud_user_cancel_methods_alter(&$methods): void {
$user_settings = \Drupal::config('user.settings');
......
......@@ -334,7 +334,7 @@ entity.cloud_store.list_update:
type: 'entity:cloud_store_type'
converter: 'paramconverter.entity'
# Clour Store REST API.
# Cloud Store REST API.
entity.cloud_store.count:
path: '/cloud_dashboard/cloud_store/{bundle}/count'
defaults:
......
......@@ -135,7 +135,7 @@ Resources:
sudo chown -R ubuntu:www-data "${FILES_DIR}"
sudo chmod -R g+w "${FILES_DIR}"
# Setup the docker.
# Set up the docker.
curl -fsSL get.docker.com -o /tmp/get-docker.sh
sudo sh /tmp/get-docker.sh
sudo usermod -aG docker ubuntu
......
##
# Cloud Orchestrator cloud formation template.
# This template will create an EC2 instance and install
# Docker. Cloud Orchestrator is installed installed Docker.
# Docker. Cloud Orchestrator is installed Docker.
##
AWSTemplateFormatVersion: '2010-09-09'
Description: 'Cloud Orchestrator EC2 - Docker'
......
......@@ -70,7 +70,7 @@ Fn::Base64:
];
EOF
# Setup the docker
# Set up the docker
curl -fsSL get.docker.com -o /tmp/get-docker.sh
sudo sh /tmp/get-docker.sh
sudo usermod -aG docker ubuntu
......
......@@ -6,7 +6,7 @@
/**
* NAME: Bootstrap 3 Triple Nested Sub-Menus
* This script will active Triple level multi drop-down menus in Bootstrap 3.*
* This script will activate Triple level multi drop-down menus in Bootstrap 3.
*/
/*
$('ul.dropdown-menu [data-toggle=dropdown]').on('click', function(event) {
......
......@@ -17,10 +17,10 @@
const BACKGROUND_DEFAULT_COLOR = 'rgba(0, 0, 0, 0)';
// Draw Chart Function.
Drupal.Cloud.drawChart = function (datas, first) {
datas.forEach(function (data, idx) {
Drupal.Cloud.drawChart = function (data, first) {
data.forEach(function (item, idx) {
// Delete current chart.
d3.select(data.selector).select('svg').remove();
d3.select(item.selector).select('svg').remove();
// Draw charts.
if (first && idx === 0) {
......@@ -28,12 +28,12 @@
d3.select('#x-axis').remove();
// Add <div> for the axis.
$(data.selector).before('<div id="x-axis"></div>');
$(item.selector).before('<div id="x-axis"></div>');
// Draw charts.
const axis = new HorizonChart();
axis.setHeight(AXIS_HEIGHT);
axis.setDataSet(data.values);
axis.setDataSet(item.values);
axis.setSelector('#x-axis');
axis.draw();
......@@ -45,10 +45,10 @@
// Draw charts.
const horizonChart = new HorizonChart();
const fontColor = $(data.selector).css('color');
const fontColor = $(item.selector).css('color');
let bgColor = '';
$(data.selector).parents().each(function () {
$(item.selector).parents().each(function () {
console.log(getComputedStyle(this).backgroundColor);
let color = getComputedStyle(this).backgroundColor;
if (color && color !== BACKGROUND_DEFAULT_COLOR) {
......@@ -56,22 +56,22 @@
return false;
}
});
horizonChart.setTitle(data.id);
horizonChart.setTitle(item.id);
horizonChart.setTitleFontSize(TITLE_FONT_SIZE);
horizonChart.setTitlePosition(TITLE_POSITION_X, TITLE_POSITION_Y);
horizonChart.setTitleColer(fontColor);
horizonChart.setHeight(CHART_HEIGHT);
horizonChart.setDataSet(data.values);
horizonChart.setSelector(data.selector);
horizonChart.setDataSet(item.values);
horizonChart.setSelector(item.selector);
horizonChart.setColors(colors[idx % 2]);
horizonChart.setShowXScale(false);
horizonChart.draw();
const g = d3.selectAll(data.selector + ' svg g');
const title = d3.selectAll(data.selector + ' svg text');
const bbox = $(data.selector + ' svg text')[0].getBBox();
const g = d3.selectAll(item.selector + ' svg g');
const title = d3.selectAll(item.selector + ' svg text');
const bbox = $(item.selector + ' svg text')[0].getBBox();
g.insert('rect', data.selector + ' svg text')
g.insert('rect', item.selector + ' svg text')
.attr('x', bbox.x - 1)
.attr('y', bbox.y)
.attr('width', bbox.width + 2)
......@@ -79,10 +79,10 @@
.attr('fill', bgColor)
.style('opacity', '0.8');
$(data.selector).css('margin-bottom', '0');
$(item.selector).css('margin-bottom', '0');
if (!first || idx > 0) {
$(data.selector).css('border-top', '1px solid #ddd');
$(item.selector).css('border-top', '1px solid #ddd');
}
});
};
......
......@@ -3,7 +3,7 @@
* Defines the behavior of the Page Load Progress module.
*
* Page Load Progress sets a screen lock showing a spinner when the user clicks
* on an element that triggers a time consuming task.
* on an element that triggers a time-consuming task.
*/
(function ($, Drupal) {
......@@ -31,9 +31,9 @@
}
// Add the throbber for internal links only if requested in the UI.
// Also if the link has a btn-wait class.
// Also, if the link has a btn-wait class.
if (internal_links) {
$('a[href]').on('click', function (evnt) {
$('a[href]').on('click', function (event) {
// Lock the screen only if the link is Refresh.
if ($(this).attr('href').indexOf('/update') == -1) {
return;
......@@ -41,7 +41,7 @@
// Do not lock the screen if the link is being opened in a new tab.
// Source: https://stackoverflow.com/a/20087506/9637665.
if (evnt.ctrlKey || evnt.shiftKey || evnt.metaKey || (evnt.button && evnt.button == 1)) {
if (event.ctrlKey || event.shiftKey || event.metaKey || (event.button && event.button == 1)) {
return;
}
......
......@@ -291,7 +291,7 @@ class CloudBudgetContentForm extends CloudContentForm {
}
/**
* Helper function to get title translatable string of a item.
* Helper function to get title translatable string of an item.
*
* @param \Drupal\Core\StringTranslation\TranslatableMarkup $t
* The translatable string.
......
......@@ -13,7 +13,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Plugin implementation of the 'credit_link_formatter' formatter.
*
* This formatter links user name to the entity of
* This formatter links username to the entity of
* cloud credits.
*
* @FieldFormatter(
......@@ -49,7 +49,7 @@ class CloudCreditLinkFormatter extends FormatterBase implements ContainerFactory
* @param string $view_mode
* The view mode.
* @param array $third_party_settings
* Any third party settings settings.
* Any third party settings.
* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity type manager.
*/
......
......@@ -45,7 +45,7 @@ abstract class CloudBudgetTestBase extends CloudTestBase {
* Create cloud context.
*
* @param string $bundle
* The CloudConfig Bundle Type ('k8s'). This is used for `cloud_budget'.
* The CloudConfig Bundle Type ('k8s'). This is used for 'cloud_budget'.
*
* @return \Drupal\cloud\Entity\CloudConfig
* The cloud service provider (CloudConfig) entity.
......
......@@ -334,11 +334,11 @@ class CloudClusterWorkerService extends CloudServiceBase implements CloudCluster
* Resolve references in parameters.
*
* @param array $params
* The paramters.
* The parameters.
* @param array $refs
* The reference information.
* @param array $results
* The results of method calls.
* The results of method call.
*
* @return array
* The parameters processed.
......
......@@ -65,7 +65,7 @@ SPA client Structure
`<div id="root">` part.
- `App.tsx` is called from `index.tsx`, and `App.tsx` switches pages for each
endpoint.
- Each page is defined in the pages directory.
- Each page is defined in the 'pages' directory.
- `i18n.ts` defines the processing required for i18n support.
- `constant` directory defines the various constants required by the SPA client.
......
......@@ -74,7 +74,7 @@ Directory structure
- state.ts
- Service class for managing cloud context.
- storage.ts
- Service class for editting localstorage.
- Service class for editing localstorage.
- string.ts
- Service class for string manipulation.
- i18n.ts
......
......@@ -9,7 +9,7 @@ interface EntityRelationshipsData {
/**
* Entity data of JSON:API.
*
* Note: Originally, in the relationships property,
* Note: Originally, in the relationships' property,
* the "type" key has a value of type `string` and
* the "[key: string]" key has a value of type `object`.
* However, according to the TypeScript specification,
......
......@@ -56,7 +56,7 @@ const getOperations = (dataRecord: DataRecord): string[] => {
return list;
}
case 'aws_cloud_volume': {
const list: string[] = ['Create Snapshot'];
const list: string[] = ['Create snapshot'];
if (dataRecord.value['state'] === 'available') {
list.push('Attach');
} else if (dataRecord.value['state'] === 'in-use') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment