incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1383470 - in /incubator/ambari/branches/AMBARI-666: ./ ambari-web/app/controllers/installer/ ambari-web/app/styles/ ambari-web/app/templates/installer/
Date Tue, 11 Sep 2012 16:27:36 GMT
Author: yusaku
Date: Tue Sep 11 16:27:36 2012
New Revision: 1383470

URL: http://svn.apache.org/viewvc?rev=1383470&view=rev
Log:
AMBARI-720. Tweak basic styles for Installer. (Contributed by yusaku)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js
    incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step1.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step2.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step3.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step5.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step6.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step7.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs
    incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs

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=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Tue Sep 11 16:27:36 2012
@@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-720. Tweak basic styles for Installer. (yusaku)
+
   AMBARI-719. Enable Responsive Design. (yusaku)
 
   AMBARI-716. Add back TestNodeImpl and fix memory types and disk info

Modified: 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=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer/step7.js Tue
Sep 11 16:27:36 2012
@@ -29,6 +29,8 @@ App.InstallerStep7Controller = Em.ArrayC
         displayName: 'Prop1',
         value: '',
         defaultValue: '100',
+        description: 'This is Prop1',
+        unit: 'MB',
         category: 'General'
       }, {
         name: 'dfs.prop2',

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=1383470&r1=1383469&r2=1383470&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
16:27:36 2012
@@ -59,6 +59,7 @@ h1 {
 
 .login {
     h2 {
+        margin-top: 0;
         margin-bottom: 20px;
     }
     .btn {
@@ -67,11 +68,23 @@ h1 {
 }
 
 #installer {
+    h2 {
+        margin-top: 0;
+    }
     .content {
+        padding: 25px;
         background-color: #fff;
     }
     .btn.btn-success {
         /* float: right; */
     }
+    .btn-area {
+        margin-top: 20px;
+    }
+    .accordion-heading {
+        background-color: #f0f0f0;
+    }
+    .accordion-group {
+        margin-bottom:20px;
+    }
 }
-

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step1.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step1.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step1.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step1.hbs Tue
Sep 11 16:27:36 2012
@@ -42,7 +42,7 @@
 {{/if}}
 
 
-<div>
+<div class="btn-area">
     <a class="btn btn-success" {{action next}}>Next</a>
 </div>
 {{/view}}
\ No newline at end of file

Modified: 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=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step10.hbs Tue
Sep 11 16:27:36 2012
@@ -17,5 +17,7 @@
 -->
 
 <h2>{{App.messages.step10_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action complete}}>Complete</a>
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action complete}}>Complete</a>
+</div>
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step2.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step2.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step2.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step2.hbs Tue
Sep 11 16:27:36 2012
@@ -92,9 +92,10 @@
 {{/view}}
 
 {{/view}}
-<a class="btn" {{action back}}>Previous</a>
-<a class="btn btn-success" {{action next}}>Discover and Validate</a>
-
+<div class="btn-area">
+    <a class="btn" {{action back}}>Previous</a>
+    <a class="btn btn-success" {{action next}}>Discover and Validate</a>
+</div>
 
 
 

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step3.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step3.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step3.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step3.hbs Tue
Sep 11 16:27:36 2012
@@ -20,5 +20,7 @@
 <h2>{{App.messages.step3_header}} </h2>
 <a class="btn" {{action retry}}>Retry</a>
 <a class="btn" {{action remove}}>Remove</a> <br/>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
\ No newline at end of file
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step4.hbs Tue
Sep 11 16:27:36 2012
@@ -18,5 +18,7 @@
 
 
 <h2>{{App.messages.step4_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
\ No newline at end of file
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step5.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step5.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step5.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step5.hbs Tue
Sep 11 16:27:36 2012
@@ -18,5 +18,7 @@
 
 
 <h2>{{App.messages.step5_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
\ No newline at end of file
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step6.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step6.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step6.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step6.hbs Tue
Sep 11 16:27:36 2012
@@ -18,5 +18,7 @@
 
 
 <h2>{{App.messages.step6_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
\ No newline at end of file
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>
\ No newline at end of file

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=1383470&r1=1383469&r2=1383470&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 16:27:36 2012
@@ -35,7 +35,9 @@
         <div class="accordion-body collapse in">
             <div class="accordion-inner">
             {{#each view.categoryConfigs}}
-                <label>{{displayName}} ({{name}})</label> {{#view Ember.TextField}}{{/view}}
(default: {{defaultValue}})
+                <label>{{displayName}} - {{name}}</label>
+                <div class="input-append">{{#view Ember.TextField}}{{/view}}{{#if unit}}<span
class="add-on">{{unit}}</span>{{/if}}</div>
+                {{description}}
             {{/each}}
             </div>
         </div>
@@ -44,5 +46,7 @@
     {{/each}}
 </div>
 {{/each}}
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" style="float:right" {{action next}}>Next</a>
\ No newline at end of file
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" style="float:right" {{action next}}>Next</a>
+</div>
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs?rev=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step8.hbs Tue
Sep 11 16:27:36 2012
@@ -17,5 +17,7 @@
 -->
 
 <h2>{{App.messages.step8_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>

Modified: 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=1383470&r1=1383469&r2=1383470&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer/step9.hbs Tue
Sep 11 16:27:36 2012
@@ -17,5 +17,7 @@
 -->
 
 <h2>{{App.messages.step9_header}}</h2>
-<a class="btn" {{action back}}>Back</a>
-<a class="btn btn-success" {{action next}}>Next</a>
+<div class="btn-area">
+    <a class="btn" {{action back}}>Back</a>
+    <a class="btn btn-success" {{action next}}>Next</a>
+</div>
\ No newline at end of file



Mime
View raw message