Lay groundwork for upcoming controllers/further cleanups.
Signed-off-by: Jason Guiditta jason.guiditta@gmail.com --- src/app/controllers/application_controller.rb | 4 +- src/app/views/dashboard/index.html.erb | 8 +-- src/app/views/layouts/_header.rhtml | 10 +++ src/app/views/layouts/_header_redux.rhtml | 12 --- src/app/views/layouts/_navigation_tabs.rhtml | 18 ----- src/app/views/layouts/dcloud.rhtml | 87 ++++++++++++++++++++++ src/app/views/layouts/redux.rhtml | 98 ------------------------- src/public/images/dcloud.png | Bin 0 -> 746 bytes src/public/stylesheets/components.css | 11 --- src/public/stylesheets/layout.css | 2 +- 10 files changed, 101 insertions(+), 149 deletions(-) create mode 100644 src/app/views/layouts/_header.rhtml delete mode 100644 src/app/views/layouts/_header_redux.rhtml create mode 100644 src/app/views/layouts/dcloud.rhtml delete mode 100644 src/app/views/layouts/redux.rhtml create mode 100644 src/public/images/dcloud.png
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 7e2041f..973b4fb 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -39,9 +39,9 @@ class ApplicationController < ActionController::Base
def choose_layout if(params[:component_layout]) - return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'redux' + return (ENV["RAILS_ENV"] != "production")?'components/' << params[:component_layout]:'dcloud' end - return 'redux' + return 'dcloud' end
def is_logged_in diff --git a/src/app/views/dashboard/index.html.erb b/src/app/views/dashboard/index.html.erb index c361e55..9856d4b 100644 --- a/src/app/views/dashboard/index.html.erb +++ b/src/app/views/dashboard/index.html.erb @@ -1,7 +1 @@ - <%= render :partial => "/task/show", :locals => { :task_types => @task_types, - :task_states => @task_states, - :task_type => @task_type, - :task_state => @task_state, - :tasks => @tasks, - :action => 'index', - :pool => nil } %> +<!-- Content to come soon. --> \ No newline at end of file diff --git a/src/app/views/layouts/_header.rhtml b/src/app/views/layouts/_header.rhtml new file mode 100644 index 0000000..76f9e73 --- /dev/null +++ b/src/app/views/layouts/_header.rhtml @@ -0,0 +1,10 @@ +<div class="header_logo"><%= image_tag "dcloud.png" %></div> + +<div class="header_info"> + <div id="hi-username">Hi, <%= @user %></div> + <form method="POST" id="search-form" action="<%= url_for :controller => "search", :action => 'results' %>"> + <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text"> + <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image"> | + </form> + <%= link_to 'Log out', { :controller => "login", :action => "logout"}%> +</div> \ No newline at end of file diff --git a/src/app/views/layouts/_header_redux.rhtml b/src/app/views/layouts/_header_redux.rhtml deleted file mode 100644 index c1a1df1..0000000 --- a/src/app/views/layouts/_header_redux.rhtml +++ /dev/null @@ -1,12 +0,0 @@ -<div class="header_logo"><%= image_tag "logo_ovirt.png" %></div> - -<div class="header_info"> - <div id="hi-username">Hi, <%= @user %></div> - <form method="POST" id="search-form" action="<%= url_for :controller => "search", :action => 'results' %>"> - <input id="textfield_effect" name="terms" value="Search" onkeypress="" onfocus="if( this.value == this.defaultValue ) this.value='';" type="text"> - <input id="searchbox-button" src="<%= image_path "icon_search.png"%>" title="Search" type="image"> | - </form> - <%= link_to 'Log out', { :controller => "login", :action => "logout"}%> -</div> - -<div class="header_titlebar">Resource Pools</div> diff --git a/src/app/views/layouts/_navigation_tabs.rhtml b/src/app/views/layouts/_navigation_tabs.rhtml index 70af098..2fe2ee8 100644 --- a/src/app/views/layouts/_navigation_tabs.rhtml +++ b/src/app/views/layouts/_navigation_tabs.rhtml @@ -51,22 +51,4 @@ <ul id="search_nav_tabs" class="ui-tabs-nav"> <li id="nav_search" class="ui-tabs-selected"><a href="#">Search Results</a></li> </ul> -<% elsif controller.controller_name == "dashboard" %> - <script> - $(document).ready(function(){ - $tabs = $("#dashboard_nav_tabs").tabs(); - }); - </script> - <ul id="dashboard_nav_tabs" class="ui-tabs-nav"> - <li id="nav_summary" class="ui-tabs-selected"><%= link_to "Tasks", {:action => 'index', :nolayout => :true}, :title => "content area" %></li> - </ul> -<% elsif controller.controller_name == "network" %> - <script> - $(document).ready(function(){ - $tabs = $("#network_nav_tabs").tabs(); - }); - </script> - <ul id="network_nav_tabs" class="ui-tabs-nav"> - <li id="nav_summary" class="ui-tabs-selected"><%= link_to "Networks", {:action => 'list', :nolayout => :true}, :title => "content area" %></li> - </ul> <% end %> \ No newline at end of file diff --git a/src/app/views/layouts/dcloud.rhtml b/src/app/views/layouts/dcloud.rhtml new file mode 100644 index 0000000..0f98f25 --- /dev/null +++ b/src/app/views/layouts/dcloud.rhtml @@ -0,0 +1,87 @@ +<!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>dCloud <%= yield :title -%></title> + <!--%= stylesheet_link_tag 'default' %--> <%# remove me %> + <%= stylesheet_link_tag 'layout' %> + <%= stylesheet_link_tag 'components' %> + <!--[if IE]> + <%= stylesheet_link_tag 'ie' %> + <![endif]--> + <%= stylesheet_link_tag '/javascripts/jquery-treeview/ovirt.treeview.css' %> + <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %> + <%= stylesheet_link_tag 'facebox' %> + <%= stylesheet_link_tag 'jquery.jgrowl.css' %> + <%= stylesheet_link_tag 'ovirt-tree/tree' %> + + <%= javascript_include_tag "jquery-1.2.6.min.js" -%> + <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%> + <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%> + <%= javascript_include_tag "flexigrid.js" -%> + <%= javascript_include_tag "facebox.js" -%> + <%= javascript_include_tag "jquery.livequery.min.js" -%> + <%= javascript_include_tag "jquery.form.js" -%> + <%= javascript_include_tag "jquery.jgrowl.js" -%> + + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%> + <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.tabs.packed.js" -%> + + <!-- ovirt-specific functions defined here --> + <%= javascript_include_tag "ovirt.js" -%> + <script type="text/javascript"> + var $tabs, selected_tab; + $(document).ready(function(){ + $.ajaxSetup({error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}}); + $('a[rel*=facebox]').livequery(function(){$(this).facebox();},function(){}); + $('.dialog_tab_nav a').livequery(function(){ + $(this).bind('click', function(){ + $('.dialog_tab_nav li').removeClass('current'); + $(this).parent().addClass('current'); + $.ajax({ + url: $(this).attr('href'), + type: 'GET', + data: {ajax:true}, + dataType: 'html', + success: function(data) { + var wrapped_data = $(data).find('div').filter('[id=dialog-content-area]'); + var my_parent = $(this).parent(); + $('#dialog-content-area').html($(data)); + $('#facebox').css('left', $(window).width() / 2 - ($('#facebox table').width() / 2)); + }, + error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);} + }); + return false;})},function(){}); + }); + </script> + <%= yield :scripts -%> + </head> + + <body> + + <div id="header"> + <%= render :partial => '/layouts/header' %> + </div> + + <div id="side"> + fred <%#= render :partial => '/layouts/tree' %> + </div> + + <div id="tabs-and-content-container"> + + <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;"> + <%= render :partial => '/layouts/navigation_tabs' %> + </div> + <div id="main"> + <div id="content_area"> + + <%= yield %> <%# the rest of the center and right hand side %> + </div> + </div> + </div> + + </body> +</html> diff --git a/src/app/views/layouts/redux.rhtml b/src/app/views/layouts/redux.rhtml deleted file mode 100644 index 12458df..0000000 --- a/src/app/views/layouts/redux.rhtml +++ /dev/null @@ -1,98 +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' %--> <%# remove me %> - <%= stylesheet_link_tag 'layout' %> - <%= stylesheet_link_tag 'components' %> - <!--[if IE]> - <%= stylesheet_link_tag 'ie' %> - <![endif]--> - <%= stylesheet_link_tag '/javascripts/jquery-treeview/ovirt.treeview.css' %> - <%= stylesheet_link_tag 'flexigrid/flexigrid.css' %> - <%= stylesheet_link_tag 'facebox' %> - <%= stylesheet_link_tag 'jquery.jgrowl.css' %> - <%= stylesheet_link_tag 'ovirt-tree/tree' %> - - <%= javascript_include_tag "jquery-1.2.6.min.js" -%> - <%= javascript_include_tag "jquery-treeview/jquery.treeview.js" -%> - <%= javascript_include_tag "jquery-treeview/jquery.treeview.async.js" -%> - <%= javascript_include_tag "flexigrid.js" -%> - <%= javascript_include_tag "facebox.js" -%> - <%#= javascript_include_tag "jquery.timers.js" -%> - <%= javascript_include_tag "jquery-svg/jquery.svg.pack.js" -%> - <!--%= javascript_include_tag "jquery-svg/jquery.svgfilter.js" -%--> - <%= javascript_include_tag "jquery-svg/jquery.svggraph.js" -%> - <%= javascript_include_tag "jquery.cookie.js" -%> - <%= javascript_include_tag "jquery.livequery.min.js" -%> - <%= javascript_include_tag "jquery.form.js" -%> - <%= javascript_include_tag "jquery.jgrowl.js" -%> - - <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.core.packed.js" -%> - <%= javascript_include_tag "jquery.ui-1.5.2/ui/packed/ui.tabs.packed.js" -%> - <%= javascript_include_tag "trimpath-template-1.0.38.js" %> - <%= javascript_include_tag "ovirt.tree.js" %> - - <!-- ovirt-specific functions defined here --> - <%= javascript_include_tag "ovirt.js" -%> - <script type="text/javascript"> - var $tabs, selected_tab; - $(document).ready(function(){ - $.ajaxSetup({error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);}}); - $('a[rel*=facebox]').livequery(function(){$(this).facebox();},function(){}); - $('.dialog_tab_nav a').livequery(function(){ - $(this).bind('click', function(){ - $('.dialog_tab_nav li').removeClass('current'); - $(this).parent().addClass('current'); - $.ajax({ - url: $(this).attr('href'), - type: 'GET', - data: {ajax:true}, - dataType: 'html', - success: function(data) { - var wrapped_data = $(data).find('div').filter('[id=dialog-content-area]'); - var my_parent = $(this).parent(); - $('#dialog-content-area').html($(data)); - $('#facebox').css('left', $(window).width() / 2 - ($('#facebox table').width() / 2)); - }, - error: function(xhr) {$.jGrowl(xhr.status + ' ' + xhr.statusText);} - }); - return false;})},function(){}); - }); - </script> - <%= yield :scripts -%> - </head> - - <body> - - <div id="header"> - <%= render :partial => '/layouts/header_redux' %> - </div> - - <div id="side"> - <%= render :partial => '/layouts/tree' %> - </div> - - <div id="side-toolbar" class="header_menu_wrapper"> - <%= render :partial => '/layouts/side_toolbar' %> - </div> - - <div id="tabs-and-content-container"> - - <div id="navigation-tabs" style="position:absolute; top:40px; left:250px;"> - <%= render :partial => '/layouts/navigation_tabs' %> - </div> - <div id="main"> - <div id="content_area"> - - <%= yield %> <%# the rest of the center and right hand side %> - </div> - </div> - </div> - - </body> -</html> diff --git a/src/public/images/dcloud.png b/src/public/images/dcloud.png new file mode 100644 index 0000000000000000000000000000000000000000..b8224d7800f42c7871daca615af7a85cd617dbcd GIT binary patch literal 746 zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq001}u000jN1^@s6vH1)O0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!j7da6RCwCVSHEx5Ko~V41DU871|)>! zwcVVN(H&WkoC$Swc9wXgoBbywD@;^kDwDmEDc%rUEg>Y37-Hz;t-L4RMOR}dO(;rF z`gFeQci(;Q`|&RA&*yXJe~h0`hY9C{FN@gO!@&I+rnA1;IQshXszW#a^yF>YIP77X zKmv%T?E;cRQh=&3`_6s`earjS#taf^KC|}A1~@v-=(y4~f9HO<uZ(q#6+mQZj4bjq zq~ll@EopZJj$;Tgg>%P8&t4FuvX=pDTZu)=T)Hbb1Sx_nAXktjWU9b5b+V4LZTpFA z(PpM9`x_uYMXFu517u*8^Df}nw^Q}&h=G#LtO3%s?sC@ci_9kS=~%Y2Yb6RGrt~~r zI@6jUhsbPcH?BxzTX4LC&dhLrZ0)mRE>s=qmNpI9&8*(fv0v$~RR$B0#E6UusT5&X z25yVh95L-`z_C(M4{yt+?ENWGWslLz0W7!ru~a`s()rh6o|Crh@A|B`9X1QQ2mOvH z*owZj_U}4#+AY-E@+<+msPSNjdpGrMxkX8C>dn9gXtLDS17RbR<_AF1r1l$(yv<43 z3EC>CC6Hc+O}|U;{_|HK>PMIF2L!_zQv7)MqDJ45Tu#Vr=*M#^Klt^ntPdU!1U$rd z4RIkJB%na&BX#k8qBCzaS2{bv{2fADhax!6BkJgEEnXPlyU-nm2nWzRl}*}tCSOXd zKO-pg?X~(d?}<=iQ8Ym<^}93?xVTZ@T*opnHP4B@y$!u#?xF4yvM}r|HZ^*M^g=x$ z7uFNj9AlODJ3jQXotl!rXa6@Lwp<a4o{M$0?psV&-1L1^S@LYP?iZ2XIZ9~<V1qB$ c{P-=v0J_06={A}>YXATM07*qoM6N<$f(fT#&Hw-a
literal 0 HcmV?d00001
diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css index 2cda65d..af9c85e 100644 --- a/src/public/stylesheets/components.css +++ b/src/public/stylesheets/components.css @@ -17,17 +17,6 @@ background: #CCCCCC; }
-.header_titlebar { - color: #4e4e4e; - text-transform: uppercase; - background: #979797; - float: left; - height: 25px; - margin: 40px 0 0 0; - padding: 8px 0 0 10px; - width: 220px; -} - .header_menu { padding: 5px 0 0 10px; margin: 1px; diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css index 9ecfe44..f90ee47 100644 --- a/src/public/stylesheets/layout.css +++ b/src/public/stylesheets/layout.css @@ -62,7 +62,7 @@ a { color:#000000; text-decoration: none;} position: absolute; top: 70px; left: 0px; - bottom: 35px; + bottom: 0px; overflow: auto; width: 224px; background-color:#FFFFFF;
deltacloud-devel@lists.fedorahosted.org
-
jason.guiditta