NIFI-655: - Setting up the resources (js/css) for the login page. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5b658143 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5b658143 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5b658143
Branch: refs/heads/NIFI-655 Commit: 5b658143adcfe66359d738c71d03098e68c6d58e Parents: 6104670 Author: Matt Gilman <[email protected]> Authored: Mon Oct 12 22:19:10 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Mon Oct 12 22:19:10 2015 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 38 +++++++++++++++++- .../main/resources/filters/login-min.properties | 18 +++++++++ .../src/main/resources/filters/login.properties | 24 ++++++++++++ .../src/main/webapp/WEB-INF/pages/login.jsp | 37 +++++------------- .../WEB-INF/partials/canvas/canvas-header.jsp | 2 +- .../nifi-web-ui/src/main/webapp/css/login.css | 20 ++++++++++ .../webapp/js/nf/canvas/nf-canvas-header.js | 5 +++ .../src/main/webapp/js/nf/login/nf-login.js | 41 ++++++++++++++++++++ 8 files changed, 156 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index 70ec5b9..c346a28 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -32,6 +32,7 @@ <templates.filter>templates.properties</templates.filter> <users.filter>users.properties</users.filter> <bulletin.board.filter>bulletin-board.properties</bulletin.board.filter> + <login.filter>login.properties</login.filter> <provenance.filter>provenance.properties</provenance.filter> </properties> <build> @@ -54,6 +55,7 @@ <filter>src/main/resources/filters/${templates.filter}</filter> <filter>src/main/resources/filters/${users.filter}</filter> <filter>src/main/resources/filters/${bulletin.board.filter}</filter> + <filter>src/main/resources/filters/${login.filter}</filter> <filter>src/main/resources/filters/${provenance.filter}</filter> </filters> <plugins> @@ -89,7 +91,8 @@ **/cluster.jsp, **/templates.jsp, **/users.jsp, - **/bulletin-board.jsp + **/bulletin-board.jsp, + **/login.jsp </excludes> </configuration> </execution> @@ -209,6 +212,14 @@ </includes> <filtering>true</filtering> </resource> + <resource> + <directory>src/main/webapp/WEB-INF/pages</directory> + <targetPath>WEB-INF/pages</targetPath> + <includes> + <include>login.jsp</include> + </includes> + <filtering>true</filtering> + </resource> </webResources> </configuration> </plugin> @@ -229,6 +240,7 @@ <templates.filter>templates-min.properties</templates.filter> <users.filter>users-min.properties</users.filter> <bulletin.board.filter>bulletin-board-min.properties</bulletin.board.filter> + <login.filter>login-min.properties</login.filter> <provenance.filter>provenance-min.properties</provenance.filter> </properties> <build> @@ -403,6 +415,16 @@ </aggregation> <aggregation> <insertNewLine>true</insertNewLine> + <output>${project.build.directory}/${project.build.finalName}/js/nf/login/nf-login-all.js</output> + <includes> + <include>${staging.dir}/js/nf/nf-client.js</include> + <include>${staging.dir}/js/nf/nf-common.js</include> + <include>${staging.dir}/js/nf/nf-dialog.js</include> + <include>${staging.dir}/js/nf/login/nf-login.js</include> + </includes> + </aggregation> + <aggregation> + <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-canvas-all.css</output> <includes> <include>${staging.dir}/css/reporting-task.css</include> @@ -517,6 +539,16 @@ <include>${staging.dir}/css/bulletin-board.css</include> </includes> </aggregation> + <aggregation> + <insertNewLine>true</insertNewLine> + <output>${project.build.directory}/${project.build.finalName}/css/nf-login-all.css</output> + <includes> + <include>${staging.dir}/css/main.css</include> + <include>${staging.dir}/css/banner.css</include> + <include>${staging.dir}/css/dialog.css</include> + <include>${staging.dir}/css/login.css</include> + </includes> + </aggregation> </aggregations> </configuration> </execution> @@ -556,6 +588,8 @@ css/nf-users-all.css.gz, css/nf-bulletin-board-all.css, css/nf-bulletin-board-all.css.gz, + css/nf-login-all.css, + css/nf-login-all.css.gz, js/*, js/d3/**/*, js/codemirror/**/*, @@ -584,6 +618,8 @@ js/nf/users/nf-users-all.js.gz, js/nf/bulletin-board/nf-bulletin-board-all.js, js/nf/bulletin-board/nf-bulletin-board-all.js.gz, + js/nf/login/nf-login-all.js, + js/nf/login/nf-login-all.js.gz, images/*, resources/*, images/*, http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties new file mode 100644 index 0000000..4dafb02 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties @@ -0,0 +1,18 @@ +# 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. + +nf.login.script.tags=<script type="text/javascript" src="js/nf/login/nf-login-all.js?${project.version}"></script> +nf.login.style.tags=<link rel="stylesheet" href="css/nf-login-all.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/message-pane.css?${project.version}" type="text/css" /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties new file mode 100644 index 0000000..5b36c17 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties @@ -0,0 +1,24 @@ +# 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. + +nf.login.script.tags=<script type="text/javascript" src="js/nf/nf-common.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/login/nf-login.js?${project.version}"></script> +nf.login.style.tags=<link rel="stylesheet" href="css/reset.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/dialog.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/message-pane.css?${project.version}" type="text/css" />\n\ +<link rel="stylesheet" href="css/login.css?${project.version}" type="text/css" /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp index 62582f9..c54f1fd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp @@ -22,40 +22,23 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> <link rel="stylesheet" href="css/reset.css" type="text/css" /> + ${nf.login.style.tags} + <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> + <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.form.min.js"></script> + <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> + <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> + <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> - <script type="text/javascript"> - /* global nf */ - - $(document).ready(function() { - nf.LogIn.init(); - }); - - nf.LogIn = (function () { - var initializePage = function () { - return $.Deferred(function(deferred) { - - }); - }; - - return { - /** - * Initializes the login page. - */ - init: function () { - initializePage().done(function () { - }); - } - }; - }()); - </script> + ${nf.login.script.tags} </head> <body> <form name="loginForm" action="token" method="post"> <legend>Please Login</legend> <label for="username">Username</label> <input type="text" id="username" name="username" value="${username}"/> + <br> <label for="password">Password</label> <input type="password" id="password" name="password"/> <div class="form-actions"> @@ -63,4 +46,4 @@ </div> </form> </body> -</html> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp index d17f46e..b4ae7d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp @@ -51,7 +51,7 @@ <span id="about-link" class="link">about</span> </li> <li> - <span id="about-link" class="link"><a href="login">login</a></span> + <span id="login-link" class="link">login</span> </li> </ul> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css new file mode 100644 index 0000000..203f5b9 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css @@ -0,0 +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. + */ + +/* + Login Styles +*/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js index 5cc1eff..e4f8977 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js @@ -138,6 +138,11 @@ nf.CanvasHeader = (function () { $('#help-link').click(function () { nf.Shell.showPage(config.urls.helpDocument); }); + + // login link + $('#login-link').click(function () { + nf.Shell.showPage('login', false); + }); // initialize the new template dialog $('#new-template-dialog').modal({ http://git-wip-us.apache.org/repos/asf/nifi/blob/5b658143/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/login/nf-login.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/login/nf-login.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/login/nf-login.js new file mode 100644 index 0000000..a6d9b23 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/login/nf-login.js @@ -0,0 +1,41 @@ +/* + * 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. + */ + +/* global nf, top */ + +$(document).ready(function () { + nf.Login.init(); +}); + +nf.Login = (function () { + var initializePage = function () { + return $.Deferred(function (deferred) { + console.log('hello there'); + deferred.resolve(); + }); + }; + + return { + /** + * Initializes the login page. + */ + init: function () { + initializePage().done(function () { + }); + } + }; +}()); \ No newline at end of file
