[#1788]: Updated to IE7 Bootstrap compatibility: Authorization group …

…nav; Admin nav
ckan · Mar 27, 2012 · e142366 · e142366
1 parent e69359f
commit e142366
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 40 deletions.
diff --git a/ckan/controllers/authorization_group.py b/ckan/controllers/authorization_group.py
@@ -151,6 +151,7 @@ def authz(self, id):
             abort(404, _('Group not found'))
 
         c.authorization_group_name = authorization_group.name
+        c.authorization_group = authorization_group
 
         c.authz_editable = self.authorizer.am_authorized(c, model.Action.EDIT_PERMISSIONS, 
                                                          authorization_group)

diff --git a/ckan/templates/admin/layout.html b/ckan/templates/admin/layout.html
@@ -5,21 +5,15 @@
   py:strip=""
   >
   <py:match path="minornavigation">
-    <ul class="tabbed">
-      <li py:attrs="{'class':'current-tab'} if c.action=='index' else {}">
-        <a href="${h.url_for('ckanadmin', action='index')}">
-          Home
-        </a>
+    <ul class="nav nav-pills">
+      <li class="${'active' if c.action=='index' else ''}">
+        <a href="${h.url_for('ckanadmin', action='index')}">Home</a>
       </li>
-      <li py:attrs="{'class':'current-tab'} if c.action=='authz' else {}">
-        <a href="${h.url_for('ckanadmin', action='authz')}">
-          Authorization
-        </a>
+      <li class="${'active' if c.action=='authz' else ''}">
+        <a href="${h.url_for('ckanadmin', action='authz')}">Authorization</a>
       </li>
-      <li py:attrs="{'class':'current-tab'} if c.action=='trash' else {}">
-        <a href="${h.url_for('ckanadmin', action='trash')}">
-          Trash
-        </a>
+      <li class="${'active' if c.action=='trash' else ''}">
+        <a href="${h.url_for('ckanadmin', action='trash')}">Trash</a>
       </li>
     </ul>
   </py:match>

diff --git a/ckan/templates/authorization_group/layout.html b/ckan/templates/authorization_group/layout.html
@@ -6,15 +6,19 @@
   py:strip=""
   >
 
-  <py:match path="minornavigation" py:if="c.authorization_group">
-  <ul class="tabbed">
-    <li py:attrs="{'class':'current-tab'} if c.action=='read' else {}">${h.subnav_link(c, h.icon('authorization_group') + _('View'), controller='authorization_group', action='read', id=c.authorization_group.name or c.authorization_group.id)}</li>
-    <li py:attrs="{'class':'current-tab'} if c.action=='edit' else {}" py:if="h.check_access('authorization_group_update',{'id':c.authorization_group.id})">
-      ${h.subnav_link(c, h.icon('authorization_group_edit') + _('Edit'), controller='authorization_group', action='edit', id=c.authorization_group.name or c.authorization_group.id)}
-    </li>
-    <li py:attrs="{'class':'current-tab'} if c.action=='authz' else {}" py:if="h.check_access('authorization_group_edit_permissions',{'id':c.authorization_group.id})">
-      ${h.subnav_link(c, h.icon('lock') + _('Authorization'), controller='authorization_group', action='authz', id=c.authorization_group.name or c.authorization_group.id)}
-    </li>
+  <py:match path="minornavigation">
+  <ul class="nav nav-pills">
+    <li class="${'active' if c.action=='index' else ''}">${h.subnav_link(c, h.icon('page_white_stack') + _('List'), controller='authorization_group', action='index')}</li>
+    <py:if test="c.authorization_group">
+      <li class="divider">|</li>
+      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(c, h.icon('authorization_group') + _('View'), controller='authorization_group', action='read', id=c.authorization_group.name or c.authorization_group.id)}</li>
+      <li class="${'active' if c.action=='edit' else ''}" py:if="h.check_access('authorization_group_update',{'id':c.authorization_group.id})">
+        ${h.subnav_link(c, h.icon('authorization_group_edit') + _('Edit'), controller='authorization_group', action='edit', id=c.authorization_group.name or c.authorization_group.id)}
+      </li>
+      <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('authorization_group_edit_permissions',{'id':c.authorization_group.id})">
+        ${h.subnav_link(c, h.icon('lock') + _('Authorization'), controller='authorization_group', action='authz', id=c.authorization_group.name or c.authorization_group.id)}
+      </li>
+    </py:if>
   </ul>
   </py:match>
 

diff --git a/ckan/templates/package/form_fields.html b/ckan/templates/package/form_fields.html
@@ -2,12 +2,6 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
 
-<script type="text/javascript">
-  jQuery(document).ready(function($) {
-    CKAN.Utils.PackageSlugCreator.create($('#Dataset--title'), $('#Dataset--name'));
-  });
-</script>
-
   <py:def function="form_fields(field_group)">
     <?python 
       fields = []
@@ -45,18 +39,6 @@
               <dd class="hints">${field.metadata['hints']}</dd>
             </py:if>
             <dd py:for="error in field.errors" class="field_error">${_(error)}</dd>    
-
-            <py:if test="c.fieldset.focus == field or c.fieldset.focus is True">
-              <py:if test="not field.is_readonly()">
-                <script type="text/javascript">
-//<![CDATA[
-$(document).ready(function () {
-      $("#${field.renderer.name}").focus();
-});
-//]]>
-                </script>
-              </py:if>
-            </py:if>
           </py:if>
         </py:for>
       </dl>