IGNITE-4659 Fixed error page. (cherry picked from commit 50de012)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d949632 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d949632 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d949632 Branch: refs/heads/ignite-3477-master Commit: 7d94963251cc66823883d760668c2e2b31574bf1 Parents: 6775f64 Author: Andrey Novikov <anovi...@gridgain.com> Authored: Wed Mar 22 18:20:32 2017 +0700 Committer: Andrey Novikov <anovi...@gridgain.com> Committed: Wed Mar 22 18:21:56 2017 +0700 ---------------------------------------------------------------------- .../frontend/app/modules/states/errors.state.js | 4 ++-- modules/web-console/frontend/views/403.pug | 22 -------------------- modules/web-console/frontend/views/403.tpl.pug | 22 ++++++++++++++++++++ modules/web-console/frontend/views/404.pug | 22 -------------------- modules/web-console/frontend/views/404.tpl.pug | 22 ++++++++++++++++++++ 5 files changed, 46 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d949632/modules/web-console/frontend/app/modules/states/errors.state.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/errors.state.js b/modules/web-console/frontend/app/modules/states/errors.state.js index e219132..e816ff8 100644 --- a/modules/web-console/frontend/app/modules/states/errors.state.js +++ b/modules/web-console/frontend/app/modules/states/errors.state.js @@ -16,8 +16,8 @@ */ import angular from 'angular'; -import templateNotFoundPage from 'views/404.pug'; -import templateNotAuthorizedPage from 'views/403.pug'; +import templateNotFoundPage from 'views/404.tpl.pug'; +import templateNotAuthorizedPage from 'views/403.tpl.pug'; angular .module('ignite-console.states.errors', [ http://git-wip-us.apache.org/repos/asf/ignite/blob/7d949632/modules/web-console/frontend/views/403.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/403.pug b/modules/web-console/frontend/views/403.pug deleted file mode 100644 index 38d8bb5..0000000 --- a/modules/web-console/frontend/views/403.pug +++ /dev/null @@ -1,22 +0,0 @@ -//- - 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. - -include includes/header - -.error-page - .container - h1.error-page__title 403 - h2.error-page__description You are not authorized http://git-wip-us.apache.org/repos/asf/ignite/blob/7d949632/modules/web-console/frontend/views/403.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/403.tpl.pug b/modules/web-console/frontend/views/403.tpl.pug new file mode 100644 index 0000000..38d8bb5 --- /dev/null +++ b/modules/web-console/frontend/views/403.tpl.pug @@ -0,0 +1,22 @@ +//- + 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. + +include includes/header + +.error-page + .container + h1.error-page__title 403 + h2.error-page__description You are not authorized http://git-wip-us.apache.org/repos/asf/ignite/blob/7d949632/modules/web-console/frontend/views/404.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/404.pug b/modules/web-console/frontend/views/404.pug deleted file mode 100644 index 7d2fc55..0000000 --- a/modules/web-console/frontend/views/404.pug +++ /dev/null @@ -1,22 +0,0 @@ -//- - 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. - -include includes/header - -.error-page - .container - h1.error-page__title 404 - h2.error-page__description Page not found http://git-wip-us.apache.org/repos/asf/ignite/blob/7d949632/modules/web-console/frontend/views/404.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/404.tpl.pug b/modules/web-console/frontend/views/404.tpl.pug new file mode 100644 index 0000000..7d2fc55 --- /dev/null +++ b/modules/web-console/frontend/views/404.tpl.pug @@ -0,0 +1,22 @@ +//- + 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. + +include includes/header + +.error-page + .container + h1.error-page__title 404 + h2.error-page__description Page not found
