diff options
| -rw-r--r-- | everestd/lib/everestd.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/everestd/lib/everestd.rb b/everestd/lib/everestd.rb index 2d087bd..45e1b99 100644 --- a/everestd/lib/everestd.rb +++ b/everestd/lib/everestd.rb @@ -27,6 +27,8 @@ require 'everest-dsl' require 'restr' require 'xmlrpc/client' +CONTEXT="/everest" + Camping.goes :Everestd Everestd.picnic! @@ -120,7 +122,7 @@ module Everestd::Controllers def create @machine_type = input.machine_type - redirect R(Nodes) + redirect CONTEXT + R(Nodes) end end end @@ -144,8 +146,8 @@ module Everestd::Views end div.content! do h1 do - [a("Machine Types", :href => R(Everestd::Controllers::MachineTypes)), - a("Nodes", :href => R(Everestd::Controllers::Nodes))].join " | " + [a("Machine Types", :href => CONTEXT + R(Everestd::Controllers::MachineTypes)), + a("Nodes", :href => CONTEXT + R(Everestd::Controllers::Nodes))].join " | " end self << yield end @@ -154,7 +156,7 @@ module Everestd::Views end def add - form(:method => 'post', :action => R(Everestd::Controllers::Nodes)) do + form(:method => 'post', :action => CONTEXT + R(Everestd::Controllers::Nodes)) do h2 "YAML" textarea :name => 'yaml', :rows => '25', :cols => '100'; br @@ -169,7 +171,7 @@ module Everestd::Views h1 @machine.name p @machine.desc - form(:method => 'post', :action => R(Everestd::Controllers::Nodes)) do + form(:method => 'post', :action => CONTEXT + R(Everestd::Controllers::Nodes)) do h2 "Fully qualified domain name" input :name => "fqdn", :type => 'text', :size => 45, :value => "[prefix]-#{@machine.name}.usersys.redhat.com" @@ -201,7 +203,7 @@ module Everestd::Views p "This form allows you to submit the YAML to be used by the Puppetmaster to " + "determine the configuration to be compiled for a particular host." - form(:method => 'post', :action => R(Everestd::Controllers::Nodes)) do + form(:method => 'post', :action => CONTEXT + R(Everestd::Controllers::Nodes)) do textarea ::YAML.dump(@info), :name => 'yaml', :rows => '25', :cols => '100'; br @@ -213,13 +215,13 @@ module Everestd::Views def list_nodes h1 "Nodes:" p "To create a new node just browse to the page corresponding to the hostname. " + - "eg, #{R(Everestd::Controllers::Nodes, "[hostname]")}." + "eg, #{CONTEXT + R(Everestd::Controllers::Nodes, "[hostname]")}." p do ol do @nodes.each do |n| # BUG: default format is not getting preserved @format = :HTML - li {a(n, :href => R(Everestd::Controllers::Nodes, n))} + li {a(n, :href => CONTEXT + R(Everestd::Controllers::Nodes, n))} end end end |