yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unknown flag to settings-manager

Browse Source
This commit is contained in:
cyril lopez 2017-10-10 18:05:52 +02:00
parent 726bab8aa1
commit c52371c1f9
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/strapi-plugin-settings-manager/admin/src/assets/images/unknow_flag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 634 B

8
packages/strapi-plugin-settings-manager/admin/src/components/List/styles.scss
View File

@ -362,11 +362,17 @@ button {
.flagContainer { .flagContainer {
width: 33%; width: 33%;
margin-left: 1rem; margin-left: 1rem;
// margin-right: 10rem;
height: 5.2rem; height: 5.2rem;
line-height: 5.2rem; line-height: 5.2rem;
> div:first-of-type {
background-image: url('assets/images/unknow_flag.png');
background-size: 1.3333em auto;
background-position: left center;
}
} }
.bottomSpacer { .bottomSpacer {
height: 1.2rem; height: 1.2rem;
background-color: #FFFFFF; background-color: #FFFFFF;

4
packages/strapi-plugin-settings-manager/admin/src/components/RowLanguage/index.js
View File

@ -66,17 +66,15 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
<div className={this.props.liStyles.language} /> <div className={this.props.liStyles.language} />
<div className={`${this.props.liStyles.borderBottom} ${this.props.liStyles.flexLiLanguage}`}> <div className={`${this.props.liStyles.borderBottom} ${this.props.liStyles.flexLiLanguage}`}>
<div className={`${this.props.liStyles.flexed} ${this.props.liStyles.flagContainer}`}> <div className={`${this.props.liStyles.flexed} ${this.props.liStyles.flagContainer}`}>
<div><span className={`flag-icon flag-icon-${flag}`} /></div> <div><span className={`${this.props.liStyles.flag} flag-icon flag-icon-${flag}`} /></div>
<div className={`${this.props.liStyles.label} ${this.props.liStyles.capitalized}`}>{languageDisplay}</div> <div className={`${this.props.liStyles.label} ${this.props.liStyles.capitalized}`}>{languageDisplay}</div>
</div> </div>
<div className="text-center" style={{ width: '33%'}}>{this.props.name}</div> <div className="text-center" style={{ width: '33%'}}>{this.props.name}</div>
<div style={{display:'flex', width: '33%'}}> <div style={{display:'flex', width: '33%'}}>
<div className={this.props.liStyles.centered}>{languageLabel}</div> <div className={this.props.liStyles.centered}>{languageLabel}</div>
<div className={this.props.liStyles.trashContainer}>{deleteIcon}</div> <div className={this.props.liStyles.trashContainer}>{deleteIcon}</div>
</div> </div>
</div> </div>
<div> <div>
<PopUpWarning <PopUpWarning
isOpen={this.state.showWarning} isOpen={this.state.showWarning}

5
packages/strapi-plugin-settings-manager/admin/src/components/SelectOptionLanguage/styles.scss
View File

@ -1,5 +1,8 @@
.selectOption { /* stylelint-disable */ .selectOption { /* stylelint-disable */
margin: 1rem margin: 1rem;
background-image: url('assets/images/unknow_flag.png');
background-size: 1.3333em auto;
background-position: left center;
} }
.flagContainer { .flagContainer {

1
packages/strapi-plugin-settings-manager/admin/src/containers/HomePage/index.js
View File

@ -462,7 +462,6 @@ export class HomePage extends React.Component { // eslint-disable-line react/pre
valueComponent = (props) => { valueComponent = (props) => {
const flagName = formatLanguageLocale(props.value.value); const flagName = formatLanguageLocale(props.value.value);
const flag = getFlag(flagName); const flag = getFlag(flagName);
// <FormattedMessage id={props.value.label} className={styles.marginLeft} />
return ( return (
<span className={`${styles.flagContainer} flag-icon-background flag-icon-${flag}`}> <span className={`${styles.flagContainer} flag-icon-background flag-icon-${flag}`}>
<FormattedMessage id="settings-manager.selectValue" defaultMessage='{language}' values={{ language: props.value.label}} className={styles.marginLeft} /> <FormattedMessage id="settings-manager.selectValue" defaultMessage='{language}' values={{ language: props.value.label}} className={styles.marginLeft} />