Commit 1502a778 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Layout of menu bars were broken.

parent 27c4c89f
<!-- aside_menu.tt2 -->
[% IF not top_menu %]
<aside class="medium-3 columns show-for-medium-up">
<aside class="medium-3 columns show-for-medium">
[% IF conf.logo_html_definition %]
<div id="logo" >[% conf.logo_html_definition %]</div>
[% ELSE %]
......@@ -36,7 +36,7 @@
</menu>
</aside>
[% ELSE %]
<aside class="medium-3 columns show-for-medium-up">
<aside class="medium-3 columns show-for-medium">
[% IF list %]
<menu class="list">
<ul>
......@@ -48,37 +48,40 @@
[% 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 %]
[% 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 hide-for-medium" id="sympa-sub-bar" role="navigation">
<menu class="top-bar-right">
<ul class="vertical menu drilldown" data-drilldown>
[% PROCESS list_menu.tt2 %]
</ul>
</menu>
</nav>
[% END %]
[% 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">
<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%]General Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-sub-bar"></a>
</div>
</div>
<nav class="top-bar hide-for-medium" id="sympa-sub-bar" role="navigation">
<menu class="top-bar-right">
<ul class="vertical menu drilldown" data-drilldown>
[% IF user.email %]
[% PROCESS login_menu.tt2 %]
[% ELSE %]
......@@ -93,4 +96,3 @@
</nav>
[% END %]
<!-- end aside_menu.tt2 -->
<!-- header.tt2 -->
<header>
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area large-2 columns show-for-large-up">
<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%]Sympa Menu[%END%]</span></a></li>
</ul>
<div class="title-bar"
data-responsive-toggle="sympa-top-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%]Sympa Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-top-bar"></a>
</div>
</div>
<ul class="title-area hide-for-large-up">
<li class="name">
<nav class="top-bar" id="sympa-top-bar" role="navigation">
<ul class="top-bar-left large-2 columns show-for-medium">
<li class="name>
<span class="menu-text">
[% 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%]Sympa Menu[%END%]</span></a></li>
</span>
</li>
</ul>
<menu class="top-bar-section">
<ul class="right">
<menu class="top-bar-right">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
<!-- sympa menu start -->
[% PROCESS 'sympa_menu.tt2' %]
<!-- end of sympa menu-->
[% IF user.email %]
<li class="has-dropdown">
<li>
<a href="#"><i class="fa fa-user"></i> [% IF user.gecos %] [% user.gecos %][% ELSE %] [% user.email %] [% END %]</a>
<ul class="dropdown">
<ul class="vertical menu">
[% END %]
<!-- login banner start -->
[% PROCESS 'loginbanner.tt2' %]
......
......@@ -70,8 +70,8 @@
[% END %]
[% IF is_owner || is_editor %]
<li class="has-dropdown" ><a href="[% 'modindex' | url_rel([list]) %]">[%|loc%]Moderate[% END %]</a>
<ul class="dropdown">
<li><a href="[% 'modindex' | url_rel([list]) %]">[%|loc%]Moderate[% END %]</a>
<ul class="vertical menu">
[% IF is_editor %]
[% IF action == 'modindex' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'modindex' | url_rel([list]) %]">[%|loc%]Message[%END%] ([% mod_message %]) </a></li>
......
......@@ -117,9 +117,9 @@
<li class="divider hide-for-small"></li>
[% END %]
[% IF use_passwd == '1' %]
<li id="login-dropdown" class="has-dropdown">
<li id="login-dropdown">
<a href="#"><i class="fa fa-user"></i> [%|loc%]Login[%END%]</a>
<ul class="dropdown">
<ul class="vertical menu">
<form action="[% path_cgi %]" method="post">
<fieldset>
<input type="hidden" name="previous_action" value="[% previous_action %]" />
......
......@@ -42,10 +42,10 @@
<div class="small-6 medium-3 columns">
<strong>[%|loc%]Subject[%END%]</strong>
</div>
<div class="medium-2 columns show-for-medium-up">
<div class="medium-2 columns show-for-medium">
<strong>[%|loc%]Date[%END%]</strong>
</div>
<div class="medium-2 columns show-for-medium-up">
<div class="medium-2 columns show-for-medium">
<strong>[%|loc%]Size[%END%]</strong>
</div>
</div>
......@@ -100,7 +100,7 @@
[% msg.value.date %]
[%~ END %]
</div>
<div class="show-for-medium-up medium-2 columns">
<div class="show-for-medium medium-2 columns">
[% msg.value.size %] [%|loc%]Kbytes[%END%]
</div>
</div>
......
<!-- nav.tt2 -->
[% IF action == 'create_list_request' %]
[% IF all_lists.size > 0 ~%]
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]Create List Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section">
<ul class="left">
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Create List Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
<li><a href="#list_create">[%|loc%]Create a list using a template[%END%]</a></li>
<li class="divider"></li>
<li><a href="#list_copy">[%|loc%]Copy an existing list[%END%]</a></li>
......@@ -21,25 +25,29 @@
[% END %]
[% IF action == 'serveradmin' or action == 'skinsedit' or action == 'edit_config' or action == 'get_pending_lists' or action == 'get_closed_lists' or action == 'get_latest_lists' or action == 'get_inactive_lists' %]
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]Listmaster Admin Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section">
<ul class="left">
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Listmaster Admin Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
[% IF (subaction == '' or subaction == 'm_lists') and action != 'skinsedit' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="has-dropdown [% class %]"><a href="[% 'serveradmin/m_lists' | url_rel %]">[%|loc%]Lists[%END%]</a>
<ul class="dropdown">
<li class="[% class %]"><a href="[% 'serveradmin/m_lists' | url_rel %]">[%|loc%]Lists[%END%]</a>
<ul class="vertical menu">
<li><a href="[% 'get_pending_lists' | url_rel %]">[%|loc%]View Pending (Requested) lists[%END%]</a></li>
<li><a href="[% 'get_closed_lists' | url_rel %]">[%|loc%]View Closed Lists[%END%]</a></li>
<li><a href="[% 'get_latest_lists' | url_rel %]">[%|loc%]View Lists sorted by Creation Date[%END%]</a></li>
<li><a href="[% 'get_inactive_lists' | url_rel %]">[%|loc%]View Lists sorted by Last Message Date[%END%]</a></li>
</ul>
</li>
</li>
[% IF subaction == 'users' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'serveradmin/users' | url_rel %]">[%|loc%]Users[%END%]</a></li>
[% IF subaction == 'archives' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
......@@ -73,17 +81,23 @@
[% IF action == 'lists' %]
<h2>[%|loc%]Index of lists[%END%]</h2>
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
[% letters = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','others' ] %]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]Index of lists[%END%]</span></a></li>
</ul>
<menu class="top-bar-section">
<ul class="left">
[% letters = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','others' ] ~%]
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Index of lists[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
[% FOREACH letter IN letters %]
[% IF orderedlist.$letter.0 %]
<li class="letter"><a href="#[%letter%]">[%IF letter == 'others'%][%|loc%]others[%END%][%ELSE%][%letter%][%END%]</a></li>
......@@ -106,19 +120,24 @@
[% IF action == 'admin' || action_type == 'admin' || action == 'editfile' %]
<h2>[%|loc%]Basic Operations[%END%]</h2>
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section">
<ul class="left">
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
[% IF action == 'edit_list_request' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="has-dropdown [% class %]"><a href="[% 'edit_list_request' | url_rel([list,'description']) %]">[%|loc%]Edit List Config[%END%]</a>
<ul class="dropdown">
<li class="[% class %]"><a href="[% 'edit_list_request' | url_rel([list,'description']) %]">[%|loc%]Edit List Config[%END%]</a>
<ul class="vertical menu">
[% IF group == 'description' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'edit_list_request' | url_rel([list,'description']) %]" >[%|loc%]List definition[%END%]</a></li>
[% IF group == 'sending' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
......@@ -187,17 +206,24 @@
[% END %]
[% IF action == 'compose_mail' %]
[%# Remove the class "menu-icon" to get rid of menu icon.
Take out inner text of span element to just have icon alone. ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>[%|loc%]Menu[%END%]</span></a></li>
</ul>
<menu class="top-bar-section">
<ul class="left">
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
[% IF action == 'edit_list_request' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
[% IF subaction == '' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
<li class="[% class %]"><a href="[% 'compose_mail' | url_rel([list]) %]">[%|loc%]Send a message[%END%]</a></li>
[% IF subaction == 'html_news_letter' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'compose_mail' | url_rel([list,'html_news_letter']) %]">[%|loc%]Send an html page[%END%]</a></li>
......@@ -207,13 +233,21 @@
[% END %]
[% IF action == 'd_read' ~%]
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li calss="name"> </li>
<li class="toggle-topbar menu-icon">
<a href="#"><span>[%|loc%]Menu[%END%]</span></a> </li>
<menu class="top-bar-section">
<ul class="left">
<div class="title-bar"
data-responsive-toggle="sympa-nav-bar" data-hide-for="medium">
<div class="title-bar-right">
<div class="title-bar-title">
<span>[%|loc%]Menu[%END%]</span>
</div>
<a class="menu-icon" href="#" data-toggle="sympa-nav-bar"></a>
</div>
</div>
<nav class="top-bar" id="sympa-nav-bar">
<menu class="top-bar-left">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
<li class="[% UNLESS expert_page %]active not-click[%END%]">
<a href="[% 'd_read' | url_rel([list,shared_doc.paths_d],{type=>'directory',previous_action=>'d_read',show_user_page=>'1'}) %]">
<i class="fa fa-user "></i> [%|loc%]User mode[%END%]</a> </li>
......@@ -222,8 +256,7 @@
<a href="[% 'd_read' | url_rel([list,shared_doc.paths_d],{type=>'directory',previous_action=>'d_read',show_expert_page=>'1'}) %]">
<i class="fa fa-cogs"></i> [%|loc%]Expert mode[%END%]</a> </li>
</ul>
</menu>
</ul>
</menu>
</nav>
[%~ END %]
......
......@@ -16,9 +16,9 @@
[% END %]
[% IF top_menu %]
[% IF action == 'search_list_request' or action == 'lists' or action == 'lists_categories' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="has-dropdown [% class %]">
<li class="[% class %]">
<a href="#"><i class="fa fa-search-plus"></i> [%|loc%]Search for List(s)[%END%]</a>
<ul class="dropdown">
<ul class="vertical menu">
[% END %]
[% IF action == 'search_list_request' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'search_list_request' | url_rel %]"><i class="fa fa-search"></i> [%|loc%]Search form[%END%]</a></li>
......@@ -32,9 +32,9 @@
[% END %]
[% IF action == 'help' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
[% IF top_menu %]
<li class="has-dropdown [% class %]">
<li class="[% class %]">
<a href="#"><i class="fa fa-life-ring"></i> [%|loc%]Support[%END%]</a>
<ul class="dropdown">
<ul class="vertical menu">
[% END %]
[% IF action == 'help' && help_topic != 'faq' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'help' | url_rel %]" title="[%|loc%]Documentation[%END%]"><i class="fa fa-book"></i> [%|loc%]Documentation[%END%]</a></li>
......@@ -75,9 +75,9 @@
[% END %]
[% IF top_menu %][% IF action == 'create_automatic_list_request' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %][% END %]
[% IF owns_family %]
<li class="has-dropdown [% class %]">
<li class="[% class %]">
<a href="#"><i class="fa fa-list-alt"></i> [%|loc%]Lists Families[%END%]</a>
<ul class="dropdown">
<ul class="vertical menu">
[% family_li %]
</ul>
</li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment