openstack
/
fuel-ui
Code Issues Proposed changes

Merge "React 0.14 validateDOMNesting warnings fix"

This commit is contained in:
Jenkins 2016-01-02 12:32:48 +00:00 committed by Gerrit Code Review
parent 966063b99b b1189464b5
commit 6993ec2274
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/views/statistics_mixin.js
View File

@ -153,14 +153,14 @@ define([
},
renderList: function(list, key) {
return (
<p key={key}>
<div key={key}>
{i18n('statistics.' + key + '_title')}
<ul>
{_.map(list, function(item) {
return <li key={item}>{i18n('statistics.' + key + '.' + item)}</li>;
})}
</ul>
</p>
</div>
);
},
renderIntro: function() {

8
static/views/welcome_page.js
View File

@ -101,19 +101,19 @@ function(_, i18n, React, models, componentMixins, statisticsMixin) {
{this.renderInput('send_anonymous_statistic', 'welcome-checkbox-box', disabled)}
{this.renderIntro()}
{this.renderInput('send_user_info', 'welcome-checkbox-box', disabled)}
<p>
<div>
<div className='notice'>{i18n(ns + 'privacy_policy')}</div>
<div><a href={privacyPolicyLink} target='_blank'>{i18n(ns + 'privacy_policy_link')}</a></div>
</p>
</div>
</div>
:
<div>
{this.renderIntro()}
{this.renderInput('send_anonymous_statistic', 'welcome-checkbox-box')}
<p>
<div>
<div>{i18n(ns + 'statistics_collector')}</div>
<div><a href={statsCollectorLink} target='_blank'>{statsCollectorLink}</a></div>
</p>
</div>
</div>
}
<div className='welcome-button-box row'>