[#1788]: IE7 compatibility upgrades to Dataset pages.

ckan · Mar 27, 2012 · a630fda · a630fda
1 parent 078631e
commit a630fda
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 33 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -302,6 +302,13 @@ ul.no-break li {
 #minornavigation .nav > li.open > a {
   border-color: #666;
 }
+#minornavigation .caret {
+  border-top-color: #555;
+  margin-left: 8px;
+}
+#minornavigation .nav > li.open .caret {
+  border-top-color: #fff;
+}
 #minornavigation .divider {
   padding: 8px 10px;
   font-size: 14px;
@@ -316,6 +323,9 @@ ul.no-break li {
   margin-bottom: 2px;
   color: #bb2222;
 }
+.dropdown-menu hr {
+  margin: 4px 0;
+}
 .dropdown-menu li:last-child a {
   margin-bottom: 0;
 }

diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
@@ -43,10 +43,6 @@ var CKAN = CKAN || {};
     if (isDatasetView) {
       // Show extract of notes field
       CKAN.Utils.setupNotesExtract();
-      $('.js-scroll-resources').click(function() {
-        var header = $('#dataset-resources > h3:first-child');
-        $("html,body").animate({ scrollTop: header.offset().top }, 500);
-      });
     }
 
     var isResourceView = $('body.package.resource_read').length > 0;

diff --git a/ckan/templates/group/layout.html b/ckan/templates/group/layout.html
@@ -13,7 +13,7 @@
         <li class="${'active' if c.action=='history' else ''}">${h.subnav_named_route(c, h.icon('page_white_stack') + _('History'),  c.group.type + '_action', controller='group', action='history', id=c.group.name)}</li>
         <li class="divider" py:if="can_update">|</li>
         <li class="dropdown ${'active' if c.action=='resource_read' else ''}" py:if="can_update">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('add') + _('Add Dataset')} <b class="caret"></b></a>
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('add') + _('Add Dataset')}<b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="${h.url_for(controller='package', action='new')}?groups__0__id=${c.group.id}">New Dataset...</a></li>
             <li><a href="${h.url_for(controller='group', action='edit', id=c.group.name)}#datasets">Existing Dataset...</a></li>

diff --git a/ckan/templates/package/history.html b/ckan/templates/package/history.html
@@ -42,7 +42,7 @@ <h3 py:if="c.error" class="form-errors">
       </table>
       <input type="submit" name="diff" value="${_('Compare &raquo;')}" class="btn btn-primary" />
     </form>
-  </div> <!-- content -->
+  </div>
 
   <py:def function="optional_feed">
   <link rel="alternate" type="application/atom+xml" title="Dataset History"

diff --git a/ckan/templates/package/layout.html b/ckan/templates/package/layout.html
@@ -5,55 +5,46 @@
   py:strip=""
   >
 
-  <py:match path="minornavigation">
-    <py:if test="c.pkg">
-    <ul class="tabbed">
-      <li py:attrs="{'class':'current-tab'} if c.action=='read' else {}">${h.subnav_link(c, h.icon('package') + _('View'), controller='package', action='read', id=c.pkg.name)}</li>
-
-      <py:choose>
-      <py:when test="len(c.pkg_dict.get('resources', []))==0 and not h.check_access('package_update',{'id':c.pkg.id})">
+  <py:match path="minornavigation" py:if="c.pkg">
+    <ul class="nav nav-pills">
+      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(c, h.icon('package') + _('View'), controller='package', action='read', id=c.pkg.name)}</li>
+      <py:choose test="len(c.pkg_dict.get('resources', []))==0 and not h.check_access('package_update',{'id':c.pkg.id})">
+      <py:when test="True">
         <li class="disabled">
           ${h.icon('package-disabled') + _('Resources (0)')} &nbsp;&nbsp;<img class="dropdown-arrow" src="${h.url_for_static('/images/icons/arrow-open.gif')}"/>
         </li>
       </py:when>
       <py:otherwise>
-        <li class="dropdown" py:attrs="{'class':'current-tab dropdown'} if c.action=='editresources' or c.action=='resource_read' else {'class':'dropdown'}">
+        <li class="dropdown ${'active' if c.action=='resource_read' else ''}">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('page_white_stack') + _('Resources') + ' (' + str(len(c.pkg_dict.get('resources',[]))) + ')'}<b class="caret"></b></a>
           <div class="dropdown-appears">
-            <div class="dropdown-items">
-              <py:if test="h.check_access('package_update',{'id':c.pkg.id})">
+            <ul class="dropdown-menu">
+              <li py:if="h.check_access('package_update',{'id':c.pkg.id})">
                 ${h.link_to(
                   h.icon('page_white_add') + _('Add / Edit resources'), 
                   h.url_for(action='editresources', id=c.pkg.name, controller='package')
                   )}
                 <hr py:if="len(c.pkg_dict.get('resources',[]))>0"/>
-              </py:if>
-              <py:for each="res in c.pkg_dict.get('resources', [])">
-              <a href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">${h.resource_icon(res) + h.resource_display_name(res)}</a>
-              </py:for>
-            </div>
+              </li>
+              <li py:for="res in c.pkg_dict.get('resources', [])">
+                <a href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">${h.resource_icon(res) + h.resource_display_name(res)}</a>
+              </li>
+            </ul>
           </div>
-          <div class="dropdown-appears"><div class="white-box"></div></div>
-          <a href="${h.url_for(controller='package', action='read', id=c.pkg.name)}#dataset-resources" class="js-scroll-resources">${h.icon('page_white_stack') + _('Resources') + ' (' + str(len(c.pkg_dict.get('resources',[]))) + ')'}</a>
-          &nbsp;&nbsp;<img class="dropdown-arrow" src="${h.url_for_static('/images/icons/arrow-open.gif')}"/>
         </li>
       </py:otherwise>
       </py:choose>
-      <li py:attrs="{'class':'current-tab'} if c.action=='history' else {}">${h.subnav_link(c, h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
+      <li class="${'active' if c.action=='history' else ''}">${h.subnav_link(c, h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
       <py:if test="h.check_access('package_update',{'id':c.pkg.id})">
-        <div class="divider">&nbsp;&nbsp;|&nbsp;&nbsp;</div>
-        <li py:attrs="{'class':'current-tab'} if c.action=='edit' else {}">
+        <li class="divider">|</li>
+        <li class="${'active' if c.action=='edit' else ''}">
           ${h.subnav_link(c, h.icon('package_edit') + _('Settings'), controller='package', action='edit', id=c.pkg.name)}
         </li>
       </py:if>
-      <li py:attrs="{'class':'current-tab'} if c.action=='authz' else {}" py:if="h.check_access('package_edit_permissions',{'id':c.pkg.id})">
+      <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('package_edit_permissions',{'id':c.pkg.id})">
         ${h.subnav_link(c, h.icon('lock') + _('Authorization'), controller='package', action='authz', id=c.pkg.name)}
       </li>
-      <!--li class="action">
-        ${h.subnav_link(c, h.icon('atom_feed') + _('Subscribe'),
-        controller='package', action='history', id=c.pkg.name, format='atom', days=7)}
-      </li-->
     </ul>
-    </py:if>
   </py:match>
 
   <xi:include href="../layout.html" />