Mohammed Morsi
2008-Nov-11 17:29 UTC
[Ovirt-devel] [PATCH server] removed lingering, deprecated templates
---
src/app/views/layouts/_header.rhtml | 6 ----
src/app/views/layouts/default.rhtml | 48 -----------------------------------
2 files changed, 0 insertions(+), 54 deletions(-)
delete mode 100644 src/app/views/layouts/_header.rhtml
delete mode 100644 src/app/views/layouts/default.rhtml
diff --git a/src/app/views/layouts/_header.rhtml
b/src/app/views/layouts/_header.rhtml
deleted file mode 100644
index df55d3f..0000000
--- a/src/app/views/layouts/_header.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
- <div id="header">
- <div class="inside">
- <%= link_to image_tag("ovirt_logo.png", :alt =>
"Ovirt", :class => 'logo'), default_url %>
- </div>
- </div>
-
diff --git a/src/app/views/layouts/default.rhtml
b/src/app/views/layouts/default.rhtml
deleted file mode 100644
index 81df246..0000000
--- a/src/app/views/layouts/default.rhtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en">
-<head>
- <meta http-equiv="content-type"
content="text/html;charset=UTF-8" />
- <title><%= yield :title -%></title>
- <%= stylesheet_link_tag 'default' %>
- <%= javascript_include_tag "prototype" -%>
-
- <%= stylesheet_link_tag
'/javascripts/jquery-treeview/jquery.treeview.css' %>
- <%= javascript_include_tag "jquery.pack.js" -%>
- <%= javascript_include_tag "jquery-treeview/jquery.treeview.js"
-%>
- <%= javascript_include_tag
"jquery-treeview/jquery.treeview.async.js" -%>
- <%= yield :scripts -%>
- <script type="text/javascript">
- jQuery.noConflict()
- jQuery(document).ready(function(){
- jQuery("#treenav").treeview({
- url: "<%= url_for :controller
=>'/hardware', :action => 'json' %>",
- hardware_url: "<%= url_for :controller
=>'/hardware', :action => 'show' %>",
- resource_url: "<%= url_for :controller
=>'/resources', :action => 'show' %>"
- })
- });
- </script>
-</head>
-<body class="tundra">
-
- <div id="headerFade"><div
id="logoHeader"><%= link_to
image_tag("ovirt_logo.png", :class_name => "logo"),
:controller => "resources", :action => "list"
-%><span id="loginStatus">Logged in as: <strong><%=
@controller.get_login_user -%></strong></div></div>
- <div id="greenLine"> </div>
- <div id="darkGreenLine"> </div>
-
- <table id="main"><tr>
- <td id="left">
-
- <%= render :partial => '/layouts/tree' %>
- </td>
- <td id="center">
- <div class="heading"><%= yield :title -%></div>
-
- <%= yield %> <% # the rest of the center and right hand side
%>
-
- </tr></table>
-
-</div> <!-- end #wrapper -->
-
-</body>
-</html>
--
1.5.6.5
Jason Guiditta
2008-Nov-11 21:44 UTC
[Ovirt-devel] [PATCH server] removed lingering, deprecated templates
On Tue, 2008-11-11 at 12:29 -0500, Mohammed Morsi wrote:> --- > src/app/views/layouts/_header.rhtml | 6 ---- > src/app/views/layouts/default.rhtml | 48 ----------------------------------- > 2 files changed, 0 insertions(+), 54 deletions(-) > delete mode 100644 src/app/views/layouts/_header.rhtml > delete mode 100644 src/app/views/layouts/default.rhtml > > diff --git a/src/app/views/layouts/_header.rhtml b/src/app/views/layouts/_header.rhtml > deleted file mode 100644 > index df55d3f..0000000 > --- a/src/app/views/layouts/_header.rhtml > +++ /dev/null > @@ -1,6 +0,0 @@ > - <div id="header"> > - <div class="inside"> > - <%= link_to image_tag("ovirt_logo.png", :alt => "Ovirt", :class => 'logo'), default_url %> > - </div> > - </div> > - > diff --git a/src/app/views/layouts/default.rhtml b/src/app/views/layouts/default.rhtml > deleted file mode 100644 > index 81df246..0000000 > --- a/src/app/views/layouts/default.rhtml > +++ /dev/null > @@ -1,48 +0,0 @@ > -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" > - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> > - > -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> > -<head> > - <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> > - <title><%= yield :title -%></title> > - <%= stylesheet_link_tag 'default' %> > - <%= javascript_include_tag "prototype" -%> > - > - <%= stylesheet_link_tag '/javascripts/jquery-treeview/jquery.treeview.css' %> > - <%= javascript_include_tag "jquery.pack.js" -%> > - <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%> > - <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%> > - <%= yield :scripts -%> > - <script type="text/javascript"> > - jQuery.noConflict() > - jQuery(document).ready(function(){ > - jQuery("#treenav").treeview({ > - url: "<%= url_for :controller =>'/hardware', :action => 'json' %>", > - hardware_url: "<%= url_for :controller =>'/hardware', :action => 'show' %>", > - resource_url: "<%= url_for :controller =>'/resources', :action => 'show' %>" > - }) > - }); > - </script> > -</head> > -<body class="tundra"> > - > - <div id="headerFade"><div id="logoHeader"><%= link_to image_tag("ovirt_logo.png", :class_name => "logo"), :controller => "resources", :action => "list" -%><span id="loginStatus">Logged in as: <strong><%= @controller.get_login_user -%></strong></div></div> > - <div id="greenLine"> </div> > - <div id="darkGreenLine"> </div> > - > - <table id="main"><tr> > - <td id="left"> > - > - <%= render :partial => '/layouts/tree' %> > - </td> > - <td id="center"> > - <div class="heading"><%= yield :title -%></div> > - > - <%= yield %> <% # the rest of the center and right hand side %> > - > - </tr></table> > - > -</div> <!-- end #wrapper --> > - > -</body> > -</html>I am ok with the sentiment here, but what really should be removed is the 'redux' versions. I think this is a fine first step though, we can rename redux in the near future and get all its refs in that patch. So, ACK. -j