Repository: ambari Updated Branches: refs/heads/trunk 7e3641eba -> 9c302dcd2
AMBARI-21197 Disable Kerberos UI step by step panel misalign with the Complete button at the bottom of the page (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c302dcd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c302dcd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c302dcd Branch: refs/heads/trunk Commit: 9c302dcd237af0ba9b5099ddc3bf7b94e29496cd Parents: 7e3641e Author: Di Li <d...@apache.org> Authored: Thu Jun 8 13:21:06 2017 -0400 Committer: Di Li <d...@apache.org> Committed: Thu Jun 8 13:21:06 2017 -0400 ---------------------------------------------------------------------- ambari-web/app/templates/common/progress.hbs | 4 ++++ ambari-web/app/views/main/admin/kerberos/disable_view.js | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9c302dcd/ambari-web/app/templates/common/progress.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/progress.hbs b/ambari-web/app/templates/common/progress.hbs index ab59328..417498a 100644 --- a/ambari-web/app/templates/common/progress.hbs +++ b/ambari-web/app/templates/common/progress.hbs @@ -15,7 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. }} +{{#if view.disableKerberos}} +<div id="common-progress-page" class="wizard-content col-md-12"> +{{else}} <div id="common-progress-page" class="wizard-content col-md-9"> +{{/if}} <h4 class="step-title">{{view.headerTitle}}</h4> <div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}} http://git-wip-us.apache.org/repos/asf/ambari/blob/9c302dcd/ambari-web/app/views/main/admin/kerberos/disable_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/kerberos/disable_view.js b/ambari-web/app/views/main/admin/kerberos/disable_view.js index f7b3527..c3f8902 100644 --- a/ambari-web/app/views/main/admin/kerberos/disable_view.js +++ b/ambari-web/app/views/main/admin/kerberos/disable_view.js @@ -37,6 +37,7 @@ App.KerberosDisableView = App.KerberosProgressPageView.extend({ msgColor: 'alert-info', - isSimpleModal: true + isSimpleModal: true, + disableKerberos: true });