-
Notifications
You must be signed in to change notification settings - Fork 8.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
HDDS-2000. Don't depend on bootstrap/jquery versions from hadoop-trun… #1339
Conversation
/label ozone |
@anuengineer @elek @swagle Please review |
padding: 4px; | ||
-webkit-border-radius: 4px; | ||
-moz-border-radius: 4px; | ||
border-radius: 4px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
-webkit-border-radius: 4px; | ||
-moz-border-radius: 4px; | ||
border-radius: 4px; | ||
direction: ltr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
* ======================================================================== */ | ||
|
||
|
||
+function ($) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:34:W033:Missing semicolon.
+function ($) { | ||
'use strict'; | ||
|
||
// ALERT CLASS DEFINITION |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:27:W033:Missing semicolon.
'use strict'; | ||
|
||
// ALERT CLASS DEFINITION | ||
// ====================== |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:45:W033:Missing semicolon.
// ====================== | ||
|
||
var dismiss = '[data-dismiss="alert"]' | ||
var Alert = function (el) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:36:W033:Missing semicolon.
|
||
var dismiss = '[data-dismiss="alert"]' | ||
var Alert = function (el) { | ||
$(el).on('click', dismiss, this.close) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:68:W033:Missing semicolon.
$(el).on('click', dismiss, this.close) | ||
} | ||
|
||
Alert.VERSION = '3.4.1' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:51:W033:Missing semicolon.
} | ||
|
||
Alert.VERSION = '3.4.1' | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:45:W033:Missing semicolon.
Alert.VERSION = '3.4.1' | ||
|
||
Alert.TRANSITION_DURATION = 150 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:30:W033:Missing semicolon.
|
||
Alert.prototype.close = function (e) { | ||
var $this = $(this) | ||
var selector = $this.attr('data-target') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:40:W033:Missing semicolon.
var selector = $this.attr('data-target') | ||
|
||
if (!selector) { | ||
selector = $this.attr('href') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:51:W033:Missing semicolon.
if (!selector) { | ||
selector = $this.attr('href') | ||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:39:W033:Missing semicolon.
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 | ||
} | ||
|
||
selector = selector === '#' ? [] : selector |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:30:W033:Missing semicolon.
var $parent = $(document).find(selector) | ||
|
||
if (e) e.preventDefault() | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:59:W033:Missing semicolon.
|
||
$parent.trigger(e = $.Event('close.bs.alert')) | ||
|
||
if (e.isDefaultPrevented()) return |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:21:W030:Expected an assignment or function call and instead saw an expression.
jshint:22:W033:Missing semicolon.
$parent.trigger(e = $.Event('close.bs.alert')) | ||
|
||
if (e.isDefaultPrevented()) return | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:4:W033:Missing semicolon.
* Licensed under the MIT license | ||
*/ | ||
|
||
if (typeof jQuery === 'undefined') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:53:W033:Missing semicolon.
$parent.detach().trigger('closed.bs.alert').remove() | ||
} | ||
|
||
$.support.transition && $parent.hasClass('fade') ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:26:W033:Missing semicolon.
} | ||
|
||
$.support.transition && $parent.hasClass('fade') ? | ||
$parent |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:41:W033:Missing semicolon.
$.support.transition && $parent.hasClass('fade') ? | ||
$parent | ||
.one('bsTransitionEnd', removeElement) | ||
.emulateTransitionEnd(Alert.TRANSITION_DURATION) : |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:66:W033:Missing semicolon.
$parent | ||
.one('bsTransitionEnd', removeElement) | ||
.emulateTransitionEnd(Alert.TRANSITION_DURATION) : | ||
removeElement() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:62:W033:Missing semicolon.
.one('bsTransitionEnd', removeElement) | ||
.emulateTransitionEnd(Alert.TRANSITION_DURATION) : | ||
removeElement() | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:7:W033:Missing semicolon.
} | ||
|
||
|
||
// ALERT PLUGIN DEFINITION |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:23:W033:Missing semicolon.
|
||
// ALERT PLUGIN DEFINITION | ||
// ======================= | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:34:E043:Too many errors. (6% scanned).
jshint:34:W033:Missing semicolon.
@@ -0,0 +1,2580 @@ | |||
/*! | |||
* Bootstrap v3.4.1 (https://getbootstrap.com/) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jshint:113:W033:Missing semicolon.
* 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
*/ | ||
|
||
body { | ||
background-color : #ffffff; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
font-family : sans-serif; | ||
} | ||
|
||
.small { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
font-size : smaller; | ||
} | ||
|
||
div#dfsnodetable tr#row1, div.dfstable td.col1 { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
font-weight : bolder; | ||
} | ||
|
||
div.dfstable th { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
div.dfstable th { | ||
text-align:left; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
div.dfstable td#col3 { | ||
text-align : right; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:end of line
} | ||
|
||
div#dfsnodetable caption { | ||
text-align : left; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:end of line
whitespace:tabs in line
|
||
div#dfsnodetable a#title { | ||
font-size : larger; | ||
font-weight : bolder; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:end of line
|
||
div#dfsnodetable td, th { | ||
padding-bottom : 4px; | ||
padding-top : 4px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
div#dfsnodetable A:link, A:visited { | ||
text-decoration : none; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
div#dfsnodetable th.header, th.headerASC, th.headerDSC { | ||
padding-bottom : 8px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
padding-bottom : 8px; | ||
padding-top : 8px; | ||
} | ||
div#dfsnodetable th.header:hover, th.headerASC:hover, th.headerDSC:hover, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
text-decoration : underline; | ||
cursor : pointer; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:end of line
whitespace:tabs in line
div#dfsnodetable td.blocks, td.size, td.pcused, td.adminstate, td.lastcontact { | ||
text-align : right; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
background-color : lightyellow; | ||
} | ||
|
||
.warning { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
.warning { | ||
font-weight : bolder; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
color : red; | ||
} | ||
|
||
div.dfstable table { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
} | ||
|
||
div.dfstable table { | ||
white-space : pre; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace:tabs in line
💔 -1 overall
This message was automatically generated. |
The integration test failure is not related to this patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 thanks the thorough patch.
Tested and both the UIs are working well...
(FTR: I fixed the whitespace issues of hadoop.css durging the commit) |
@elek Thanks for the whitespace fix and commit. |
…k snapshot
I have copied all the dependencies we need for OM and SCM web UI into hdds-framework static folder so that we need not depend on hadoop static resources. I have tested each of the UIs manually from invoking OM, SCM and Datanode in docker compose.
Also, included in this patch is the upgrade of bootstrap and jquery versions used in docs. I have also added ozone logo the navbar header of our docs and verified that the changes look good by both
hugo serve
and by clicking ondocs
link from OM and SCM web UIs.