richie 2.34.1.dev23__py2.py3-none-any.whl → 2.34.1.dev25__py2.py3-none-any.whl

richie/apps/core/templates/menu/header_menu.html

@@ -2,43 +2,47 @@
 
 {% for child in children %}
     {% with children_slug=child.get_menu_title|slugify menu_options=child.menu_extension %}
-        <li class="topbar__item
-            {% if menu_options.allow_submenu and child.children %}dropdown{% endif %}
-            {% if menu_options.allow_submenu and menu_options.menu_color %} topbar__item--{{ menu_options.menu_color }}{% endif %}
-            {% if child.selected or child.attr.redirect_url == current_page.get_absolute_url %} topbar__item--selected{% endif %}
-            {% if child.ancestor %} topbar__item--ancestor{% endif %}
-            {% if child.sibling %} topbar__item--sibling{% endif %}
-            {% if child.descendant %} topbar__item--descendant{% endif %}"
-        >
-            {% comment %}Dropdown menu for children are only for page with index page
-            extension with a specific option enabled{% endcomment %}
-            {% if menu_options.allow_submenu and child.children %}
-                    <button 
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      aria-controls="dropdown-{{ child.id }}"
-                      id="dropdown-button-{{ child.id }}"
-                    >
-                      {{ child.get_menu_title }}
-                      <svg class="icon" aria-hidden="true">
-                        <use xlink:href="#icon-chevron-down"></use>
-                      </svg>
-                    </button>
-                    <nav 
-                      class="topbar__sublist"
-                      id="dropdown-{{ child.id }}"
-                      aria-labelledby="dropdown-button-{{ child.id }}"
-                    >
-                      <ul role="menu">
-                        {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
-                      </ul>
-                    </nav>
-            {% else %}
-                <a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
-                    {{ child.get_menu_title }}
-                </a>
-            {% endif %}
-        </li>
+        {% with page_url=current_page.get_absolute_url redirect_url=child.attr.redirect_url %}
+            <li class="topbar__item
+                {% if menu_options.allow_submenu and child.children %}dropdown{% endif %}
+                {% if menu_options.allow_submenu and menu_options.menu_color %} topbar__item--{{ menu_options.menu_color }}{% endif %}
+                {% if child.ancestor %} topbar__item--ancestor{% endif %}
+                {% if child.sibling %} topbar__item--sibling{% endif %}
+                {% if child.descendant %} topbar__item--descendant{% endif %}
+                {% if child.selected %} topbar__item--selected
+                {% elif redirect_url and page_url == redirect_url %} topbar__item--selected
+                {% endif %}"
+            >
+                {% comment %}Dropdown menu for children are only for page with index page
+                extension with a specific option enabled{% endcomment %}
+                {% if menu_options.allow_submenu and child.children %}
+                        <button
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            aria-controls="dropdown-{{ child.id }}"
+                            id="dropdown-button-{{ child.id }}"
+                        >
+                            {{ child.get_menu_title }}
+                            <svg class="icon" aria-hidden="true">
+                                <use xlink:href="#icon-chevron-down"></use>
+                            </svg>
+                        </button>
+                        <nav
+                            class="topbar__sublist"
+                            id="dropdown-{{ child.id }}"
+                            aria-labelledby="dropdown-button-{{ child.id }}"
+                        >
+                            <ul role="menu">
+                                {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
+                            </ul>
+                        </nav>
+                {% else %}
+                    <a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
+                        {{ child.get_menu_title }}
+                    </a>
+                {% endif %}
+            </li>
+        {% endwith %}
     {% endwith %}
 {% endfor %}
 

{richie-2.34.1.dev23.dist-info → richie-2.34.1.dev25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: richie
-Version: 2.34.1.dev23
+Version: 2.34.1.dev25
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-2.34.1.dev23.dist-info → richie-2.34.1.dev25.dist-info}/RECORD

@@ -894,7 +894,7 @@ richie/apps/core/templates/djangocms_video/default/video_player.html,sha256=6sLP
 richie/apps/core/templates/djangocms_video/full-width/video_player.html,sha256=X6SPaxKGHKwVDoP6H9AGS9Sl-NmKIjKhUUYP7THU9n0,123
 richie/apps/core/templates/menu/breadcrumb_item.html,sha256=dRSuDI12o85cPsSseuzgUbkEIvxG9nz14jelFIODvtw,285
 richie/apps/core/templates/menu/breadcrumbs.html,sha256=tvKDobvDogY-B5SPsF0pgEVNa2D6lVOAIf5rKUbkXvM,300
-richie/apps/core/templates/menu/header_menu.html,sha256=Wlev0hpQD-ByYqGjK0tzqb7EwECwzHe8-NwLFJctXF0,2171
+richie/apps/core/templates/menu/header_menu.html,sha256=1UuenORE_0e0XRruUZEogV2oPFRvLp2ADLRiQfSsAIY,2515
 richie/apps/core/templates/menu/language_menu.html,sha256=x1hGxia3pv4l7YKa8ziJW34gjV8C4MgJ2aeTMLIO1fg,803
 richie/apps/core/templates/menu/menu.html,sha256=hXRtIwCZHGuUmNKAX79oj8AfNznIKw0yXXzu3Ezp_iA,864
 richie/apps/core/templates/richie/base.html,sha256=oboUl8ifCYCSwmGU6fZvnMQNExjAs03ogiMaR_VO9d0,21247
@@ -2474,9 +2474,9 @@ richie/static/richie/js/build/9986.058a216db3bba2db30ae.index.js,sha256=YZTuD2Zq
 richie/static/richie/js/build/99895.058a216db3bba2db30ae.index.js,sha256=h1YYGHeo8oCSliYfI_xAakYX_lCb02Bo291YxevGfbw,2570
 richie/static/richie/js/build/99953.058a216db3bba2db30ae.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=2GRBOGjixStzjiMagbJTC1I_dp_fJE8bS_3CDMl515w,1332005
-richie-2.34.1.dev23.dist-info/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-2.34.1.dev23.dist-info/METADATA,sha256=Rz9N0hiiSyCbngeH_51HuwjYgA8ge_SCYOoBTLv5Yn0,6987
-richie-2.34.1.dev23.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-richie-2.34.1.dev23.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-2.34.1.dev23.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-2.34.1.dev23.dist-info/RECORD,,
+richie-2.34.1.dev25.dist-info/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-2.34.1.dev25.dist-info/METADATA,sha256=rN5aPrfZQ_mwp-MerDWtsdjP81IfmegVKSCfm1NAgpc,6987
+richie-2.34.1.dev25.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+richie-2.34.1.dev25.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-2.34.1.dev25.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-2.34.1.dev25.dist-info/RECORD,,