diff --git a/main.py b/main.py index 790b5559..b0ec0c4f 100644 --- a/main.py +++ b/main.py @@ -45,9 +45,8 @@ def include_file(filename, start_line=0, end_line=None, glue=''): def cards(pages, columns=1, style="cards", force_version=False): current_page = env.variables.page absolute_url = current_page.abs_url - canonical = current_page.canonical_url - url_parts = re.search("//([^/]+)/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", canonical) - (site, project, edition, language, version) = url_parts.groups() + url_parts = re.search("^/([^/]+)/([^/]+)/([^/]+)/([^/]+)/", absolute_url) + (project, edition, language, version) = url_parts.groups() version = force_version or version if isinstance(pages, str): @@ -73,8 +72,6 @@ def cards(pages, columns=1, style="cards", force_version=False): cards.append( CARDS_TEMPLATE % ( '/'.join(( - '', - site, project, edition, language, @@ -83,7 +80,6 @@ def cards(pages, columns=1, style="cards", force_version=False): )), doc_meta['short'] or doc_meta['title'], doc_meta['description'] or " " - # site_url ) )