From: Jason Guiditta <jguiditt(a)redhat.com>
These should no longer be used anywhere.
(edited by Scott Seago <sseago(a)redhat.com>)
---
aeolus-conductor.spec.in | 3 +-
src/app/views/layouts/_bar.rhtml | 9 -----
src/app/views/layouts/_main_nav.html.erb | 19 -----------
src/app/views/layouts/confirmation.rhtml | 2 -
src/app/views/layouts/old.haml | 51 ------------------------------
src/app/views/layouts/popup.rhtml | 7 ----
6 files changed, 1 insertions(+), 90 deletions(-)
delete mode 100644 src/app/views/layouts/_bar.rhtml
delete mode 100644 src/app/views/layouts/_main_nav.html.erb
delete mode 100644 src/app/views/layouts/confirmation.rhtml
delete mode 100644 src/app/views/layouts/old.haml
delete mode 100644 src/app/views/layouts/popup.rhtml
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 2977df3..b288209 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -124,7 +124,6 @@ builder="app/views/errors"
cgi="public"
css="public/stylesheets public/stylesheets/jquery.ui-1.8.1 \
public/javascripts/jquery-svg"
-erb="app/views/layouts"
fcgi="public"
feature="features"
gif="public/images public/stylesheets/images"
@@ -161,7 +160,7 @@ ttf="public/fonts"
txt="public"
yml="config config/locales"
-for filetype in builder cgi css erb fcgi feature gif haml html ico jpg js json \
+for filetype in builder cgi css fcgi feature gif haml html ico jpg js json \
key opts png rake rb rhtml scss svg ttf txt yml; do
dirs=${!filetype}
diff --git a/src/app/views/layouts/_bar.rhtml b/src/app/views/layouts/_bar.rhtml
deleted file mode 100644
index 4eb4981..0000000
--- a/src/app/views/layouts/_bar.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="top_bar">
-<% if false %>
-<span class="hello_message">Hello current_user.display_name</span>
-<span class="account_message"><span
class="login">current_user.login</span> | <%= link_to
"home", '/users/user' %> | <%= link_to "log out",
logout_url %></span>
-<% else %>
-<span class="hello_message">Hello there <%= @controller.get_login_user
%>!</span>
-<span class="account_message"><%= link_to "hardware pools",
:controller => 'hardware' %> | <%= link_to "VM resource pools",
:controller => "resources" %></span>
-<% end %>
-</div>
diff --git a/src/app/views/layouts/_main_nav.html.erb
b/src/app/views/layouts/_main_nav.html.erb
deleted file mode 100644
index d877029..0000000
--- a/src/app/views/layouts/_main_nav.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% cur_id = params[:id].to_i %>
-
-<h3>Pools</h3>
-<ul id="pools">
- <% if !(a)pools.nil? %>
- <% @pools.each { |pool| %>
- <% if controller.controller_name == "pools" && pool.id == cur_id
- selected_pool = "selected"
- else selected_pool = ""
- end %>
- <li><%= link_to pool.name,
- {:controller => "pools", :action => "show", :id =>
pool},
- :class => "poolname #{selected_pool}" %></li>
- <% } %>
- <% end %>
-</ul>
-<% if check_privilege(Privilege::CREATE, Pool,
BasePermissionObject.general_permission_scope) %>
- <%= link_to "Add a pool", {:controller => "pools", :action
=> "new"}, :class => "actionlink" %>
-<% end %>
diff --git a/src/app/views/layouts/confirmation.rhtml
b/src/app/views/layouts/confirmation.rhtml
deleted file mode 100644
index 736517c..0000000
--- a/src/app/views/layouts/confirmation.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%# currently nothing for popups here. %>
-<%= yield %>
diff --git a/src/app/views/layouts/old.haml b/src/app/views/layouts/old.haml
deleted file mode 100644
index 67d3d74..0000000
--- a/src/app/views/layouts/old.haml
+++ /dev/null
@@ -1,51 +0,0 @@
-!!!
-%html
- %head
- %meta(http-equiv="Content-Type" content="text/html;
charset=UTF-8")
- %title
- Red Hat Cloud Engine
- = yield :title
- = stylesheet_link_tag 'facebox'
- = stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css'
- = stylesheet_link_tag 'jquery.loadmask'
- = stylesheet_link_tag 'compiled/application'
-
- / [if lt IE 9]
- = javascript_include_tag
"http://html5shiv.googlecode.com/svn/trunk/html5.js"
- = javascript_include_tag "jquery-1.6.1.min.js"
- = javascript_include_tag "application.js"
- = javascript_include_tag "jquery.ui-1.8.1/jquery-ui-1.8.1.custom.min.js"
- = javascript_include_tag "jquery.loadmask.min"
- = javascript_include_tag "modernizr-1.5"
- /= javascript_include_tag "jquery.html5form"
- = yield :scripts
- %body
- %div#head
- %header.container_16
- = render :partial => '/layouts/header'
- - if @current_user.nil?
- #content.container_16
- = render :partial => '/layouts/notification'
- #formwindow
- = yield
- - else
- #subheader
- %nav.container_16
- = render_navigation({:expand_all => true, :level => 1})
- = render_navigation({:expand_all => true, :level => 2})
- #content
- #saved-searches
- Saved searches
- - details = !(yield :details).blank?
- #list-view{ :class => details ? 'part' : 'full'}
- - form_tag({:action => 'index'}, :method => :get) do
- = text_field_tag :q, @search_term
- = submit_tag "Search"
- = render :partial => '/layouts/notification'
- = (yield :list or yield)
- #details-view.ui-tabs.ui-widget.ui-widget-content.ui-corner-all{ :class =>
('hidden' unless details)}
- - if details
- = yield :details
- %footer
- = render :partial => "layouts/footer"
- #grid
diff --git a/src/app/views/layouts/popup.rhtml b/src/app/views/layouts/popup.rhtml
deleted file mode 100644
index b67e5da..0000000
--- a/src/app/views/layouts/popup.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="window">
-<div class="dialog_title_small">
- <div class="header"><%= yield :title -%></div>
- <div><%= yield :description -%></div>
-</div>
-<%= yield %>
-</div>
--
1.7.4.4