Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-2107] [NIFI-2143] Update content-viewer, error, and login pages...Fix Provenance filter combo text. This closes #684

This commit is contained in:
Scott Aslan 2016-07-20 16:34:50 -04:00 committed by Matt Gilman
parent 5eba2b763e
commit f352ea10b7
14 changed files with 87 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
View File

@ -21,12 +21,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="../nifi/images/nifi16.ico"/> <link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
<title>NiFi</title> <title>NiFi</title>
<link href="css/main.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="../nifi/css/reset.css" type="text/css" />
<link href="../nifi/css/message-pane.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="css/main.css" type="text/css" />
<link href="../nifi/css/message-page.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="../nifi/css/common-ui.css" type="text/css" />
<link rel="stylesheet" href="../nifi/fonts/flowfont/flowfont.css" type="text/css" />
<link rel="stylesheet" href="../nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<link rel="stylesheet" href="../nifi/css/message-pane.css" type="text/css" />
<link rel="stylesheet" href="../nifi/css/message-page.css" type="text/css" />
<link rel="stylesheet" href="../nifi/js/jquery/combo/jquery.combo.css" type="text/css" /> <link rel="stylesheet" href="../nifi/js/jquery/combo/jquery.combo.css" type="text/css" />
<link rel="stylesheet" href="../nifi/js/jquery/modal/jquery.modal.css" type="text/css" /> <link rel="stylesheet" href="../nifi/js/jquery/modal/jquery.modal.css" type="text/css" />
<link rel="stylesheet" href="../nifi/css/reset.css" type="text/css" />
<script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../nifi/js/jquery/jquery.center.js"></script> <script type="text/javascript" src="../nifi/js/jquery/jquery.center.js"></script>
<script type="text/javascript" src="../nifi/js/jquery/combo/jquery.combo.js"></script> <script type="text/javascript" src="../nifi/js/jquery/combo/jquery.combo.js"></script>
@ -43,6 +46,11 @@
overlayBackground: false, overlayBackground: false,
buttons: [{ buttons: [{
buttonText: 'Ok', buttonText: 'Ok',
color: {
base: '#728E9B',
hover: '#004849',
text: '#ffffff'
},
handler: { handler: {
click: function () { click: function () {
$$('#content-viewer-message-dialog').modal('hide'); $$('#content-viewer-message-dialog').modal('hide');
@ -146,8 +154,8 @@
<div id="content-viewer-message"></div> <div id="content-viewer-message"></div>
</div> </div>
</div> </div>
<div id="view-as-label">View as</div> <div id="view-as-label">View as:</div>
<div id="view-as" class="pointer button-normal"></div> <div id="view-as" class="pointer button-normal"></div>
<div id="content-filename"><span class="content-label">filename</span><%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %></div> <div id="content-filename"><span class="content-label">Filename:</span><%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %></div>
<div id="content-type"><span class="content-label">content type</span><%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %></div> <div id="content-type"><span class="content-label">Content Type:</span><%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %></div>
<div class="message-pane-message-box"> <div class="message-pane-message-box">

39
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css
View File

@ -30,37 +30,50 @@
#view-as-label { #view-as-label {
position: absolute; position: absolute;
top: 72px; top: 72px;
left: 144px; left: 100px;
line-height: 24px; line-height: 30px;
font-size: 12px; font-size: 12px;
font-weight: normal;
font-family: Roboto Slab;
color: #262626;
} }
#view-as { #view-as {
position: absolute; position: relative;
top: 72px; top: 72px;
left: 200px; left: 150px;
width: 80px;
height: 18px;
} }
#content-filename { #content-filename {
position: absolute; position: absolute;
top: 58px; top: 62px;
right: 50px; right: 50px;
line-height: 24px; line-height: normal;
font-size: 12px; color: #775351;
font-size: 13px;
font-style: normal;
font-weight: 500;
font-family: 'Roboto';
} }
#content-type { #content-type {
position: absolute; position: absolute;
top: 75px; top: 79px;
right: 50px; right: 50px;
line-height: 24px; line-height: normal;
font-size: 12px; color: #775351;
font-size: 13px;
font-style: normal;
font-weight: 500;
font-family: 'Roboto';
} }
.content-label { .content-label {
font-weight: bold; font-size: 12px;
font-weight: 500;
font-family: Roboto Slab;
padding-bottom: 4px;
color: #262626;
margin-right: 8px; margin-right: 8px;
} }

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
View File

@ -20,10 +20,14 @@
<% String contextPath = "/".equals(request.getContextPath()) ? "" : request.getContextPath(); %> <% String contextPath = "/".equals(request.getContextPath()) ? "" : request.getContextPath(); %>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="../nifi/images/nifi16.ico"/> <link rel="shortcut icon" href="<%= contextPath %>/nifi/images/nifi16.ico"/>
<title>NiFi</title> <title>NiFi</title>
<link href="<%= contextPath %>/nifi/css/message-pane.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/css/reset.css" type="text/css" />
<link href="<%= contextPath %>/nifi/css/message-page.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/css/common-ui.css" type="text/css" />
<link rel="stylesheet" href="<%= contextPath %>/nifi/fonts/flowfont/flowfont.css" type="text/css" />
<link rel="stylesheet" href="<%= contextPath %>/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-pane.css" type="text/css" />
<link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-page.css" type="text/css" />
</head> </head>
<body class="message-pane"> <body class="message-pane">

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
View File

@ -22,6 +22,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="shortcut icon" href="images/nifi16.ico"/> <link rel="shortcut icon" href="images/nifi16.ico"/>
<link rel="stylesheet" href="css/reset.css" type="text/css" /> <link rel="stylesheet" href="css/reset.css" type="text/css" />
<link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
<link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
${nf.login.style.tags} ${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/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/qtip2/jquery.qtip.min.css?" type="text/css" />

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
View File

@ -21,8 +21,12 @@
<title><%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %></title> <title><%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/nifi16.ico"/> <link rel="shortcut icon" href="images/nifi16.ico"/>
<link href="/nifi/css/message-pane.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="/nifi/css/reset.css" type="text/css" />
<link href="/nifi/css/message-page.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" href="/nifi/css/common-ui.css" type="text/css" />
<link rel="stylesheet" href="/nifi/fonts/flowfont/flowfont.css" type="text/css" />
<link rel="stylesheet" href="/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<link rel="stylesheet" href="/nifi/css/message-pane.css" type="text/css" />
<link rel="stylesheet" href="/nifi/css/message-page.css" type="text/css" />
</head> </head>
<body class="message-pane"> <body class="message-pane">

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
View File

@ -20,13 +20,13 @@
<div class="setting"> <div class="setting">
<div class="setting-name">Username</div> <div class="setting-name">Username</div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="username"/> <input type="text" placeholder="username" id="username"/>
</div> </div>
</div> </div>
<div class="setting"> <div class="setting">
<div class="setting-name">Password</div> <div class="setting-name">Password</div>
<div class="setting-field"> <div class="setting-field">
<input type="password" id="password"/> <input type="password" placeholder="password" id="password"/>
</div> </div>
</div> </div>
</div> </div>

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css
View File

@ -100,7 +100,6 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before {
body { body {
display: block; display: block;
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-size: 62.5%;
overflow: hidden; overflow: hidden;
color: #262626; color: #262626;
} }
@ -338,7 +337,7 @@ input:focus {
.filter-container { .filter-container {
height: 32px; height: 32px;
width: 318px; width: 100%;
float: left; float: left;
} }
@ -352,7 +351,6 @@ input.filter {
} }
.filter-type { .filter-type {
width: 120px;
float: left; float: left;
} }
@ -492,4 +490,12 @@ md-progress-linear > div {
font-weight: bold; font-weight: bold;
padding-bottom: 20px; padding-bottom: 20px;
text-overflow: ellipsis; text-overflow: ellipsis;
}
.CodeMirror {
border: 1px solid #aaa;
font-family: monospace;
background-color: #fff;
cursor: default;
line-height: normal;
} }

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
View File

@ -26,7 +26,6 @@
bottom: 0px; bottom: 0px;
right: 0px; right: 0px;
background: #fff url(../images/bg-error.png) left top no-repeat; background: #fff url(../images/bg-error.png) left top no-repeat;
font-family: Verdana, Geneva, sans-serif;
padding-top: 100px; padding-top: 100px;
padding-left: 100px; padding-left: 100px;
} }
@ -42,10 +41,11 @@
} }
.login-title { .login-title {
font-size: 12px; font-size: 18px;
font-weight: bold; font-weight: bold;
font-family: Roboto Slab;
margin-bottom: 10px; margin-bottom: 10px;
color: #000; color: #728e9b;
} }
#login-user-links-container { #login-user-links-container {

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
View File

@ -15,6 +15,10 @@
* limitations under the License. * limitations under the License.
*/ */
body {
font-size: 62.5%;
}
#splash { #splash {
position: absolute; position: absolute;
top: 0px; top: 0px;

17
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css
View File

@ -20,25 +20,26 @@
left: 0px; left: 0px;
bottom: 0px; bottom: 0px;
right: 0px; right: 0px;
background: #d1dee5 url(../images/bg-error.png) left top no-repeat; background: #ffffff url(../images/bg-error.png) left top no-repeat;
font-family: Verdana, Geneva, sans-serif;
color: #191919;
z-index: 999999; z-index: 999999;
} }
.message-pane-content { .message-pane-content {
font-size: 11px; font-size: 12px;
color: #191919; color: #262626;
line-height: normal; line-height: normal;
} }
.message-pane-message-box { .message-pane-message-box {
margin-top: 100px; margin-top: 72px;
padding-left: 100px; padding-left: 100px;
} }
.message-pane-title { .message-pane-title {
font-size: 18px;
color: #294c58;
margin-bottom: 16px; margin-bottom: 16px;
color: #728e9b;
font-size: 16px;
font-family: 'Roboto Slab';
font-style: normal;
font-weight: bold;
} }

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
View File

@ -80,7 +80,7 @@ div.provenance-panel {
#provenance-filter-container { #provenance-filter-container {
height: 24px; height: 24px;
width: 326px; width: 100%;
} }
#provenance-filter { #provenance-filter {
@ -94,7 +94,6 @@ input.provenance-filter-list {
} }
#provenance-filter-type { #provenance-filter-type {
width: 128px;
float: left; float: left;
} }

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
View File

@ -68,7 +68,7 @@
#templates-filter-container { #templates-filter-container {
height: 32px; height: 32px;
width: 318px; width: 100%;
} }
#templates-filter { #templates-filter {
@ -82,7 +82,6 @@ input.templates-filter-list {
} }
#templates-filter-type { #templates-filter-type {
width: 120px;
float: left; float: left;
} }

BIN
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 13 KiB

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
View File

@ -25,8 +25,8 @@
padding:0 10px; padding:0 10px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-top: 1px solid #eaeef0; border: 1px solid #eaeef0;
border-bottom: 1px solid #eaeef0; width: 148px;
} }
.combo-options { .combo-options {