[ckan-changes] [okfn/ckan] 356cd3: Tidying up some template CSS classes.

Thu Apr 19 18:34:35 UTC 2012

Branch: refs/heads/release-v1.6.1
  Home:   https://github.com/okfn/ckan
  Commit: 356cd32fea9af5a1dc17004802e2033d06fc7f2f
      https://github.com/okfn/ckan/commit/356cd32fea9af5a1dc17004802e2033d06fc7f2f
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M ckan/templates/tag/index.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html

  Log Message:
  -----------
  Tidying up some template CSS classes.

diff --git a/ckan/templates/tag/index.html b/ckan/templates/tag/index.html
index 9aa3d61..50e44f7 100644
--- a/ckan/templates/tag/index.html
+++ b/ckan/templates/tag/index.html
@@ -8,9 +8,9 @@
   <div py:match="content">
     <h2>Tags</h2>
 
-    <form id="tag-search" action="" method="GET">
+    <form class="form-inline" id="tag-search" action="" method="GET">
       <input type="text" id="q" name="q" value="${c.q}" />
-      <input type="submit" name="search" value="Search »" />
+      <input class="btn btn-primary" type="submit" name="search" value="Search »" />
     </form>
     
     <hr />
diff --git a/ckan/templates/user/list.html b/ckan/templates/user/list.html
index 2213db8..712b100 100644
--- a/ckan/templates/user/list.html
+++ b/ckan/templates/user/list.html
@@ -8,9 +8,10 @@
   
   <py:match path="primarysidebar">
     <li class="widget-container widget_text">
-      <form id="user-search" class="user-search" action="" method="GET">
-        <input type="text" id="q" name="q" value="${c.q}" />
-        <input type="submit" class="btn btn-small" name="" value="Search »" />
+      <h3>Search Users</h3>
+      <form id="user-search" class="form-inline user-search" action="" method="GET">
+        <input type="text" class="input-medium" id="q" name="q" value="${c.q}" />
+        <input type="submit" class="btn btn-small btn-primary" name="" value="Search »" />
       </form>
       <p py:if="c.q" i18n:msg="item_count">
         <strong>${c.page.item_count}</strong> users found.
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
index 9efdb87..85fcc59 100644
--- a/ckan/templates/user/login.html
+++ b/ckan/templates/user/login.html
@@ -18,25 +18,33 @@
   
   <py:def function="page_title">Login - User</py:def>
   <py:def function="page_heading">Login to ${g.site_title}</py:def>
+  <py:def function="body_class">no-sidebar</py:def>
 
   <div py:match="content">
     
-    <form action="${h.url_for('/login_generic')}" method="post" class="simple-form" id="login">  
+    <form action="${h.url_for('/login_generic')}" method="post" class="form-horizontal" id="login">  
       <fieldset>
         <!--legend i18n:msg="site_title">Login</legend-->
-
-        <label for="login">Login:</label>
-        <input type="text" name="login" value="" />
-        <br/>
-        <label for="password">Password:</label>
-        <input type="password" name="password" value="" />
+        <div class="control-group">
+          <label class="control-label" for="login">Login:</label>
+          <div class="controls">
+            <input type="text" name="login" value="" />
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="password">Password:</label>
+          <div class="controls">
+            <input type="password" name="password" value="" />
+          </div>
+        </div>
         <!-- 50 year timeout -->
         <input type="hidden" name="remember" value="1576800000" />
-        <br/>
       </fieldset>
-      <input name="s" id="s" type="submit" class="btn primary" value="Sign In"/>
-      — 
-      <a href="${h.url_for('reset')}">Forgot your password?</a>
+      <div class="form-actions">
+        <input name="s" id="s" type="submit" class="btn btn-primary" value="Sign In"/>
+        — 
+        <a href="${h.url_for('reset')}">Forgot your password?</a>
+      </div>
     </form>
     <br/> 
     <!-- Simple OpenID Selector -->
diff --git a/ckan/templates/user/logout.html b/ckan/templates/user/logout.html
index e40ec5c..0f37272 100644
--- a/ckan/templates/user/logout.html
+++ b/ckan/templates/user/logout.html
@@ -6,6 +6,7 @@
 
   <py:def function="page_title">Logout</py:def>
   <py:def function="page_heading">Logout from ${g.site_title}</py:def>
+  <py:def function="body_class">no-sidebar</py:def>
 
   <div py:match="content">
     <p>You have logged out successfully.</p>


================================================================

