You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2012/09/11 06:45:39 UTC
svn commit: r1383240 - in /incubator/ambari/branches/AMBARI-666: ./
ambari-web/app/ ambari-web/app/assets/ ambari-web/app/controllers/
ambari-web/app/controllers/installer/ ambari-web/app/routes/
ambari-web/app/styles/ ambari-web/app/templates/ ambari-...
Author: yusaku
Date: Tue Sep 11 04:45:38 2012
New Revision: 1383240
URL: http://svn.apache.org/viewvc?rev=1383240&view=rev
Log:
AMBARI-717. Starter implementation for Installer Customize Services page. Implement top nav and static footer. Stylize login page. (Contributed by yusaku)
Added:
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step10.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step9.js
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-web/app/app.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/index.html
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs
incubator/ambari/branches/AMBARI-666/ambari-web/app/views.js
incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step7.js
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Tue Sep 11 04:45:38 2012
@@ -12,6 +12,9 @@ AMBARI-666 branch (unreleased changes)
NEW FEATURES
+ AMBARI-717. Starter implementation for Installer Customize Services page.
+ Stylize top nav and implement static footer. Stylize login page. (yusaku)
+
AMBARI-711. Create utility functions related to localStorage for first two
steps: cluster name and Install options. Also develop view logic with
preliminary validations for these two steps. (Jaimin Jetly via yusaku)
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/app.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/app.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/app.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/app.js Tue Sep 11 04:45:38 2012
@@ -21,6 +21,8 @@
module.exports = Em.Application.create({
name: 'Ambari Web',
+ rootElement: '#wrapper',
+
store: DS.Store.create({
revision: 4,
adapter: DS.FixtureAdapter.create()
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/index.html
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/index.html?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/index.html (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/index.html Tue Sep 11 04:45:38 2012
@@ -31,6 +31,14 @@
<link rel="shortcut icon" href="/img/logo-micro.gif">
</head>
<body>
+ <div id="wrapper">
<!-- ApplicationView -->
+ </div>
+ <footer>
+ <div class="container">
+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License, Version 2.0</a>.<br>
+ <a href="/licenses/NOTICE.txt" target="_blank">See third-party tools/resources that Ambari uses and their respective authors</a>
+ </div>
+ </footer>
</body>
</html>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js Tue Sep 11 04:45:38 2012
@@ -21,4 +21,5 @@
require('controllers/application');
require('controllers/login');
-require('controllers/installer');
\ No newline at end of file
+require('controllers/installer');
+require('controllers/installer/step7');
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js Tue Sep 11 04:45:38 2012
@@ -281,6 +281,13 @@ App.InstallerController = Em.Controller.
return this.get('currentStep') == '8';
}.property('currentStep'),
+ isStep9: function () {
+ return this.get('currentStep') == '9';
+ }.property('currentStep'),
+
+ isStep10: function () {
+ return this.get('currentStep') == '10';
+ }.property('currentStep'),
/**
*
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js?rev=1383240&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js Tue Sep 11 04:45:38 2012
@@ -0,0 +1,120 @@
+/**
+ * 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.
+ */
+
+App.InstallerStep7Controller = Em.ArrayController.extend({
+
+ name: 'installerStep7Controller',
+
+ content: [
+ Em.Object.create({
+ serviceName: 'HDFS',
+ configCategories: [ 'General', 'NameNode', 'SNameNode', 'DataNode', 'Advanced' ],
+ configs: [{
+ name: 'dfs.prop1',
+ displayName: 'Prop1',
+ value: '',
+ defaultValue: '100',
+ category: 'General'
+ }, {
+ name: 'dfs.prop2',
+ displayName: 'Prop2',
+ value: '',
+ defaultValue: '0',
+ category: 'General'
+ }, {
+ name: 'dfs.adv.prop1',
+ displayName: 'Adv Prop1',
+ value: '',
+ defaultValue: '100',
+ category: 'Advanced'
+ }, {
+ name: 'dfs.adv.prop2',
+ displayName: 'Adv Prop2',
+ value: '',
+ defaultValue: '0',
+ category: 'Advanced'
+ }, {
+ name: 'dfs.namenode.dir',
+ displayName: 'NameNode directories',
+ value: '',
+ defaultValue: '',
+ category: 'NameNode'
+ }, {
+ name: 'dfs.namenode.prop1',
+ displayName: 'NameNode Prop1',
+ value: '',
+ defaultValue: 'default (nn)',
+ category: 'NameNode'
+ }, {
+ name: 'fs.checkpoint.dir',
+ displayName: 'SNameNode directories',
+ value: '',
+ defaultValue: '',
+ category: 'SNameNode'
+ }, {
+ name: 'fs.checkpoint.prop1',
+ displayName: 'SNameNode Prop1',
+ value: '',
+ defaultValue: 'default (snn)',
+ category: 'SNameNode'
+ }, {
+ name: 'dfs.data.dir',
+ displayName: 'DataNode directories',
+ value: '',
+ defaultValue: '',
+ category: 'DataNode'
+ }, {
+ name: 'dfs.data.prop1',
+ displayName: 'DataNode Prop1',
+ value: '',
+ defaultValue: 'default (dn)',
+ category: 'DataNode'
+ }]
+ }),
+ Em.Object.create({
+ serviceName: 'MapReduce',
+ configCategories: [ 'General', 'JobTracker', 'TaskTracker', 'Advanced' ],
+ configs: [{
+ name: 'mapred.prop1',
+ displayName: 'Prop1',
+ value: '',
+ defaultValue: '0',
+ category: 'General'
+ }, {
+ name: 'jt.prop1',
+ displayName: 'JT Prop1',
+ value: '',
+ defaultValue: '128',
+ category: 'JobTracker'
+ }, {
+ name: 'tt.prop1',
+ displayName: 'TT Prop1',
+ value: '',
+ defaultValue: '256',
+ category: 'TaskTracker'
+ }, {
+ name: 'mapred.adv.prop1',
+ displayName: 'Adv Prop1',
+ value: '',
+ defaultValue: '1024',
+ category: 'Advanced'
+ }]
+ })
+ ]
+
+});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js Tue Sep 11 04:45:38 2012
@@ -24,20 +24,21 @@ App.messages = {
'page_title': 'Ambari',
'installer_welcome': 'Welcome to Ambari installation wizard',
'login_error': 'Invalid username/password combination.',
- 'login_header': 'Ambari Login',
+ 'login_header': 'Sign in',
'username_label': 'Username',
'password_label': 'Password',
- 'login_button': 'Login',
+ 'login_button': 'Sign in',
- 'step1_header': 'Welcome',
- 'step2_header': 'Install Options',
- 'step3_header': 'Confirm Hosts',
- 'step4_header': 'Choose Services',
- 'step5_header': 'Assign Services',
- 'step6_header': 'Customize Services',
- 'step7_header': 'Review',
- 'step8_header': 'Install, Start and Test',
- 'step9_header': 'Summary',
+ "step1_header": "Welcome",
+ "step2_header": "Install Options",
+ "step3_header": "Confirm Hosts",
+ "step4_header": "Choose Services",
+ "step5_header": "Assign Masters",
+ "step6_header": "Assign Slaves",
+ "step7_header": "Customize Services",
+ "step8_header": "Review",
+ "step9_header": "Install, Start and Test",
+ "step10_header": "Summary",
'page_footer_body': '<a href = \"http://www.apache.org/licenses/LICENSE-2.0\" target = \"_blank\">Licensed under the ' +
'Apache License, Version 2.0</a>.<br><a href = \"/licenses/NOTICE.txt\" target = \"_blank\">See third-party ' +
'tools/resources that Ambari uses and their respective authors</a>',
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js Tue Sep 11 04:45:38 2012
@@ -127,13 +127,34 @@ module.exports = Em.Route.extend({
}),
step8: Em.Route.extend({
- route: '/step8',
+ route: '/step7',
+
connectOutlets: function (router, context) {
router.setInstallerCurrentStep('8', false);
router.get('installerController').connectOutlet('installerStep8');
},
-
back: Em.Router.transitionTo('step7'),
+ next: Em.Router.transitionTo('step9')
+ }),
+
+ step9: Em.Route.extend({
+ route: '/step7',
+ connectOutlets: function (router, context) {
+ router.setInstallerCurrentStep('9', false);
+ router.get('installerController').connectOutlet('installerStep9');
+ },
+ back: Em.Router.transitionTo('step8'),
+ next: Em.Router.transitionTo('step10')
+ }),
+
+ step10: Em.Route.extend({
+ route: '/step8',
+ connectOutlets: function (router, context) {
+ router.setInstallerCurrentStep('10', false);
+ router.get('installerController').connectOutlet('installerStep10');
+ },
+
+ back: Em.Router.transitionTo('step9'),
complete: function (router, context) {
if (true) { // this function will be moved to installerController where it will validate
@@ -160,6 +181,10 @@ module.exports = Em.Route.extend({
gotoStep7: Em.Router.transitionTo('step7'),
- gotoStep8: Em.Router.transitionTo('step8')
+ gotoStep8: Em.Router.transitionTo('step8'),
+
+ gotoStep9: Em.Router.transitionTo('step9'),
+
+ gotoStep10: Em.Router.transitionTo('step10')
});
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less Tue Sep 11 04:45:38 2012
@@ -16,6 +16,39 @@
* limitations under the License.
*/
+html, body {
+ height: 100%;
+}
+
+#wrapper {
+ min-height: 100%;
+}
+
+@footer-height: 100px;
+
+#main {
+ overflow: auto;
+ padding-bottom: @footer-height;
+}
+
+footer {
+ position: relative;
+ border-top: 1px solid #e5e5e5;
+ padding: 30px 0;
+ background-color: #fff;
+ color: #666666;
+ margin-top: -1 * @footer-height;
+ height: @footer-height - 60px;
+}
+
+footer .container {
+ margin: 0 auto;
+ width: 980px;
+}
+
+#content {
+ padding: 20px 0;
+}
@green: #69BE28;
@@ -23,10 +56,21 @@ h1 {
color: @green;
}
-footer {
- margin-top: 40px;
+
+.navbar .container {
+ width: 940px;
+}
+
+.login.well {
+ width: 300px;
+ margin: 20px auto;
+ padding: 25px;
}
.login h2 {
margin-bottom: 20px;
+}
+
+.login .btn {
+ margin-top: 15px;
}
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates.js Tue Sep 11 04:45:38 2012
@@ -31,3 +31,6 @@ require('templates/installer/step5');
require('templates/installer/step6');
require('templates/installer/step7');
require('templates/installer/step8');
+require('templates/installer/step9');
+require('templates/installer/step10');
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs Tue Sep 11 04:45:38 2012
@@ -15,28 +15,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
-<div class="container">
+<div id="main">
<div class="navbar">
- <a {{action gotoStep1}}><img id="logo" src="/img/logo-small.gif"></a>
- <a class="brand" href="javascript:void 0">{{App.messages.app_name}}</a>
- <ul class="nav">
- <li class="right"><a class="help" href="{{App.messages.topnav_help_link}}" target="_blank">Help</a></li>
- {{#if App.router.loggedIn}}
- <li class="right"><a class="help" href="" {{action logoff}}>Sign out</a></li>
- {{/if}}
- <li class="right">{{loginName}}</li>
- </ul>
+ <div class="navbar-inner">
+ <div class="container">
+ <a {{action gotoStep1}}><img id="logo" src="/img/logo-small.gif"></a>
+ <a class="brand" href="#">{{App.messages.app_name}}</a>
+ <ul class="nav">
+ <li class="right"><a class="help" {{bindAttr href="App.messages.topnav_help_link"}} target="_blank">Help</a></li>
+ {{#if App.router.loggedIn}}
+ <li class="right"><a class="help" href="" {{action logoff}}>Sign out</a></li>
+ {{/if}}
+ <li class="right">{{loginName}}</li>
+ </ul>
+ </div>
+ </div>
</div>
-</div>
-
-<div class ="container">
- <div>
- {{outlet}}
+ <div id="content">
+ {{outlet}}
</div>
- <footer>
- {{{App.messages.page_footer_body}}}
- </footer>
</div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs Tue Sep 11 04:45:38 2012
@@ -32,6 +32,8 @@
<li {{bindAttr class="isStep6:active"}}><a {{action gotoStep6}}>{{App.messages.step6_header}}</a></li>
<li {{bindAttr class="isStep7:active"}}><a {{action gotoStep7}}>{{App.messages.step7_header}}</a></li>
<li {{bindAttr class="isStep8:active"}}><a {{action gotoStep8}}>{{App.messages.step8_header}}</a></li>
+ <li {{bindAttr class="isStep9:active"}}><a {{action gotoStep9}}>{{App.messages.step9_header}}</a></li>
+ <li {{bindAttr class="isStep10:active"}}><a {{action gotoStep10}}>{{App.messages.step10_header}}</a></li>
</ul>
</div>
</div>
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs?rev=1383240&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs Tue Sep 11 04:45:38 2012
@@ -0,0 +1,21 @@
+<!--
+* 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.
+-->
+
+<h2>{{App.messages.step10_header}}</h2>
+<a class="btn" {{action back}}>Back</a>
+<a class="btn btn-success" {{action complete}}>Complete</a>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs Tue Sep 11 04:45:38 2012
@@ -16,7 +16,33 @@
* limitations under the License.
-->
-
<h2>{{App.messages.step7_header}}</h2>
+<ul class="nav nav-tabs">
+{{#each controller}}
+ <li><a href="#" data-toggle="tab">{{serviceName}}</a></li>
+{{/each}}
+</ul>
+{{#each service in controller}}
+<div class="accordion">
+ {{#each category in service.configCategories}}
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle">
+ {{category}}
+ </a>
+ </div>
+ {{#view App.ServiceConfigsByCategoryView categoryBinding="category" serviceConfigsBinding="service.configs"}}
+ <div class="accordion-body collapse in">
+ <div class="accordion-inner">
+ {{#each view.categoryConfigs}}
+ <label>{{displayName}} ({{name}})</label> {{#view Ember.TextField}}{{/view}} (default: {{defaultValue}})
+ {{/each}}
+ </div>
+ </div>
+ {{/view}}
+ </div>
+ {{/each}}
+</div>
+{{/each}}
<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
\ No newline at end of file
+<a class="btn btn-success" style="float:right" {{action next}}>Next</a>
\ No newline at end of file
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs?rev=1383240&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs Tue Sep 11 04:45:38 2012
@@ -0,0 +1,21 @@
+<!--
+* 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.
+-->
+
+<h2>{{App.messages.step9_header}}</h2>
+<a class="btn" {{action back}}>Back</a>
+<a class="btn btn-success" {{action complete}}>Complete</a>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs Tue Sep 11 04:45:38 2012
@@ -26,11 +26,11 @@
<div>
{{App.messages.username_label}}
</div>
-{{view Ember.TextField valueBinding="loginName"}}
+{{view Ember.TextField valueBinding="loginName" class="span4"}}
<div>
{{App.messages.password_label}}
</div>
-{{view Ember.TextField type="password" valueBinding="password"}}
+{{view Ember.TextField type="password" valueBinding="password" class="span4"}}
<div>
</div>
<div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views.js Tue Sep 11 04:45:38 2012
@@ -31,4 +31,6 @@ require('views/installer/step4');
require('views/installer/step5');
require('views/installer/step6');
require('views/installer/step7');
-require('views/installer/step8');
\ No newline at end of file
+require('views/installer/step8');
+require('views/installer/step9');
+require('views/installer/step10');
\ No newline at end of file
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step10.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step10.js?rev=1383240&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step10.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step10.js Tue Sep 11 04:45:38 2012
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+
+var App = require('app');
+
+App.InstallerStep10View = Em.View.extend({
+
+ templateName: require('templates/installer/step10')
+
+});
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step7.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step7.js?rev=1383240&r1=1383239&r2=1383240&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step7.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step7.js Tue Sep 11 04:45:38 2012
@@ -28,4 +28,17 @@ App.InstallerStep7View = Em.View.extend(
App.router.transitionTo('step8');
}
-});
\ No newline at end of file
+});
+
+App.ServiceConfigsByCategoryView = Ember.View.extend({
+ viewName: 'serviceConfigs',
+ content: null,
+
+ category: null,
+ serviceConfigs: null, // General, Advanced, NameNode, SNameNode, DataNode, etc.
+ //require('templates/installer/serviceConfigsByCategory'),
+
+ categoryConfigs: function() {
+ return this.get("serviceConfigs").filterProperty('category', this.get('category'))
+ }.property('categoryConfigs.@each').cacheable()
+});
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step9.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step9.js?rev=1383240&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step9.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/installer/step9.js Tue Sep 11 04:45:38 2012
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+
+var App = require('app');
+
+App.InstallerStep9View = Em.View.extend({
+
+ templateName: require('templates/installer/step9')
+
+});
\ No newline at end of file