You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/04/18 18:34:09 UTC
[4/4] nifi git commit: NIFI-1323 - Temp commit
NIFI-1323
- Temp commit
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8c3f88f5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8c3f88f5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8c3f88f5
Branch: refs/heads/NIFI-1323
Commit: 8c3f88f53f8f2e4d22a2b38eeb414801f4dc2baf
Parents: 852622c
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Mar 11 09:12:55 2016 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Mar 11 09:12:55 2016 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/pages/fresh-face.jsp | 50 +++++++++
.../src/main/webapp/css/fresh-face.css | 106 +++++++++++++++++++
2 files changed, 156 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8c3f88f5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/fresh-face.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/fresh-face.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/fresh-face.jsp
new file mode 100644
index 0000000..84f4add
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/fresh-face.jsp
@@ -0,0 +1,50 @@
+<%--
+ 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.
+--%>
+<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>NiFi</title>
+ <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" />
+ <link rel="stylesheet" href="css/fresh-face.css" type="text/css" />
+ </head>
+ <body>
+ <div id="toolbar-container">
+ <div id="logo">logo</div>
+ <div id="toolbox">toolbox</div>
+ <div id="global-administer">administer</div>
+ <div class="clear"></div>
+ </div>
+ <div id="navigation-container">
+ <div id="flow-status">flow status</div>
+ <div id="search">
+ <input id="search-field" placeholder="Search" />
+ </div>
+ <div id="controller-bulletins">⊡</div>
+ <div class="clear"></div>
+ </div>
+ <div id="breadcrumbs-container">
+ <div id="breadcrumbs">breadcrumbs</div>
+ </div>
+ <div id="action-panels">
+ <div id="navigate-panel" class="action-panel">N</div>
+ <div id="act-panel" class="action-panel">A</div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8c3f88f5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/fresh-face.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/fresh-face.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/fresh-face.css
new file mode 100644
index 0000000..ca282e9
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/fresh-face.css
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+#toolbar-container {
+ background-color: #a9bac4;
+}
+
+#logo {
+ width: 200px;
+ height: 50px;
+ float: left;
+ border: 1px solid #000;
+}
+
+#toolbox {
+ width: 400px;
+ height: 56px;
+ float: left;
+ border: 1px solid #000;
+}
+
+#global-administer {
+ width: 400px;
+ height: 50px;
+ border: 1px solid #000;
+}
+
+@media (max-width: 1006px) {
+ #global-administer {
+ float: left;
+ clear: left;
+ }
+}
+
+@media (min-width: 1006px) {
+ #global-administer {
+ float: right;
+ }
+}
+
+#navigation-container {
+}
+
+#flow-status {
+ height: 30px;
+ border: 1px solid #000;
+ position: absolute;
+ padding-left: 10px;
+ padding-right: 10px;
+ left: 0;
+ right: 140px;
+}
+
+#controller-bulletins {
+ height: 30px;
+ border: 1px solid #000;
+ float: right;
+}
+
+#search {
+ height: 30px;
+ border: 1px solid #000;
+ float: right;
+}
+
+#breadcrumbs-container {
+
+}
+
+#breadcrumbs {
+ border: 1px solid #000;
+ height: 30px;
+}
+
+#action-panels {
+ position: absolute;
+ top: 50%;
+ bottom: 50%;
+ left: 0;
+}
+
+div.action-panel {
+ width: 25px;
+ height: 25px;
+ border: 1px solid #000;
+ line-height: 25px;
+ margin-bottom: 5px;
+}
+
+.clear {
+ clear: both;
+}
\ No newline at end of file