[#2315] Toby did not like the template stuff in commit b23b357.

ckan · May 23, 2012 · 37ca4c2 · 37ca4c2
1 parent 5ec65fa
commit 37ca4c2
Showing 1 changed file with 14 additions and 25 deletions.
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
@@ -21,35 +21,24 @@
 
   <div py:match="content">
 
-    <form action="${c.login_handler}" method="post" class="form-horizontal" id="login">  
+    <form action="${c.login_handler}" method="post" class="simple-form" id="login">
       <fieldset>
         <!--legend i18n:msg="site_title">Login</legend-->
-        <div class="control-group">
-          <label class="control-label" for="login">Login:</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge" name="login" id="login" value="" />
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="password">Password:</label>
-          <div class="controls">
-            <input type="password" name="password" id="password" value="" />
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="remember">Remember me:</label>
-          <!-- optional 2 year cookie expiry -->
-          <div class="controls">
-            <input type="checkbox" name="remember" id="remember" value="63072000" checked="checked"/>
-          </div>
-        </div>        
 
-        <div class="form-actions">
-          <button name="s" id="s" type="submit" class="btn btn-primary">Sign In</button>
-          &mdash; 
-          <a href="${h.url_for('reset')}">Forgot your password?</a>
-        </div>
+        <label for="login">Login:</label>
+        <input type="text" name="login" value="" />
+        <br/>
+        <label for="password">Password:</label>
+        <input type="password" name="password" value="" />
+        <br/>
+        <!-- optional 2 year cookie expiry -->
+        <label for="remember">Remember me:</label>
+        <input type="checkbox" name="remember" value="63072000" checked="checked" />
+        <br/>
       </fieldset>
+      <input name="s" id="s" type="submit" class="btn primary" value="Sign In"/>
+      &mdash;
+      <a href="${h.url_for('reset')}">Forgot your password?</a>
     </form>
     <br/> 
     <!-- Simple OpenID Selector -->