Permalink
Browse files

merge bug resolved

  • Loading branch information...
1 parent e6014ab commit 50a96a5085216af906efa584add0feca55ba5970 Stephan committed Dec 6, 2012
Showing with 21 additions and 33 deletions.
  1. +21 −33 views/login.ejs
View
54 views/login.ejs
@@ -49,44 +49,32 @@
<div role="main" id="stage">
- <div class="container">
- <div class="row">
- <div class="alert alert-error">
- <strong>Error! </strong><%= message %>
- </div>
- </div>
- </div>
+<% if(message){ %>
+ <div class="container">
+ <div class="row">
+ <div class="alert alert-error">
+ <strong>Error! </strong><%= message %>
+ </div>
+ </div>
+ </div>
<% } %>
<div class="container">
<div class="row">
<div class="offset4 span4">
- <form action="/login" method="post">
- <div>
- <label>Username:</label>
- <input type="text" name="username"/><br/>
- </div>
- <div>
- <label>Password:</label>
- <input type="password" name="password"/>
- </div>
- <div>
- <input type="submit" value="Submit"/>
- </div>
- </form>
- <form action="/login" method="post">
- <div>
- <label>Username:</label>
- <input type="text" name="username"/><br/>
- </div>
- <div>
- <label>Password:</label>
- <input type="password" name="password"/>
- </div>
- <div>
- <input type="submit" value="Submit"/>
- </div>
- </form>
+ <form action="/login" method="post">
+ <div>
+ <label>Username:</label>
+ <input type="text" name="username"/><br/>
+ </div>
+ <div>
+ <label>Password:</label>
+ <input type="password" name="password"/>
+ </div>
+ <div>
+ <input type="submit" value="Submit"/>
+ </div>
+ </form>
</div>
</div>

0 comments on commit 50a96a5

Please sign in to comment.