This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch fix/license in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
The following commit(s) were added to refs/heads/fix/license by this push: new 0018faf Add license header to layout 0018faf is described below commit 0018faf1d5fc351df9ee65bae13ff4bb7ccd2089 Author: hanahmily <hanahm...@gmail.com> AuthorDate: Wed Mar 7 11:14:14 2018 +0800 Add license header to layout --- src/layouts/BasicLayout.js | 18 ++++++++++++++++++ src/layouts/BlankLayout.js | 18 ++++++++++++++++++ src/layouts/PageHeaderLayout.js | 12 ------------ src/layouts/PageHeaderLayout.less | 11 ----------- src/layouts/UserLayout.js | 22 ++++++++++++++++++++-- src/layouts/UserLayout.less | 17 +++++++++++++++++ 6 files changed, 73 insertions(+), 25 deletions(-) diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js index 3e1928b..cf1b900 100644 --- a/src/layouts/BasicLayout.js +++ b/src/layouts/BasicLayout.js @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + import React from 'react'; import PropTypes from 'prop-types'; import { Layout, Icon } from 'antd'; diff --git a/src/layouts/BlankLayout.js b/src/layouts/BlankLayout.js index 505270f..dfb5bcf 100644 --- a/src/layouts/BlankLayout.js +++ b/src/layouts/BlankLayout.js @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + import React from 'react'; export default props => <div {...props} />; diff --git a/src/layouts/PageHeaderLayout.js b/src/layouts/PageHeaderLayout.js deleted file mode 100644 index 2c615e8..0000000 --- a/src/layouts/PageHeaderLayout.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import { Link } from 'dva/router'; -import PageHeader from '../components/PageHeader'; -import styles from './PageHeaderLayout.less'; - -export default ({ children, wrapperClassName, top, ...restProps }) => ( - <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}> - {top} - <PageHeader key="pageheader" {...restProps} linkElement={Link} /> - {children ? <div className={styles.content}>{children}</div> : null} - </div> -); diff --git a/src/layouts/PageHeaderLayout.less b/src/layouts/PageHeaderLayout.less deleted file mode 100644 index a0c0a6e..0000000 --- a/src/layouts/PageHeaderLayout.less +++ /dev/null @@ -1,11 +0,0 @@ -@import "~antd/lib/style/themes/default.less"; - -.content { - margin: 24px 24px 0; -} - -@media screen and (max-width: @screen-sm) { - .content { - margin: 24px 0 0; - } -} diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js index 946fc95..d6cffd2 100644 --- a/src/layouts/UserLayout.js +++ b/src/layouts/UserLayout.js @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + import React from 'react'; import { Link, Redirect, Switch, Route } from 'dva/router'; import DocumentTitle from 'react-document-title'; @@ -9,7 +27,7 @@ import { getRoutes } from '../utils/utils'; const links = [{ key: 'help', - title: '帮助', + title: 'Help', href: '', }, { key: 'privacy', @@ -21,7 +39,7 @@ const links = [{ href: '', }]; -const copyright = <div>Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品</div>; +const copyright = <div>Copyright <Icon type="copyright" /> 2018 Apache SkyWalking</div>; class UserLayout extends React.PureComponent { getPageTitle() { diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index bf21603..8767dfd 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + @import "~antd/lib/style/themes/default.less"; .container { -- To stop receiving notification emails like this one, please contact hanahm...@apache.org.