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; |
| -webkit-border-radius: 4px; | ||
| -moz-border-radius: 4px; | ||
| border-radius: 4px; | ||
| direction: ltr; |
| * ======================================================================== */ | ||
|
|
||
|
|
||
| +function ($) { |
There was a problem hiding this comment.
jshint:34:W033:Missing semicolon.
| +function ($) { | ||
| 'use strict'; | ||
|
|
||
| // ALERT CLASS DEFINITION |
There was a problem hiding this comment.
jshint:27:W033:Missing semicolon.
| 'use strict'; | ||
|
|
||
| // ALERT CLASS DEFINITION | ||
| // ====================== |
There was a problem hiding this comment.
jshint:45:W033:Missing semicolon.
| // ====================== | ||
|
|
||
| var dismiss = '[data-dismiss="alert"]' | ||
| var Alert = function (el) { |
There was a problem hiding this comment.
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.
jshint:68:W033:Missing semicolon.
| $(el).on('click', dismiss, this.close) | ||
| } | ||
|
|
||
| Alert.VERSION = '3.4.1' |
There was a problem hiding this comment.
jshint:51:W033:Missing semicolon.
| } | ||
|
|
||
| Alert.VERSION = '3.4.1' | ||
|
|
There was a problem hiding this comment.
jshint:45:W033:Missing semicolon.
| Alert.VERSION = '3.4.1' | ||
|
|
||
| Alert.TRANSITION_DURATION = 150 | ||
|
|
There was a problem hiding this comment.
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.
jshint:40:W033:Missing semicolon.
| var selector = $this.attr('data-target') | ||
|
|
||
| if (!selector) { | ||
| selector = $this.attr('href') |
There was a problem hiding this comment.
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.
jshint:39:W033:Missing semicolon.
| selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 | ||
| } | ||
|
|
||
| selector = selector === '#' ? [] : selector |
There was a problem hiding this comment.
jshint:30:W033:Missing semicolon.
| var $parent = $(document).find(selector) | ||
|
|
||
| if (e) e.preventDefault() | ||
|
|
There was a problem hiding this comment.
jshint:59:W033:Missing semicolon.
|
|
||
| $parent.trigger(e = $.Event('close.bs.alert')) | ||
|
|
||
| if (e.isDefaultPrevented()) return |
There was a problem hiding this comment.
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 | ||
|
|
| * Licensed under the MIT license | ||
| */ | ||
|
|
||
| if (typeof jQuery === 'undefined') { |
There was a problem hiding this comment.
jshint:53:W033:Missing semicolon.
| $parent.detach().trigger('closed.bs.alert').remove() | ||
| } | ||
|
|
||
| $.support.transition && $parent.hasClass('fade') ? |
There was a problem hiding this comment.
jshint:26:W033:Missing semicolon.
| } | ||
|
|
||
| $.support.transition && $parent.hasClass('fade') ? | ||
| $parent |
There was a problem hiding this comment.
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.
jshint:66:W033:Missing semicolon.
| $parent | ||
| .one('bsTransitionEnd', removeElement) | ||
| .emulateTransitionEnd(Alert.TRANSITION_DURATION) : | ||
| removeElement() |
There was a problem hiding this comment.
jshint:62:W033:Missing semicolon.
| .one('bsTransitionEnd', removeElement) | ||
| .emulateTransitionEnd(Alert.TRANSITION_DURATION) : | ||
| removeElement() | ||
| } |
| } | ||
|
|
||
|
|
||
| // ALERT PLUGIN DEFINITION |
There was a problem hiding this comment.
jshint:23:W033:Missing semicolon.
|
|
||
| // ALERT PLUGIN DEFINITION | ||
| // ======================= | ||
|
|
There was a problem hiding this comment.
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.
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 |
| */ | ||
|
|
||
| body { | ||
| background-color : #ffffff; |
| font-family : sans-serif; | ||
| } | ||
|
|
||
| .small { |
| font-size : smaller; | ||
| } | ||
|
|
||
| div#dfsnodetable tr#row1, div.dfstable td.col1 { |
| font-weight : bolder; | ||
| } | ||
|
|
||
| div.dfstable th { |
| } | ||
|
|
||
| div.dfstable th { | ||
| text-align:left; |
| } | ||
|
|
||
| div.dfstable td#col3 { | ||
| text-align : right; |
| } | ||
|
|
||
| div#dfsnodetable caption { | ||
| text-align : left; |
There was a problem hiding this comment.
whitespace:end of line
whitespace:tabs in line
|
|
||
| div#dfsnodetable a#title { | ||
| font-size : larger; | ||
| font-weight : bolder; |
|
|
||
| div#dfsnodetable td, th { | ||
| padding-bottom : 4px; | ||
| padding-top : 4px; |
| } | ||
|
|
||
| div#dfsnodetable A:link, A:visited { | ||
| text-decoration : none; |
| } | ||
|
|
||
| div#dfsnodetable th.header, th.headerASC, th.headerDSC { | ||
| padding-bottom : 8px; |
| padding-bottom : 8px; | ||
| padding-top : 8px; | ||
| } | ||
| div#dfsnodetable th.header:hover, th.headerASC:hover, th.headerDSC:hover, |
| text-decoration : underline; | ||
| cursor : pointer; | ||
| } | ||
|
|
There was a problem hiding this comment.
whitespace:end of line
whitespace:tabs in line
| div#dfsnodetable td.blocks, td.size, td.pcused, td.adminstate, td.lastcontact { | ||
| text-align : right; | ||
| } | ||
|
|
| background-color : lightyellow; | ||
| } | ||
|
|
||
| .warning { |
| } | ||
|
|
||
| .warning { | ||
| font-weight : bolder; |
| color : red; | ||
| } | ||
|
|
||
| div.dfstable table { |
| } | ||
|
|
||
| div.dfstable table { | ||
| white-space : pre; |
|
💔 -1 overall
This message was automatically generated. |
|
The integration test failure is not related to this patch |
|
(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 serveand by clicking ondocslink from OM and SCM web UIs.