diff --git a/assets/images/docs.png b/assets/images/docs.png index 33daca6b..f0122136 100644 Binary files a/assets/images/docs.png and b/assets/images/docs.png differ diff --git a/assets/images/docs@2x.png b/assets/images/docs@2x.png index 83eee866..73877a2f 100644 Binary files a/assets/images/docs@2x.png and b/assets/images/docs@2x.png differ diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json index d4b9263c..5af9cee1 100644 --- a/assets/javascripts/news.json +++ b/assets/javascripts/news.json @@ -1,7 +1,7 @@ [ [ "2016-09-18", - "New documentation: Twig" + "New documentations: pandas and Twig" ], [ "2016-09-05", "New documentations: Fish, Bottle and scikit-image" diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index ced81f1d..a2e84f6e 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -399,6 +399,11 @@ credits = [ '2010-2016 Padrino', 'MIT', 'https://raw.githubusercontent.com/padrino/padrino-framework/master/padrino/LICENSE.txt' + ], [ + 'pandas', + '2011-2012 Lambda Foundry, Inc. and PyData Development Team
© 2008-2011 AQR Capital Management, LLC
© 2008-2014 the pandas development team', + 'BSD', + 'https://raw.githubusercontent.com/pydata/pandas/master/LICENSE' ], [ 'Perl', '1993-2016 Larry Wall and others', diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss index 71075c8b..7b5d6861 100644 --- a/assets/stylesheets/global/_icons.scss +++ b/assets/stylesheets/global/_icons.scss @@ -119,6 +119,7 @@ ._icon-fish:before { background-position: -5rem -6rem; @extend %darkIconFix !optional; } ._icon-scikit_image:before { background-position: -6rem -6rem; } ._icon-twig:before { background-position: -7rem -6rem; } +._icon-pandas:before { background-position: -8rem -6rem; } ._icon-bottle:before { background-position: 0 -7rem; } ._icon-docker:before { background-position: -1rem -7rem; } ._icon-cakephp:before { background-position: -2rem -7rem; } diff --git a/assets/stylesheets/pages/_sphinx.scss b/assets/stylesheets/pages/_sphinx.scss index 31c3dc19..a5984709 100644 --- a/assets/stylesheets/pages/_sphinx.scss +++ b/assets/stylesheets/pages/_sphinx.scss @@ -1,5 +1,6 @@ %sphinx { - h2, h3 { @extend %block-heading; } + h2 { @extend %block-heading; } + h3 { @extend %block-label; } h4 { font-size: 1em; } > dl:not(.docutils) > dt { @extend %block-label, %label-blue; } dd > dl:not(.docutils) > dt { @extend %block-label; } diff --git a/lib/docs/filters/pandas/clean_html.rb b/lib/docs/filters/pandas/clean_html.rb index e8cd74ae..d1c0239a 100644 --- a/lib/docs/filters/pandas/clean_html.rb +++ b/lib/docs/filters/pandas/clean_html.rb @@ -4,6 +4,17 @@ module Docs def call @doc = at_css('.body') + if root_page? + css('a[href$=".zip"]', 'a[href$=".pdf"]', '.toctree-wrapper').remove + at_css('h1').content = 'pandas' + end + + css('h2 > a.reference', 'h3 > a.reference').each do |node| + node.before(node.children).remove + end + + css('.anchor-link').remove + doc end end diff --git a/lib/docs/filters/pandas/entries.rb b/lib/docs/filters/pandas/entries.rb index 5ccd9615..4edcd6ea 100644 --- a/lib/docs/filters/pandas/entries.rb +++ b/lib/docs/filters/pandas/entries.rb @@ -2,20 +2,25 @@ module Docs class Pandas class EntriesFilter < Docs::EntriesFilter def get_name - if dt = at_css('dt') - name = dt.content.strip + if subpath.start_with?('generated') + name = at_css('dt').content.strip name.sub! %r{\(.*}, '()' name.remove! %r{\s=.*} - name.remove! %r{\A(class(method)?) } + name.remove! %r{\A(class(method)?) (pandas\.)?} else name = at_css('h1').content.strip + name.prepend "#{css('.toctree-l1 > a:not([href^="http"])').to_a.index(at_css('.toctree-l1.current > a')) + 1}. " end name.remove! "\u{00B6}" name end def get_type - css(".toctree-l2.current > a").last.content + if subpath.start_with?('generated') + css('.toctree-l2.current > a').last.content + else + 'Manual' + end end end end diff --git a/lib/docs/filters/sphinx/clean_html.rb b/lib/docs/filters/sphinx/clean_html.rb index c5d11d2f..e005f8da 100644 --- a/lib/docs/filters/sphinx/clean_html.rb +++ b/lib/docs/filters/sphinx/clean_html.rb @@ -49,7 +49,7 @@ module Docs end css('dt').each do |node| - next unless node['id'] || node.at_css('code') + next unless node['id'] || node.at_css('code, .classifier') links = [] links << node.children.last.remove while node.children.last.try(:name) == 'a' node.inner_html = "#{node.content.strip} " diff --git a/lib/docs/scrapers/pandas.rb b/lib/docs/scrapers/pandas.rb index 418bd952..db6d06a3 100644 --- a/lib/docs/scrapers/pandas.rb +++ b/lib/docs/scrapers/pandas.rb @@ -2,7 +2,7 @@ module Docs class Pandas < UrlScraper self.name = 'pandas' self.type = 'sphinx' - self.root_path = 'api.html' + self.root_path = 'index.html' self.links = { home: 'http://pandas.pydata.org/', code: 'https://github.com/pydata/pandas' @@ -13,12 +13,13 @@ module Docs # Cannot take only the body, as the sidebar gives info about the type. options[:container] = '.document' - # Using the above container, leads to tons of anchors. Only keep the generated/ pages. - options[:only_patterns] = [/\Agenerated\//] + options[:skip] = %w(internals.html release.html contributing.html whatsnew.html) options[:attribution] = <<-HTML - © 2008–2014, the pandas development team.
- Licensed under the BSD license. + © 2011–2012 Lambda Foundry, Inc. and PyData Development Team
+ © 2008–2011 AQR Capital Management, LLC
+ © 2008–2014 the pandas development team
+ Licensed under the 3-clause BSD License. HTML version '0.18' do diff --git a/public/icons/docs/pandas/16.png b/public/icons/docs/pandas/16.png index 8618dd6e..cdc075ef 100644 Binary files a/public/icons/docs/pandas/16.png and b/public/icons/docs/pandas/16.png differ diff --git a/public/icons/docs/pandas/16@2x.png b/public/icons/docs/pandas/16@2x.png index 85c1f400..ef9a0e29 100644 Binary files a/public/icons/docs/pandas/16@2x.png and b/public/icons/docs/pandas/16@2x.png differ