Skip to content

Commit

Permalink
Merge pull request #187 from ikedas/foundation6 by ikedas
Browse files Browse the repository at this point in the history
#170: Least fixup
  • Loading branch information
ikedas authored Apr 30, 2018
2 parents 3a4d1e2 + 4cb0380 commit 3a6c873
Show file tree
Hide file tree
Showing 17 changed files with 693 additions and 536 deletions.
1 change: 0 additions & 1 deletion default/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ nobase_default_DATA = \
web_tt2/main.tt2 \
web_tt2/manage_template.tt2 \
web_tt2/modindex.tt2 \
web_tt2/modform.tt2 \
web_tt2/my.tt2 \
web_tt2/nav.tt2 \
web_tt2/news.tt2 \
Expand Down
132 changes: 57 additions & 75 deletions default/web_tt2/aside_menu.tt2
Original file line number Diff line number Diff line change
@@ -1,96 +1,78 @@
<!-- aside_menu.tt2 -->
[% IF not top_menu %]
<aside class="medium-3 columns show-for-medium-up">
[% IF conf.logo_html_definition %]
<div id="logo" >[% conf.logo_html_definition %]</div>
[% ELSE %]
<div id="logo" ><a href="[% conf.wwsympa_url %]" title="[% conf.wwsympa_url %]"><img src="[% icons_url %]/logo_sympa.png" alt="[%|loc%]SYMPA logo[%END%]" /></a></div>
[% END %]

[% IF user.email %]
<menu class="user">
<ul>
[% PROCESS login_menu.tt2 %]
</ul>
</menu>
[% ELSE %]
<menu class="connect">
<ul>
[% PROCESS loginbanner.tt2 %]
</ul>
</menu>
[% END %]

[% IF list %]
<menu class="list">
<ul>
[% PROCESS list_menu.tt2 %]
</ul>
</menu>
[% END %]

<menu class="sympa">
<ul>
[% PROCESS 'sympa_menu.tt2' %]
</ul>
</menu>
</aside>
[% ELSE %]
<aside class="medium-3 columns show-for-medium-up">
[% IF list %]
<menu class="list">
<ul>
[% PROCESS list_menu.tt2 %]
</ul>
</menu>
[% END %]
</aside>
[% END %]

<!-- for responsive view -->
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
[%~ IF top_menu %]
<aside class="medium-3 columns">
[% IF list %]
<nav class="top-bar row hide-for-medium-up" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]List Options Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section hide-for-medium-up">
<ul class="right">
[% PROCESS list_menu.tt2 %]
<div class="title-bar"
data-responsive-toggle="sympa-sub-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]List Options Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-sub-bar"></a>
</div>
</div>

<nav class="top-bar" id="sympa-sub-bar" role="navigation">
<menu class="top-bar-left list">
<ul class="vertical menu"
data-responsive-menu="drilldown medium-accordion">
[% PROCESS list_menu.tt2 %]
</ul>
</menu>
</nav>
[% END %]
</aside>
[% ELSE %]
<nav class="top-bar row hide-for-medium-up" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
[% IF conf.logo_html_definition %]
[% conf.logo_html_definition %]
[% ELSE %]
<a href="[% conf.wwsympa_url %]" title="[% conf.wwsympa_url %]"><img src="[% icons_url %]/logo_sympa.png" alt="[%|loc%]SYMPA logo[%END%]" /></a>
[% END %]
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]General Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section hide-for-medium-up">
<ul class="right">
<aside class="medium-3 columns">

<div id="logo" class="show-for-medium">
[% IF conf.logo_html_definition ~%]
[% conf.logo_html_definition %]
[%~ ELSE ~%]
<a href="[% conf.wwsympa_url %]" title="[% conf.wwsympa_url %]"><img src="[% icons_url %]/logo_sympa.png" alt="[%|loc%]SYMPA logo[%END%]" /></a>
[%~ END %]
</div>

<div class="title-bar"
data-responsive-toggle="sympa-sub-bar" data-hide-for="medium">
<a class="menu-text" href="[% conf.wwsympa_url %]"
title="[% conf.wwsympa_url %]"><img src="[% icons_url %]/logo_sympa.png"
alt="[%|loc%]SYMPA logo[%END%]" /></a>
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]General Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-sub-bar"></a>
</div>
</div>

<nav class="top-bar" id="sympa-sub-bar" role="navigation">
[% IF user.email %]
<menu class="top-bar-left user">
<ul class="nested vertical menu">
[% PROCESS login_menu.tt2 %]
</ul>
</menu>
[% ELSE %]
<li> [% PROCESS loginbanner.tt2 %]</li>
<menu class="top-bar-left connect">
<ul class="nested vertical menu">
[% PROCESS loginbanner.tt2 %]
</ul>
</menu>
[% END %]
[% IF list %]
<menu class="top-bar-left list">
<ul class="nested vertical menu">
[% PROCESS list_menu.tt2 %]
</ul>
</menu>
[% END %]
<menu class="top-bar-left sympa">
<ul class="nested vertical menu">
[% PROCESS 'sympa_menu.tt2' %]
</ul>
</menu>
</nav>
</aside>
[% END %]
<!-- end aside_menu.tt2 -->

Loading

0 comments on commit 3a6c873

Please sign in to comment.