From: <jh...@us...> - 2009-02-06 17:26:38
|
Revision: 67 http://etch.svn.sourceforge.net/etch/?rev=67&view=rev Author: jheiss Date: 2009-02-06 17:26:36 +0000 (Fri, 06 Feb 2009) Log Message: ----------- Replace @content_for_layout with a call to yield. @content_for_layout is deprecated. Modified Paths: -------------- trunk/server/app/views/layouts/application.html.erb Modified: trunk/server/app/views/layouts/application.html.erb =================================================================== --- trunk/server/app/views/layouts/application.html.erb 2009-02-06 17:25:40 UTC (rev 66) +++ trunk/server/app/views/layouts/application.html.erb 2009-02-06 17:26:36 UTC (rev 67) @@ -41,7 +41,8 @@ <div id="error"><%= flash[:error] %></div> <% end -%> -<%= @content_for_layout %> +<%- # Calling yield here triggers the insertion of the specific view -%> +<%= yield %> <hr /> </div> <!-- end content --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jh...@us...> - 2010-10-21 21:45:51
|
Revision: 222 http://etch.svn.sourceforge.net/etch/?rev=222&view=rev Author: jheiss Date: 2010-10-21 21:45:44 +0000 (Thu, 21 Oct 2010) Log Message: ----------- https://sourceforge.net/apps/trac/etch/ticket/10 Fix the etch home link in upper left so that it obeys RAILS_RELATIVE_URL_ROOT. Modified Paths: -------------- trunk/server/app/views/layouts/application.html.erb Modified: trunk/server/app/views/layouts/application.html.erb =================================================================== --- trunk/server/app/views/layouts/application.html.erb 2010-10-20 20:55:09 UTC (rev 221) +++ trunk/server/app/views/layouts/application.html.erb 2010-10-21 21:45:44 UTC (rev 222) @@ -26,7 +26,7 @@ <%- end -%> </p> -<h1 id="branding"><a href="/">Etch</a></h1> +<h1 id="branding"><%= link_to "Etch", { :controller => 'dashboard' } %></h1> <hr /> </div> <!-- end header --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jh...@us...> - 2011-01-13 17:37:10
|
Revision: 250 http://etch.svn.sourceforge.net/etch/?rev=250&view=rev Author: jheiss Date: 2011-01-13 17:37:04 +0000 (Thu, 13 Jan 2011) Log Message: ----------- Replace internal URL with URL of sourceforge wiki site Modified Paths: -------------- trunk/server/app/views/layouts/application.html.erb Modified: trunk/server/app/views/layouts/application.html.erb =================================================================== --- trunk/server/app/views/layouts/application.html.erb 2011-01-07 03:32:19 UTC (rev 249) +++ trunk/server/app/views/layouts/application.html.erb 2011-01-13 17:37:04 UTC (rev 250) @@ -19,7 +19,7 @@ <p id="account_links"> <%- if session[:account_id] -%> Welcome back, <%= link_to logged_in_account.name, account_path(logged_in_account) %>! - | <%= link_to "Help", "http://onewiki.yellowpages.com/display/ACH/UsingEtch" %> + | <%= link_to "Help", "http://etch.sourceforge.net/" %> | <%= link_to "Logout", :controller => 'login', :action => 'logout' %> <%- else -%> <%= link_to "Login", :controller => 'login', :action => 'login' %> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jh...@us...> - 2011-01-13 17:47:27
|
Revision: 251 http://etch.svn.sourceforge.net/etch/?rev=251&view=rev Author: jheiss Date: 2011-01-13 17:47:20 +0000 (Thu, 13 Jan 2011) Log Message: ----------- Don't throw an exception if session is not defined. I'm not really sure why it wouldn't be defined, but it seems to happen occasionally, particularly with the "GET /" healthcheck requests from the load balancers. Modified Paths: -------------- trunk/server/app/views/layouts/application.html.erb Modified: trunk/server/app/views/layouts/application.html.erb =================================================================== --- trunk/server/app/views/layouts/application.html.erb 2011-01-13 17:37:04 UTC (rev 250) +++ trunk/server/app/views/layouts/application.html.erb 2011-01-13 17:47:20 UTC (rev 251) @@ -17,7 +17,7 @@ <div id="header"> <p id="account_links"> -<%- if session[:account_id] -%> +<%- if session && session[:account_id] -%> Welcome back, <%= link_to logged_in_account.name, account_path(logged_in_account) %>! | <%= link_to "Help", "http://etch.sourceforge.net/" %> | <%= link_to "Logout", :controller => 'login', :action => 'logout' %> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jh...@us...> - 2012-04-24 17:14:16
|
Revision: 319 http://etch.svn.sourceforge.net/etch/?rev=319&view=rev Author: jheiss Date: 2012-04-24 17:14:10 +0000 (Tue, 24 Apr 2012) Log Message: ----------- Comment out the links to login/logout. There has never been support for them, and with some of the recent routing changes there is no longer routing to even generate the links. Modified Paths: -------------- trunk/server/app/views/layouts/application.html.erb Modified: trunk/server/app/views/layouts/application.html.erb =================================================================== --- trunk/server/app/views/layouts/application.html.erb 2012-04-24 17:02:42 UTC (rev 318) +++ trunk/server/app/views/layouts/application.html.erb 2012-04-24 17:14:10 UTC (rev 319) @@ -14,11 +14,11 @@ <p id="account_links"> <%- if session && session[:account_id] -%> Welcome back, <%= link_to logged_in_account.name, account_path(logged_in_account) %>! - | <%= link_to "Help", "http://etch.sourceforge.net/" %> - | <%= link_to "Logout", :controller => 'login', :action => 'logout' %> + | <%#= link_to "Logout", :controller => 'login', :action => 'logout' %> <%- else -%> -<%= link_to "Login", :controller => 'login', :action => 'login' %> +<%#= link_to "Login", :controller => 'login', :action => 'login' %> <%- end -%> +<%= link_to "Help", "http://etch.sourceforge.net/" %> </p> <h1 id="branding"><%= link_to "Etch", { :controller => 'dashboard' } %></h1> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |