deltacloud-core 0.3.0 → 0.4.0

data/views/hardware_profiles/show.html.haml

@@ -1,19 +1,23 @@
-%h1
-  = @profile.name
+=header "Hardware profiles"
+=subheader @profile.name
 
-%dl
-  %di
-    %dt
-      Architecture
-    %dd
-      = format_hardware_property @profile.architecture
-  %di
-    %dt
-      Memory
-    %dd
-      = format_hardware_property @profile.memory
-  %di
-    %dt
-      Storage
-    %dd
-      = format_hardware_property @profile.storage
+%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'}=@profile.name
+    - @profile.each_property do |p|
+      %li{ :'data-role' => 'list-divider'} #{p.name.to_s.titlecase}
+      %li
+        %p{ :'data-role' => 'fieldcontain'}
+          - if p.kind == :fixed
+            =p.value
+            =p.unit if not ['label', 'count'].include? p.unit
+          -elsif p.kind == :range
+            Minimum: #{p.first}
+            =p.unit if not ['label', 'count'].include? p.unit
+            Maximum: #{p.last}
+            =p.unit if not ['label', 'count'].include? p.unit
+          -elsif p.kind == :enum
+            =p.values.join(" #{p.unit} or ")
+            =p.unit

data/views/images/index.html.haml

@@ -1,25 +1,13 @@
-%h1 Images
+=header "Images"
+=subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
-%table.display
-  %thead
-    %tr
-      %th
-        ID
-      %th
-        Name
-      %th
-        Owner
-      %th
-        Description
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
+    %li{ :'data-role' => 'list-divider'}=driver_symbol
     - @images.each do |image|
-      %tr
-        %td
-          = link_to image.id, image_url(image.id)
-        %td
-          = image.name
-        %td
-          = link_to image.owner_id, images_url
-        %td
-          = image.description
-
+      %li
+        %a{ :href => image_url(image.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/image.png'}
+          %h3= image.name
+          %p=[image.description, image.owner_id, image.architecture].join(', ')
+          %span{ :class => 'ui-li-count'}=image.state

data/views/images/index.xml.haml

@@ -1,14 +1,5 @@
-!!! XML
+- unless defined?(partial)
+  !!! XML
 %images
-  - @elements.each do |image|
-    %image{:href => image_url(image.id), :id => image.id}
-      - image.attributes.select{ |attr| attr!=:id }.each do |attribute|
-        - haml_tag("#{attribute}".tr('-', '_'), :<) do
-          - if [:name, :description].include?(attribute)
-            =cdata do
-              - haml_concat image.send(attribute)
-          - else
-            - haml_concat image.send(attribute)
-      %actions
-        %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{image.id}"}
-
+  - @elements.each do |c|
+    = haml :'images/show', :locals => { :@image => c, :partial => true }

data/views/images/new.html.haml

@@ -1,14 +1,13 @@
-%h1 Create image from #{@instance.id}
+=header "Create new image"
+=subheader "#{@instance.id}"
 
-%form{ :action => images_url, :method => :post, :class => :new_instance }
-  %input{ :name => :instance_id, :type => :hidden, :value => @instance.id }/
-  %p
-    %label
-      Name:
-    %input{ :name => :name, :size => 30, :type => :text }/
-  %p
-    %label
-      Description:
-    %textarea{ :name => :description, :cols => 70, :rows => 20}
-  %p
-    %input{ :type => :submit, :value => 'Create' }
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => images_url, :method => :post}
+    %input{ :type => :hidden, :name => :instance_id, :value => @instance.id}
+    %div{ 'data-role' => :fieldcontain }
+      %label{ :for => :name} Name:
+      %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+    %div{ 'data-role' => :fieldcontain }
+      %label{ :for => :description} Description:
+      %input{ :type => :text, :id => :description, :name => :description, :value => '' }
+    %button{ :type => :submit} Create

data/views/images/show.html.haml

@@ -1,21 +1,27 @@
-%h1 Image
-%h2
-  = @image.id
+=header "Image"
+=subheader @image.id
 
-%dl
-  %di
-    %dt Name
-    %dd
-      = @image.name
-    %dt Owner
-    %dd
-      = link_to @image.owner_id, image_url( :owner_id => @image.owner_id )
-    %dt Architecture
-    %dd
-      = @image.architecture
-    %dt Description
-    %dd
-      = @image.description
-    %dt
-    %dd
-      = link_to 'Launch', "/api/instances/new?image_id=#{@image.id}"
+%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'}=@image.name
+    %li{ :'data-role' => 'list-divider'} Description
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@image.description
+    %li{ :'data-role' => 'list-divider'} Owner
+    %li
+      %p{ :'data-role' => 'fieldcontain'}
+        %a{ :href => images_url + "?owner_id=#{@image.owner_id}"}
+          =@image.owner_id
+    %li{ :'data-role' => 'list-divider'} State
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@image.state
+    %li{ :'data-role' => 'list-divider'} Architecture
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@image.architecture
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        %a{ :href => api_url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch
+        = link_to_action 'Destroy', destroy_image_url(@image.id), :delete

data/views/images/show.xml.haml

@@ -1,4 +1,5 @@
-!!! XML
+- unless defined?(partial)
+  !!! XML
 %image{:href => image_url(@image.id), :id => @image.id}
   - @image.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - haml_tag(attribute, :<) do

data/views/instance_states/show.html.haml

@@ -1,31 +1,27 @@
-%h1 Instance States
+=header "Instance state transitions"
+=subheader "#{driver_symbol}@#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
-%div#state_graph
-  = image_tag url_for( '/api/instance_states?format=png' )
+%div{ :'data-role' => :content, :'data-theme' => 'd', :class => 'middle-dialog'}
+  = image_tag api_url_for('instance_states?format=png')
 
-%table.states
-  %thead
-    %tr
-      %th Origin
-      %th Action
-      %th Destination
-  %tbody
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-theme' => 'a'}
     - @machine.states.each do |state|
-      %tr
-        %td.origin{:rowspan => "#{state.transitions.empty? ? 2 : (state.transitions.size + 1)}"}
-          = state
+      %li{ :'data-role' => 'list-divider', :'class' => 'ui-bar-a', :'data-theme' => 'a'}=state
       - if state.transitions.empty?
-        %tr
-          %td --
-          %td --
+        %li{ :'data-role' => 'list-divider'} Action
+        %li
+          %p{ :'data-role' => 'fieldcontain'}="---"
+        %li{ :'data-role' => 'list-divider'} Destination
+        %li
+          %p{ :'data-role' => 'fieldcontain'}="---"
       - else
+        %li{ :'data-role' => 'list-divider'} Action
         - state.transitions.each do |transition|
-          %tr
-            %td
-              - if transition.automatically?
-                %em auto
-              - else
-                = transition.action
-            %td
-              = transition.destination
-
+          %li
+            - if transition.automatically?
+              %p{ :'data-role' => 'fieldcontain'} auto
+            - else
+              %p{ :'data-role' => 'fieldcontain'}=transition.action
+          %li{ :'data-role' => 'list-divider'} Destination
+          %li
+            %p{ :'data-role' => 'fieldcontain'}=transition.destination

data/views/instances/index.html.haml

@@ -1,32 +1,15 @@
-%h1 Instances
+=header "Instances"
+=subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
-%table.display
-  %thead
-    %tr
-      %th ID
-      %th Owner
-      %th Name
-      %th Image
-      %th Profile
-      %th State
-      %th Actions
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
+    %li{ :'data-role' => 'list-divider'}=driver_symbol
     - @instances.each do |instance|
-      %tr
-        %td
-          = link_to truncate_words(instance.id), instance_url( instance.id )
-        %td
-          = link_to instance.owner_id, "#{instances_url}?owner_id=#{instance.owner_id}"
-        %td
-          = instance.name
-        %td
-          = link_to truncate_words(instance.image_id), image_url( instance.image_id )
-        %td
-          = instance.hardware_profile ? link_to(instance.hardware_profile, hardware_profile_url( instance.instance_profile.id )) : 'default'
-        %td
-          = image_for_state(instance.state)
-        %td
-          -instance.actions.each do |action|
-            =link_to_action action, self.send(:"#{action}_instance_url", instance.id), instance_action_method(action)
-          - if driver.respond_to?(:run_on_instance) and instance.state=="RUNNING"
-            =link_to_action "Run command", url_for("/api/instances/#{instance.id}/run"), :get
+      %li
+        %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/machine.png'}
+          %h3=truncate_words(instance.id)
+          %p
+            %strong=instance.name
+          %p=[instance.owner_id, instance.image_id, instance.hardware_profile].join(', ')
+          %span{ :class => 'ui-li-count'}=instance.state

data/views/instances/index.xml.haml

@@ -1,25 +1,4 @@
 !!! XML
 %instances
-  - @elements.each do |instance|
-    %instance{:href => instance_url(instance.id), :id => instance.id}
-      %name #{instance.name}
-      %owner_id #{instance.owner_id}
-      %image{:href => image_url(instance.image_id), :id => instance.image_id }
-      %realm{:href => realm_url(instance.realm_id), :id => instance.realm_id }
-      %state #{instance.state}
-      - haml_tag :"hardware_profile", { :id => instance.instance_profile.id, :href => hardware_profile_url(instance.instance_profile.id)} do
-        - instance.instance_profile.overrides.each do |p, v|
-          %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
-      %actions
-        - instance.actions.compact.each do |action|
-          %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id), :method => instance_action_method(action)}
-        - if driver.respond_to?(:run_on_instance)
-          %link{:rel => 'run', :method => :post, :href => run_instance_url(instance.id)}
-        - if instance.can_create_image?
-          %link{:rel => 'create_image', :method => :post, :href => "#{create_image_url};instance_id=#{instance.id}"}
-      %public_addresses
-        - instance.public_addresses.each do |address|
-          %address  #{address}
-      %private_addresses
-        - instance.private_addresses.each do |address|
-          %address  #{address}
+  - @elements.each do |c|
+    = haml :'instances/show', :locals => { :@instance => c, :partial => true }

data/views/instances/new.html.haml

@@ -1,92 +1,87 @@
-%h1 Launch new Instance
+=header "Launch new instance"
+=subheader @image.description
 
-%h3{:class => "description"}= @image.description
-%h2= @image.id
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => instances_url, :method => :post, :class => :new_instance }
+    %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
 
-%form{ :action => instances_url, :method => :post, :class => :new_instance }
-  %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
-  %p
-    %label
-      Name:
-    %input{ :name => 'name', :size => 30, :type => :text }/
-  -if driver_has_feature?(:instance_count)
-    %p
-      %label
-        Number of instances:
-      %input{ :type => :text, :value => "1", :name => :instance_count }
-  -if driver_has_feature?(:sandboxing)
-    %p
-      %label
-        Sandbox?:
-      %input{ :type => :checkbox, :value => "1", :name => :sandbox }
-  -if driver_has_feature?(:register_to_load_balancer)
-    %p
-      %label
-        Load balancer to assign:
-      %select{:name => 'load_balancer_id'}
-        %option
-        - @load_balancers.each do |load_balancer|
-          %option{:value => load_balancer.id} #{load_balancer.id}
-  -if driver_has_feature?(:authentication_key)
-    %p
-      %label
-        Instance Keyname:
-      %select{:name => 'keyname'}
-        %option
-        - @keys.each do |key|
-          %option{ :value => key.id } #{key.id}
-  - if !@hardware_profiles.empty?
-    %h3 What size machine?
-    - for hwp in @hardware_profiles
-      .radio-group
-        %label{ :for => "hwp_id_#{hwp.name}" }
-          %input{ :type => :radio, :name => 'hwp_id', :value => hwp.name }/
-          = hwp.name
+    %div{ 'data-role' => :fieldcontain }
+      %label{ :for => :name} Instance name:
+      %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+
+    %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+      %h3 Additional parameters
+
+      - if driver_has_feature?(:user_data)
+        %div{ 'data-role' => :fieldcontain }
+          %label{ :for => :user_data} Base64 encoded user-data:
+          %textarea{ :id => :user_data, :name => :user_data, :value => '' }
           %br/
-          %span.radio-group-details
-            - first = true
-            - hwp.properties.select { |prop| prop.fixed? }.each do |prop|
-              - unless first
-                ,
-              - first = false
-              = format_hardware_property prop
-          - hwp.properties.reject { |prop| prop.fixed? }.each do |prop|
-            %span.radio-group-details
-              %label{ :for => "#{prop.param}_#{hwp.name}" }
-                = prop.name
-              - if prop.kind == :enum
-                %select{ :size => 1, :name => prop.param }
-                  - for v in prop.values
-                    %option= v
-                = prop.unit
+          %a{ :href => "", :onclick => 'encodeb64();', :'data-ajax' => 'false'} Encode data
+
+      - if driver_has_feature?(:instance_count)
+        %div{ 'data-role' => :fieldcontain }
+          %label{ :for => :instance_count} # of instances to be launched:
+          %input{ :type => :text, :id => :instance_count, :name => :instance_count, :value => '1' }
+
+      - if driver_has_feature?(:authentication_key)
+        %div{ 'data-role' => :fieldcontain }
+          %label{ :for => :keyname, :class => 'ui-input-text'} Instance SSH key:
+          %select{:name => 'keyname', :'data-native-menu' => "true" }
+            %option{ :value => ''} None
+            - @keys.each do |key|
+              %option{ :value => key.id } #{key.id}
+
+      - if driver_has_feature?(:register_to_load_balancer)
+        %div{ 'data-role' => :fieldcontain }
+          %label{ :for => :load_balancer_id, :class => 'ui-input-text'} Register to loadbalancer:
+          %select{:name => 'load_balancer_id', :'data-native-menu' => "true" }
+            %option{ :value => ''} None
+            - @load_balancers.each do |load_balancer|
+              %option{:value => load_balancer.id} #{load_balancer.id}
+
+      - if driver_has_feature?(:firewalls)
+        %div{ 'data-role' => :fieldcontain }
+          %fieldset{ :'data-role' => 'controlgroup'}
+            %legend Register to firewall:
+            - @firewalls.each_index do |i|
+              - if @firewalls[i].name == 'default'
+                %input{:type => :checkbox, :value => @firewalls[i].name, :name => "firewalls#{i}", :checked => :true, :id => "firewalls#{i}"}/
+                %label{:for => "firewalls#{i}"} Default
               - else
-                %input{ :name => prop.param, :size => 10, :value => "#{prop.default}" }
-                = prop.unit
-                (value must be between #{prop.first} #{prop.unit} and #{prop.last} #{prop.unit})
-  - if !@realms.empty?
-    %h3 Where do you want it?
-    - for realm in @realms
-      .radio-group
-        %label{ :for => "realm_id_#{realm.id}" }
-          %input{ :type => :radio, :name => 'realm_id', :value => realm.id }/
-          = realm.id
-          %br/
-          %span.radio-group-details
-            = "#{realm.name}, #{realm.limit}"
-  - if driver_has_feature?(:user_files, :instances)
-    %h2 User-supplied files
-    %table
-      %thead
-        %tr
-          %th
-          %th Path
-          %th Content (must be base64 encoded)
-      %tbody
-        - 1.upto(5) do |i|
-          %tr
-            %td #{i.ordinalize} File:
-            %td
-              %input{ :name => "path#{i}", :size => 20 }
-            %td
-              %input{ :name => "content#{i}", :size => 50 }
-  %input{ :type => :submit, :name => "commit", :value => "create" }/
+                %input{:type => :checkbox, :value => @firewalls[i].name, :name => "firewalls#{i}", :id => "firewalls#{i}"}/
+                %label{:for => "firewalls#{i}"}=@firewalls[i].name
+
+    - if !@hardware_profiles.empty?
+      %div{ 'data-role' => :fieldcontain }
+        %h3 Instance profile
+        %fieldset{ :'data-role' => :fieldcontain}
+          - @hardware_profiles.each do |profile|
+            %input{ :type => :radio, :name => 'hwp_id', :value => profile.name, :id => profile.name, :'data-theme' => 'b'}/
+            %label{ :for => profile.name}=profile.name
+            - profile.properties.reject { |prop| prop.fixed? }.each do |prop|
+              %div{ :'data-role' => :fieldcontain}
+                %label{ :for => "#{prop.param}_#{profile.name}" }=prop.name
+                %span.radio-group-details
+                  - if prop.kind == :enum
+                    %select{ :size => 1, :name => prop.param }
+                      - for v in prop.values
+                        %option= v
+                    = prop.unit
+                  - elsif prop.kind == :range
+                    %input{ :type => :range, :value => prop.first, :min => prop.first, :max => prop.last, :name => prop.param}
+                  - else
+                    %input{ :name => prop.param, :size => 10, :value => "#{prop.default}" }
+                    = prop.unit
+
+    - if !@realms.empty?
+      %div{ 'data-role' => :fieldcontain }
+        %h3 Where do you want it?
+        %fieldset{ :'data-role' => :fieldcontain}
+          %legend
+          - @realms.each do |realm|
+            %div{ :'data-role' => :fieldcontain}
+              %label{ :for => realm.id }= "#{realm.name}, #{realm.limit}"
+              %input{ :type => :radio, :name => 'realm_id', :value => realm.id, :id => realm.id, :'data-theme' => 'b' }/
+
+    %button{ :type => :submit} Create instance