Changeset 184 for trunk/app

Timestamp:

10/03/08 22:05:29 (3 months ago)

Author:

mlamer

Message:

bugfix login

Location:

trunk/app

Files:

• controllers/sessions_controller.rb (modified) (1 diff)
• views/layouts/application.html.erb (modified) (1 diff)
• views/sessions/new.html.erb (modified) (2 diffs)

trunk/app/controllers/sessions_controller.rb

@@ -18 +18 @@
       flash[:notice] = "Logged in successfully"
     else
-      flash[:notice] = "Login/password wrong"
+      flash[:error] = "Login/password wrong"
       render :action => 'new'
     end

trunk/app/views/layouts/application.html.erb

@@ -19 +19 @@
     </div>
     <div id="main_content">
-      <div class="menu">
-        <%= render(:partial => 'layouts/menu') if logged_in? %>
-      </div>
+      <% if logged_in? %>
+        <div class="menu">
+          <%= render(:partial => 'layouts/menu') %>
+        </div>
+      <% else %>
+        <div style="width:80px; float:left;">&nbsp;</div>
+      <% end %>
       <div class="content">
         <%= yield :breadcrumb %>

trunk/app/views/sessions/new.html.erb

@@ -1 +1 @@
 <% form_tag sessions_path do -%>
 
-  <fieldset class="fieldset" style="margin-left:270px; width:225px; *margin-left:135px; width:225px;">
+  <fieldset class="fieldset" style="margin-left:180px; width:225px; *margin-left:135px; width:225px;">
     <legend>Webistrano login</legend>
     <p><label for="login">Login</label><br/>
@@ -20 +20 @@
 <% content_for(:page_title) do %>
   <% @page_title = "Login" %>
-  <h2 style="margin: 0px 0px 20px 270px; margin: 0px 0px 20px 135px; color: #A40008; ">Welcome to Webistrano</h2>
+  <h2 style="margin: 0px 0px 20px 180px; *margin: 0px 0px 20px 135px; color: #A40008; ">Welcome to Webistrano</h2>
 <% end %>