added new tests and fixtures

[selectricity-live] / app / views / layouts / main.rhtml

diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml
index 74ad018564dbdd57ec8e894ac45d2eb54d99c84e..75f196ae3c4c9cb9fbcc4c28bacd008802167cab 100644 (file)
--- a/app/views/layouts/main.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -5,8 +5,11 @@
     <%= stylesheet_link_tag "common", :media => "all" %>
     <%= stylesheet_link_tag "main", :media => "all" %>
     <%= stylesheet_link_tag *(@stylesheets) %>
     <%= stylesheet_link_tag "common", :media => "all" %>
     <%= stylesheet_link_tag "main", :media => "all" %>
     <%= stylesheet_link_tag *(@stylesheets) %>

-    <%= stylesheet_link_tag "ie6hacks", :media => "all" if \
-          request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
+    <%begin%>
+      <%= stylesheet_link_tag "ie6hacks", :media => "all" if 
+      request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %>
+    <%rescue NoMethodError%>
+    <%end%>

     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>
 
     <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
   </head>
 


@@ -14,8 +17,7 @@
   <div id="page-wrapper">
 
     <div id="left-side">
   <div id="page-wrapper">
 
     <div id="left-side">

-      <%= link_to "<h1>Selectricity</h1>",
-                  :controller => 'site', :action => 'index' %>
+      <%= link_to "<h1>Selectricity</h1>", :controller => 'front' %>

 
       <div id="left-side-content">
         <% if flash[:notice]%>
 
       <div id="left-side-content">
         <% if flash[:notice]%>


@@ -31,19 +33,19 @@
       <div id="top-bar">
            <div id="bar-left">
         <% if session[:user] %>
       <div id="top-bar">
            <div id="bar-left">
         <% if session[:user] %>

-          <%= link_to User.find(session[:user]).login.capitalize,
+          <%= link_to User.find(session[:user]).login.downcase,

                       :controller => "account",
                       :action => "summary", :id => session[:user][:id] %>
           <%= link_to "logout", :controller => "account",
                       :action => "logout" %> 
         <% else %>
                       :controller => "account",
                       :action => "summary", :id => session[:user][:id] %>
           <%= link_to "logout", :controller => "account",
                       :action => "logout" %> 
         <% else %>

-          <%= link_to("login", :controller => "account", :action => "login")
-          %>/<%= link_to("sign up", :controller => "account", :action => "signup")%>
+          <%= link_to "login", :controller => "account", :action => "login" 
+          %><!-- /<%= link_to "sign up", :controller => "account", :action => "signup" %>-->

         <% end %> 
         </div>
 
         <div id="bar-right">
         <% end %> 
         </div>
 
         <div id="bar-right">

-          <%= link_to("help/about", :controller => "site", :action => "about") %>
+          <%= link_to "help/about", :controller => 'about' %>

         </div>
       </div> <!-- end of top-bar -->
       
         </div>
       </div> <!-- end of top-bar -->
       


@@ -53,7 +55,7 @@
 
     </div> <!-- end of right-side -->
     <div class="clear-div"></div>
 
     </div> <!-- end of right-side -->
     <div class="clear-div"></div>

-    <%= render_partial 'layouts/footer' %>
+    <%= render :partial => 'layouts/footer' %>

     </div>
   </body>
 </html>
     </div>
   </body>
 </html>