deltacloud-core 0.3.0 → 0.4.0

data/views/instances/show.html.haml

@@ -1,57 +1,55 @@
-%h1
-  = @instance.id
+=header "Instance"
+=subheader @instance.id
 
-%dl
-  %di
-    %dt Image
-    %dd
-      = link_to @instance.image_id, image_url( @instance.image_id )
-  %di
-    %dt Owner
-    %dd
-      = @instance.owner_id
-  %di
-    %dt Name
-    %dd
-      = @instance.name
-  %di
-    %dt Hardware Profile
-    %dd
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Name
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.name
+    %li{ :'data-role' => 'list-divider'} Owner
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.owner_id
+    %li{ :'data-role' => 'list-divider'} State
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.state
+    %li{ :'data-role' => 'list-divider'} Image
+    %li
+      %a{ :href => image_url(@instance.image_id), :'data-ajax' => 'false' }=@instance.image_id
+    %li{ :'data-role' => 'list-divider'} Hardware Profile
+    %li
       - prof = @instance.instance_profile
-      = link_to(prof.name, hardware_profile_url(prof.name))
-      = format_instance_profile(prof)
-  %di
-    %dt Realm
-    %dd
-      = @instance.realm_id ? link_to(@instance.realm_id, realm_url(@instance.realm_id)) : 'default'
-  %di
-    %dt State
-    %dd
-      = @instance.state
-  %di
-    %dt Public Addresses
-    %dd
-      = @instance.public_addresses.collect { |address| "<div>#{address}</div>" }.join
-  %di
-    %dt Private Addresses
-    %dd
-      = @instance.private_addresses.collect { |address| "<div>#{address}</div>" }.join
-  - if @instance.password
-    %di
-      %dt Username
-      %dd
-        = @instance.username
-    %di
-      %dt Password
-      %dd
-        = @instance.password
-  %di
-    %dt
-    %dd
-      -@instance.actions.each do |action|
-        =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
-    %dt
-    %dd
-      - if @instance.can_create_image?
-        =link_to_action 'Create Image', url_for("/api/images/new?instance_id=#{@instance.id}"), :get
-
+      %a{ :href => hardware_profile_url(prof.name), :'data-ajax' => 'false'}
+        =[prof.name, format_instance_profile(prof)].join(', ')
+    %li{ :'data-role' => 'list-divider'} Realm
+    %li
+      - if @instance.realm_id
+        %a{ :href => realm_url(@instance.realm_id), :'data-ajax' => 'false' }=@instance.realm_id
+      - else
+        default
+    %li{ :'data-role' => 'list-divider'} Public addresses
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.public_addresses.map.join(',')
+    %li{ :'data-role' => 'list-divider'} Private addresses
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.private_addresses.map.join(',')
+    - if @instance.password or @instance.keyname
+      %li{ :'data-role' => 'list-divider'} Authentication
+    - if @instance.password
+      %li{ :'data-role' => 'list-divider'} Username
+      %li=@instance.username
+      %li{ :'data-role' => 'list-divider'} Password
+      %li=@instance.password
+    - if @instance.keyname
+      %li{ :'data-role' => 'list-divider'} SSH key name
+      %li
+        %a{ :href => key_url(@instance.keyname), :'data-ajax' => 'false'}=@instance.keyname
+    - if @instance.firewalls
+      %li{ :'data-role' => 'list-divider'} Firewalls
+      %li=@instance.firewalls.join(", ")
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        - @instance.actions.each do |action|
+          =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
+        - if @instance.can_create_image?
+          =link_to_action 'Create Image', api_url_for("images/new?instance_id=#{@instance.id}"), :get

data/views/instances/show.xml.haml

@@ -1,4 +1,5 @@
-!!! XML
+- unless defined?(partial)
+  !!! XML
 %instance{:href => instance_url(@instance.id), :id => @instance.id}
   - if @instance.name
     %name<
@@ -32,26 +33,27 @@
     %public_addresses<
       - @instance.public_addresses.each do |address|
         - if address.class.eql?(Hash) and address[:address]!=""
-          %address{ :port => address[:port], :type => address[:type], :mac => address[:mac] }<
-            =address[:address]
+          =format_address(address[:address], :port => address[:port], :type => address[:type], :mac => address[:mac])
         - elsif address.class.eql?(String)
-          %address<
-            =address
+          =format_address(address)
   - if @instance.private_addresses
     %private_addresses<
       - @instance.private_addresses.each do |address|
-        %address<
-          =address
+        =format_address(address)
+  - if @instance.firewalls
+    %firewalls<
+      - @instance.firewalls.each do |firewall|
+        %firewall{:href => firewall_url(firewall), :id => firewall }
   - if driver_has_auth_features?
     %authentication{ :type => driver_auth_feature_name }
       - if @instance.authn_feature_failed?
         %error  #{@instance.authn_error}
       - else
-        - if driver_auth_feature_name == 'password'
+        - if @instance.password
           %login
             %username #{@instance.username}
-            %password #{@instance.password}
-        - if driver_auth_feature_name == 'key'
+            %password=cdata(@instance.password)
+        - if @instance.keyname
           %login
             %keyname #{@instance.keyname}
 

data/views/keys/index.html.haml

@@ -1,26 +1,15 @@
-%h1 Keys
+=header "Keys" do
+  %a{ :href => api_url_for('keys/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new key
 
-%table.display
-  %thead
-    %tr
-      %th ID
-      %th Credentials details
-      %th Actions
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     - @elements.each do |key|
-      %tr
-        %td
-          = link_to key.id, key_url( key.id )
-        %td
-          - if key.credential_type.eql?(:key)
-            = key.fingerprint
-          - if key.credential_type.eql?(:password)
-            = "#{key.username} - #{key.password}"
-        %td
-          - if driver.respond_to?(:destroy_key)
-            =link_to_action 'Destroy', destroy_key_url(key.id), :delete
-  %tfoot
-    - if driver.respond_to?(:create_key)
-      %tr
-        %td{:colspan => 3, :style => "text-align:right;"}
-          =link_to 'Create »', "#{url_for('/api/keys/new')}", :class => 'button'
+      %li
+        %a{ :href => key_url(key.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/key.png'}
+          %h3=key.id
+          %p
+            - if key.credential_type.eql?(:key)
+              = key.fingerprint
+            - if key.credential_type.eql?(:password)
+              = "#{key.username} - #{key.password}"

data/views/keys/new.html.haml

@@ -1,8 +1,8 @@
-%h1 New key
+=header "Create new SSH key"
 
-%form{ :action => '/api/keys', :method => :post }
-  %p
-    %label
-      Name:
-    %input{ :name => 'name', :size => 30 }/
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => keys_url, :method => :post}
+    %div{ 'data-role' => :fieldcontain }
+      %label{ :for => :name} Key name:
+      %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+    %button{ :type => :submit} Create key

data/views/keys/show.html.haml

@@ -1,22 +1,27 @@
-%h1
-  = @key.id
+=header "Key"
+=subheader @key.id
 
-%dl
-  - if @key.is_key?
-    %di
-      %dt Fingerprint
-      %dd
-        = @key.fingerprint
-      - if @key.pem_rsa_key
-        %dt PEM key
-        %dd
-          %pre
-            = @key.pem_rsa_key
-  - if @key.is_password?
-    %di
-      %dt Username
-      %dd
-        = @key.username
-      %dt Password
-      %dd
-        = @key.password
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Identifier
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@key.id
+    - if @key.is_password?
+      %li{ :'data-role' => 'list-divider'} Username
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=@key.username
+      %li{ :'data-role' => 'list-divider'} Password
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=@key.password
+    - else
+      %li{ :'data-role' => 'list-divider'} Fingerprint
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=@key.fingerprint
+      %li{ :'data-role' => 'list-divider'} PEM key
+      %li
+        %p{ :'data-role' => 'fieldcontain'}
+          %pre=@key.pem_rsa_key
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        =link_to_action "Destroy", destroy_key_url(@key.id), :delete

data/views/layout.html.haml

@@ -1,31 +1,32 @@
-!!!
-!!! XML
-
+!!!5
 %html
   %head
-    = stylesheet_link_tag '/stylesheets/compiled/screen.css', :media => 'screen, projection'
-    = stylesheet_link_tag '/stylesheets/compiled/print.css', :media => 'print'
-    /[if lt IE 8]
-      = stylesheet_link_tag '/stylesheets/compiled/ie.css', :media => 'screen, projection'
-    = stylesheet_link_tag '/stylesheets/compiled/application.css', :media => 'screen, projection'
-    %script{:type => "text/javascript", :src => "/javascripts/jquery-1.4.2.min.js" }
+    %title Deltacloud API #{settings.version}
+    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0b1.min.css'
+    = stylesheet_link_tag '/stylesheets/new.css'
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.min.js" }
     %script{:type => "text/javascript", :src => "/javascripts/application.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0b1.min.js" }
+    :javascript
+      $(document).ready(function() {
+        $(document).bind("mobileinit", function(){
+          $.mobile.ajaxEnabled = false;
+          $.mobile.hashListeningEnabled = false;
+        });
+      })
+
   %body
-    #wrapper
-      #header
-        = link_to image_tag( "/images/logo-wide.png" ), root_url
-      = bread_crumb
-      #content
-        = yield
-      #footer
-        #formats
-          Format:
-          =link_to_format(:xml)
-          |
-          =link_to_format(:json)
-        #driver_info
-          Driver: #{driver_symbol} | API version: #{settings.version}
-        #copyright
-          Copyright 2009-2011
-          %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
-          and individual contributors.
+    %div{ 'data-role' => :page }
+      = yield
+      %div{ 'data-role' => :footer, :'data-theme' => 'a'}
+        %div{ 'data-role' => :navbar}
+          %ul
+            %li
+              %a{ :'data-icon' => 'home', :href => api_url_for(''), :'data-ajax' => 'false'} Home
+            %li=link_to_format(:xml)
+            %li=link_to_format(:json)
+        %div{ 'data-role' => :header, 'data-theme' => 'a' }
+          #copyright
+            Copyright 2009-2011
+            %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
+            and individual contributors.

data/views/load_balancers/index.html.haml

@@ -1,33 +1,13 @@
-%h1 Load Balancers
+=header "Load balancers" do
+  %a{ :href => api_url_for('load_balancers/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new load balancer
+=subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
-%table.display
-  %thead
-    %tr
-      %th ID
-      %th Hostname
-      %th Realm
-      %th Balancer port
-      %th Instances port
-      %th Actions
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     - @elements.each do |balancer|
-      %tr
-        %td
-          = link_to balancer.id, load_balancer_url( balancer.id )
-        %td
-          = balancer.public_addresses.first
-        %td
-          =link_to balancer.realms.first.id, realm_url( balancer.realms.first.id )
-        %td
-          - balancer.listeners.each do |listener|
-            ="#{listener.protocol}[#{listener.load_balancer_port}]<br/>"
-        %td
-          - balancer.listeners.each do |listener|
-            ="#{listener.protocol}[#{listener.load_balancer_port}]<br/>"
-        %td
-          =link_to_action 'Destroy', destroy_load_balancer_url(balancer.id), :delete
-  %tfoot
-    %tr
-      %td{:colspan => 6, :style => "text-align:right;"}
-        =link_to 'Create &raquo;', "#{url_for('/api/load_balancers/new')}", :class => 'button'
-
+      %li
+        %a{ :href => load_balancer_url(balancer.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/balancer.png'}
+          %h3=balancer.id
+          %p=balancer.public_addresses.join(', ')
+          %span{ :class => 'ui-li-count'}=balancer.realms.first.id

data/views/load_balancers/index.xml.haml

@@ -1,4 +1,3 @@
-
 !!!XML
 %load_balancers
   - @elements.each do |c|

data/views/load_balancers/new.html.haml

@@ -1,6 +1,6 @@
 %h1 New Load Balancer
 
-%form{ :action => '/api/load_balancers', :method => :post }
+%form{ :action => load_balancers_url, :method => :post }
   %p
     %label
       Name:

data/views/load_balancers/show.html.haml

@@ -1,37 +1,36 @@
-%h1
-  = @load_balancer.id
+=header "Loadbalancer"
+=subheader @load_balancer.id
 
-%dl
-  %di
-    %dt Public addresses
-    %dd
-      = @load_balancer.public_addresses.join(',')
-    - if @load_balancer.created_at
-      %dt Created at
-      %dd
-        = @load_balancer.created_at
-    %dt Realms
-    %dd
-      = @load_balancer.realms.collect { |r| "#{r.id} - #{r.name}" }.join(',')
-    %dt Listeners
-    %dd
-      - @load_balancer.listeners.each do |listener|
-        ="Load balancer port: #{listener.load_balancer_port}"
-        %br
-        ="Instance port: #{listener.instance_port}"
-        %br
-    - if @load_balancer.instances.class.eql?(Array)
-      %dt Instances
-      - @load_balancer.instances.each do |inst|
-        %dd
-          =inst.id
-          =link_to_action 'Delete', unregister_load_balancer_url(@load_balancer.id, :instance_id => inst.id), :post
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Created at
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@load_balancer.created_at
+    %li{ :'data-role' => 'list-divider'} Public addresses
+    - @load_balancer.public_addresses.each do |address|
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=address
+    %li{ :'data-role' => 'list-divider'} Realms
+    - @load_balancer.realms.each do |realm|
+      %li
+        %a{ :href => realm_url(realm.id), :'data-ajax' => 'false'}
+          %h3=realm.name
+    %li{ :'data-role' => 'list-divider'} Instances
+    - @load_balancer.instances.each do |instance|
+      %li
+        %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
+          %h3=instance.name
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      =link_to_action "Destroy", destroy_load_balancer_url(@load_balancer.id), :delete
 
-%form{:action => url_for("/api/load_balancers/#{@load_balancer.id}/register"), :method => :post}
-  %p
-    %strong Add instances to load balancer
-  %p
-    %label Instance
-    %select{:name => :instance_id, :id => "list_instances"}
-    %input{:type => :submit, :value => "Assign"}
+  =header "Listeners", :back => 'false'
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    - @load_balancer.listeners.each do |listener|
+      %li{ :'data-role' => 'list-divider'} Load balancer port
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=listener.load_balancer_port
+      %li{ :'data-role' => 'list-divider'} Instance port
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=listener.instance_port