You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2012/08/13 15:39:51 UTC
[PATCH core 2/2] Core: Fixed formatting for new loadbalancer UI
From: Michal Fojtik <mf...@redhat.com>
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/views/load_balancers/new.html.haml | 69 +++++++++++++++--------------
1 file changed, 35 insertions(+), 34 deletions(-)
diff --git a/server/views/load_balancers/new.html.haml b/server/views/load_balancers/new.html.haml
index 4685b69..1dffd61 100644
--- a/server/views/load_balancers/new.html.haml
+++ b/server/views/load_balancers/new.html.haml
@@ -1,38 +1,39 @@
-%h1 New Load Balancer
+=header "Create new load balancer"
-%form{ :action => load_balancers_url, :method => :post }
- %p
- %label
- Name:
- %input{ :name => 'name', :size => 30 }/
- -if @instances
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+ %form{ :action => load_balancers_url, :method => :post }
%p
%label
- Running instance:
- %select{ :name => 'instance_id'}
- - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
- %option{ :value => instance.id } #{instance.id}
- %p
- %label
- Realm:
- %select{ :name => 'realm_id'}
- - @realms.each do |realm|
- %option{ :value => realm.id } #{realm.id} - #{realm.name}
- %hr
- %p
- %label
- Protocol:
- %select{ :name => 'listener_protocol'}
- %option{ :value => 'HTTP'} HTTP
- %option{ :value => 'TCP'} TCP
- %p
- %label
- Load balancer port:
- %input{ :name => "listener_balancer_port", :size => 30}
- %p
- %label
- Instances port:
- %input{ :name => "listener_instance_port", :size => 30}
- %p
- %input{ :type => :submit, :name => "commit", :value => "create" }/
+ Name:
+ %input{ :name => 'name', :size => 30 }/
+ -if @instances
+ %p
+ %label
+ Running instance:
+ %select{ :name => 'instance_id'}
+ - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
+ %option{ :value => instance.id } #{instance.id}
+ %p
+ %label
+ Realm:
+ %select{ :name => 'realm_id'}
+ - @realms.each do |realm|
+ %option{ :value => realm.id } #{realm.id} - #{realm.name}
+ %hr
+ %p
+ %label
+ Protocol:
+ %select{ :name => 'listener_protocol'}
+ %option{ :value => 'HTTP'} HTTP
+ %option{ :value => 'TCP'} TCP
+ %p
+ %label
+ Load balancer port:
+ %input{ :name => "listener_balancer_port", :size => 30}
+ %p
+ %label
+ Instances port:
+ %input{ :name => "listener_instance_port", :size => 30}
+ %p
+ %input{ :type => :submit, :name => "commit", :value => "create" }/
--
1.7.10.2
Re: [PATCH core 2/2] Core: Fixed formatting for new loadbalancer UI
Posted by Michal Fojtik <mf...@redhat.com>.
On Aug 13, 2012, at 4:03 PM, Ronelle Landy <rl...@redhat.com> wrote:
> QE ACK Patch 1/2 and 2/2 ...
> "POST /api/load_balancers/webTrafficBalancer/register?instance_id=i-2d5ecd56 HTTP/1.1" 303 - 5.3362
> "GET /api/load_balancers/webTrafficBalancer HTTP/1.1" 200 4396 3.3018
> "POST /api/load_balancers/webTrafficBalancer/unregister?instance_id=i-2d5ecd56 HTTP/1.1" 303 - 3.6614
Thanks. Pushed.
>
>> From: mfojtik@redhat.com
>> To: dev@deltacloud.apache.org
>> Sent: Monday, August 13, 2012 9:39:51 AM
>> Subject: [PATCH core 2/2] Core: Fixed formatting for new loadbalancer UI
>>
>> From: Michal Fojtik <mf...@redhat.com>
>>
>>
>> Signed-off-by: Michal fojtik <mf...@redhat.com>
>> ---
>> server/views/load_balancers/new.html.haml | 69
>> +++++++++++++++--------------
>> 1 file changed, 35 insertions(+), 34 deletions(-)
>>
>> diff --git a/server/views/load_balancers/new.html.haml
>> b/server/views/load_balancers/new.html.haml
>> index 4685b69..1dffd61 100644
>> --- a/server/views/load_balancers/new.html.haml
>> +++ b/server/views/load_balancers/new.html.haml
>> @@ -1,38 +1,39 @@
>> -%h1 New Load Balancer
>> +=header "Create new load balancer"
>>
>> -%form{ :action => load_balancers_url, :method => :post }
>> - %p
>> - %label
>> - Name:
>> - %input{ :name => 'name', :size => 30 }/
>> - -if @instances
>> +%div{ :'data-role' => :content, :'data-theme' => 'c', :class =>
>> 'middle-dialog'}
>> + %form{ :action => load_balancers_url, :method => :post }
>> %p
>> %label
>> - Running instance:
>> - %select{ :name => 'instance_id'}
>> - - @instances.select{|i| i.state=="RUNNING"}.each do
>> |instance|
>> - %option{ :value => instance.id } #{instance.id}
>> - %p
>> - %label
>> - Realm:
>> - %select{ :name => 'realm_id'}
>> - - @realms.each do |realm|
>> - %option{ :value => realm.id } #{realm.id} - #{realm.name}
>> - %hr
>> - %p
>> - %label
>> - Protocol:
>> - %select{ :name => 'listener_protocol'}
>> - %option{ :value => 'HTTP'} HTTP
>> - %option{ :value => 'TCP'} TCP
>> - %p
>> - %label
>> - Load balancer port:
>> - %input{ :name => "listener_balancer_port", :size => 30}
>> - %p
>> - %label
>> - Instances port:
>> - %input{ :name => "listener_instance_port", :size => 30}
>> - %p
>> - %input{ :type => :submit, :name => "commit", :value => "create"
>> }/
>> + Name:
>> + %input{ :name => 'name', :size => 30 }/
>> + -if @instances
>> + %p
>> + %label
>> + Running instance:
>> + %select{ :name => 'instance_id'}
>> + - @instances.select{|i| i.state=="RUNNING"}.each do
>> |instance|
>> + %option{ :value => instance.id } #{instance.id}
>> + %p
>> + %label
>> + Realm:
>> + %select{ :name => 'realm_id'}
>> + - @realms.each do |realm|
>> + %option{ :value => realm.id } #{realm.id} - #{realm.name}
>> + %hr
>> + %p
>> + %label
>> + Protocol:
>> + %select{ :name => 'listener_protocol'}
>> + %option{ :value => 'HTTP'} HTTP
>> + %option{ :value => 'TCP'} TCP
>> + %p
>> + %label
>> + Load balancer port:
>> + %input{ :name => "listener_balancer_port", :size => 30}
>> + %p
>> + %label
>> + Instances port:
>> + %input{ :name => "listener_instance_port", :size => 30}
>> + %p
>> + %input{ :type => :submit, :name => "commit", :value =>
>> "create" }/
>>
>> --
>> 1.7.10.2
>>
>>
Michal Fojtik
http://deltacloud.org
mfojtik@redhat.com
Re: [PATCH core 2/2] Core: Fixed formatting for new loadbalancer UI
Posted by Ronelle Landy <rl...@redhat.com>.
QE ACK Patch 1/2 and 2/2 ...
"POST /api/load_balancers/webTrafficBalancer/register?instance_id=i-2d5ecd56 HTTP/1.1" 303 - 5.3362
"GET /api/load_balancers/webTrafficBalancer HTTP/1.1" 200 4396 3.3018
"POST /api/load_balancers/webTrafficBalancer/unregister?instance_id=i-2d5ecd56 HTTP/1.1" 303 - 3.6614
> From: mfojtik@redhat.com
> To: dev@deltacloud.apache.org
> Sent: Monday, August 13, 2012 9:39:51 AM
> Subject: [PATCH core 2/2] Core: Fixed formatting for new loadbalancer UI
>
> From: Michal Fojtik <mf...@redhat.com>
>
>
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
> server/views/load_balancers/new.html.haml | 69
> +++++++++++++++--------------
> 1 file changed, 35 insertions(+), 34 deletions(-)
>
> diff --git a/server/views/load_balancers/new.html.haml
> b/server/views/load_balancers/new.html.haml
> index 4685b69..1dffd61 100644
> --- a/server/views/load_balancers/new.html.haml
> +++ b/server/views/load_balancers/new.html.haml
> @@ -1,38 +1,39 @@
> -%h1 New Load Balancer
> +=header "Create new load balancer"
>
> -%form{ :action => load_balancers_url, :method => :post }
> - %p
> - %label
> - Name:
> - %input{ :name => 'name', :size => 30 }/
> - -if @instances
> +%div{ :'data-role' => :content, :'data-theme' => 'c', :class =>
> 'middle-dialog'}
> + %form{ :action => load_balancers_url, :method => :post }
> %p
> %label
> - Running instance:
> - %select{ :name => 'instance_id'}
> - - @instances.select{|i| i.state=="RUNNING"}.each do
> |instance|
> - %option{ :value => instance.id } #{instance.id}
> - %p
> - %label
> - Realm:
> - %select{ :name => 'realm_id'}
> - - @realms.each do |realm|
> - %option{ :value => realm.id } #{realm.id} - #{realm.name}
> - %hr
> - %p
> - %label
> - Protocol:
> - %select{ :name => 'listener_protocol'}
> - %option{ :value => 'HTTP'} HTTP
> - %option{ :value => 'TCP'} TCP
> - %p
> - %label
> - Load balancer port:
> - %input{ :name => "listener_balancer_port", :size => 30}
> - %p
> - %label
> - Instances port:
> - %input{ :name => "listener_instance_port", :size => 30}
> - %p
> - %input{ :type => :submit, :name => "commit", :value => "create"
> }/
> + Name:
> + %input{ :name => 'name', :size => 30 }/
> + -if @instances
> + %p
> + %label
> + Running instance:
> + %select{ :name => 'instance_id'}
> + - @instances.select{|i| i.state=="RUNNING"}.each do
> |instance|
> + %option{ :value => instance.id } #{instance.id}
> + %p
> + %label
> + Realm:
> + %select{ :name => 'realm_id'}
> + - @realms.each do |realm|
> + %option{ :value => realm.id } #{realm.id} - #{realm.name}
> + %hr
> + %p
> + %label
> + Protocol:
> + %select{ :name => 'listener_protocol'}
> + %option{ :value => 'HTTP'} HTTP
> + %option{ :value => 'TCP'} TCP
> + %p
> + %label
> + Load balancer port:
> + %input{ :name => "listener_balancer_port", :size => 30}
> + %p
> + %label
> + Instances port:
> + %input{ :name => "listener_instance_port", :size => 30}
> + %p
> + %input{ :type => :submit, :name => "commit", :value =>
> "create" }/
>
> --
> 1.7.10.2
>
>