[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 24cfab3a916606aef28308d041cc043ac452d2e9
root
root at mdehaan.rdu.redhat.com
Wed Jun 27 16:51:20 UTC 2007
Hello,
This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.
Updating branch, master,
via 24cfab3a916606aef28308d041cc043ac452d2e9 (commit)
from 7523d138f9d05f4c3dc9fa639f375af9b248c125 (commit)
- Log -----------------------------------------------------------------
commit 24cfab3a916606aef28308d041cc043ac452d2e9
Author: root <root at mdehaan.rdu.redhat.com>
Date: Wed Jun 27 12:52:51 2007 -0400
Terminology and display cleanup.
-----------------------------------------------------------------------
Diffstat:
wui/src/app/helpers/application_helper.rb | 18 +++++++++---------
wui/src/app/views/deployment/edit.rhtml | 2 +-
wui/src/app/views/deployment/list.rhtml | 2 +-
wui/src/app/views/deployment/view.rhtml | 2 +-
wui/src/app/views/machine/edit.rhtml | 2 +-
wui/src/app/views/machine/view.rhtml | 2 +-
wui/src/app/views/profile/list.rhtml | 10 +++++-----
wui/src/app/views/task/list.rhtml | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/wui/src/app/helpers/application_helper.rb b/wui/src/app/helpers/application_helper.rb
index 56761af..4a28e0b 100644
--- a/wui/src/app/helpers/application_helper.rb
+++ b/wui/src/app/helpers/application_helper.rb
@@ -12,25 +12,25 @@ module ApplicationHelper
app_root = ActionController::AbstractRequest.relative_url_root
template = <<-EOF
<ul class="nav">
- <li><strong><%= _("Machines") %></strong>
+ <li><strong><%= _("Hosts") %></strong>
<ul>
- <li><A HREF="#{app_root}/machine/list"><%= _("View Machines") %></A></li>
- <li><A HREF="#{app_root}/machine/edit"><%= _("Add a Machine via PXE") %></A></li>
+ <li><A HREF="#{app_root}/machine/list"><%= _("View Hosts") %></A></li>
+ <li><A HREF="#{app_root}/machine/edit"><%= _("Add a Host via PXE") %></A></li>
<!-- not needed under current auth mechanism
<li><A HREF="#{app_root}/regtoken/edit"><%= _("Create Registration Tokens") %></A></li>
<li><A HREF="#{app_root}/regtoken/list"><%= _("View Registration Tokens") %></A></li>
-->
</ul>
</li>
- <li><strong><%= _("Image Profiles") %></strong>
+ <li><strong><%= _("Profiles") %></strong>
<ul>
- <li><A HREF="#{app_root}/profile/list"><%= _("View Image Profiles") %></A></li>
+ <li><A HREF="#{app_root}/profile/list"><%= _("View Profiles") %></A></li>
</ul>
</li>
- <li><strong><%= _("Virtual Deployments") %></strong>
+ <li><strong><%= _("Guests") %></strong>
<ul>
- <li><A HREF="#{app_root}/deployment/list"><%= _("View Virtual Deployments") %></A></li>
- <li><A HREF="#{app_root}/deployment/edit"><%= _("Add a Virtual Deployment") %></A></li>
+ <li><A HREF="#{app_root}/deployment/list"><%= _("View Guests") %></A></li>
+ <li><A HREF="#{app_root}/deployment/edit"><%= _("Add a Guest") %></A></li>
</ul>
</li>
<li><strong><%= _("Task Queue") %></strong>
@@ -40,7 +40,7 @@ module ApplicationHelper
</li>
<li><strong><%= _("Users") %></strong>
<ul>
- <li><A HREF="#{app_root}/user/list"><%= _("View virt-factory Users") %></A></li>
+ <li><A HREF="#{app_root}/user/list"><%= _("View Users") %></A></li>
<li><A HREF="#{app_root}/user/edit"><%= _("Add a User") %></A></li>
<li><A HREF="#{app_root}/user/logout"><%= _("Logout") %></A></li>
</ul>
diff --git a/wui/src/app/views/deployment/edit.rhtml b/wui/src/app/views/deployment/edit.rhtml
index 7e49c05..59818f0 100755
--- a/wui/src/app/views/deployment/edit.rhtml
+++ b/wui/src/app/views/deployment/edit.rhtml
@@ -1,4 +1,4 @@
- <% @page_title = @operation.capitalize() + " a Deployment" %>
+ <% @page_title = @operation.capitalize() + " a Guest" %>
<% @primary = "deployment" %>
<% @secondary = " edit" %>
diff --git a/wui/src/app/views/deployment/list.rhtml b/wui/src/app/views/deployment/list.rhtml
index f5656e1..8581694 100755
--- a/wui/src/app/views/deployment/list.rhtml
+++ b/wui/src/app/views/deployment/list.rhtml
@@ -1,4 +1,4 @@
- <% @page_title = "View Virtual Deployments" %>
+ <% @page_title = "View Guests" %>
<% @primary = "deployment" %>
<% @secondary = "list" %>
diff --git a/wui/src/app/views/deployment/view.rhtml b/wui/src/app/views/deployment/view.rhtml
index b91c574..c660014 100755
--- a/wui/src/app/views/deployment/view.rhtml
+++ b/wui/src/app/views/deployment/view.rhtml
@@ -1,6 +1,6 @@
<!-- question: is this in use? view? -->
- <% @page_title = "View Deployment" %>
+ <% @page_title = "View Guest" %>
<% primary = "deployment" %>
<% secondary = "view" %>
diff --git a/wui/src/app/views/machine/edit.rhtml b/wui/src/app/views/machine/edit.rhtml
index d2d8bd6..2483111 100755
--- a/wui/src/app/views/machine/edit.rhtml
+++ b/wui/src/app/views/machine/edit.rhtml
@@ -1,4 +1,4 @@
- <% @page_title = @operation.capitalize() + " a Machine" %>
+ <% @page_title = @operation.capitalize() + " an Host" %>
<% @primary = "machine" %>
<% @secondary = "edit" %>
diff --git a/wui/src/app/views/machine/view.rhtml b/wui/src/app/views/machine/view.rhtml
index d6bedbf..d0299f8 100755
--- a/wui/src/app/views/machine/view.rhtml
+++ b/wui/src/app/views/machine/view.rhtml
@@ -1,4 +1,4 @@
- <% @page_title = "View Machine" %>
+ <% @page_title = "View Host" %>
<% @primary = "machine" %>
<% @secondary = "view" %>
diff --git a/wui/src/app/views/profile/list.rhtml b/wui/src/app/views/profile/list.rhtml
index d8bff08..980ac52 100755
--- a/wui/src/app/views/profile/list.rhtml
+++ b/wui/src/app/views/profile/list.rhtml
@@ -1,4 +1,4 @@
- <% @page_title = "View Profile Profiles" %>
+ <% @page_title = "View Profiles" %>
<% @primary = "profile" %>
<% @secondary = "list" %>
@@ -10,10 +10,10 @@
<th><%= _("Name") %></th>
<th><%= _("Version") %></th>
<th><%= _("Distribution") %></th>
- <th><%= _("Storage") %></th>
- <th><%= _("Memory") %></th>
+ <th><%= _("Virt Storage (GB)") %></th>
+ <th><%= _("Virt Memory (MB)") %></th>
<th><%= _("Targets") %></th>
- <th><%= _("Container?") %></th>
+ <!-- <th><%= _("Container?") %></th> -->
<th colspan="2"><%= _("Actions") %></th>
</thead>
<% else %>
@@ -32,7 +32,7 @@
<TD> <%= item.virt_storage_size %> </TD>
<TD> <%= item.virt_ram %> </TD>
<TD> <%= VALID_TARGETS[item.valid_targets] %> </TD>
- <TD> <%= (item.is_container == MACHINE_IS_CONTAINER) ? "Y" : "N" %> </TD>
+ <!-- <TD> <%= (item.is_container == MACHINE_IS_CONTAINER) ? "Y" : "N" %> </TD> -->
<TD> <%= link_to "[delete]", :controller => "profile", :action=> "delete", :id=> item.id %></TD>
</TR>
<% end %>
diff --git a/wui/src/app/views/task/list.rhtml b/wui/src/app/views/task/list.rhtml
index 3ca42de..20fc585 100755
--- a/wui/src/app/views/task/list.rhtml
+++ b/wui/src/app/views/task/list.rhtml
@@ -33,7 +33,7 @@
<% else %>
<%= link_to !item.get_deployment().hostname.nil? ? item.get_deployment().hostname : _("(Unknown)"), :controller => "deployment", :action => "edit", :id => item.deployment_id %>
<% end %>
- <TD>
+ </TD>
<TD> <%= item.state %> </TD>
<TD> <%= Time.at(item.time) %> </TD>
</TR>
hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
7523d138f9d05f4c3dc9fa639f375af9b248c125 \
24cfab3a916606aef28308d041cc043ac452d2e9
More information about the Et-mgmt-commits-list
mailing list