Project

General

Profile

« Previous | Next » 

Revision 17d07faf

Added by Guillaume Denis over 9 years ago

navbar: active elements styling + divider styling + DOM cleanup (markup fixed, indentation)

View differences:

ckanext/ozwillo_theme/fanstatic/ozwillo.css
114 114
    display: block;
115 115
}
116 116

  
117
.navbar .dropdown-menu .divider {
118
  margin: 5px 0;
119
  border-bottom: 1px solid #e5e5e5;
120
}
121

  
122
.navbar .nav li.dropdown.active>.dropdown-toggle {
123
  background-color: #eeeeee;
124
  box-shadow: none;
125
  text-shadow: none;
126
}
127

  
128
.navbar .dropdown-menu a:hover, .navbar .dropdown-menu a:focus {
129
  background: #eeeeee;
130
}
131

  
132
.navbar .dropdown-menu > .active > a, .navbar .dropdown-menu > .active > a:hover, .navbar .dropdown-menu > .active > a:focus {
133
  background: #6e418e;
134
}
135

  
117 136
/* footer */
118 137
footer .t3-footnav {
119 138
  padding: 16px 0 0;
ckanext/ozwillo_theme/templates/header.html
2 2
{% set current_page = request.environ.CKAN_CURRENT_URL %}
3 3
<nav id="t3-mainnav" class="wrap navbar navbar-default navbar-fixed-top t3-mainnav">
4 4
	<div class="container">
5

  
6
		<!-- Brand and toggle get grouped for better mobile display -->
7 5
		<div class="navbar-header">
8
		
9
			
10
							
11
<button class="btn btn-primary visible-xs-inline-block off-canvas-toggle " type="button" data-pos="left" data-nav="#t3-off-canvas" data-effect="off-canvas-effect-4">
12
  <i class="fa fa-bars"></i>
13
</button>
14

  
15
<!-- OFF-CANVAS SIDEBAR -->
16

  
17
<!-- //OFF-CANVAS SIDEBAR -->
18
			
6
      <button class="btn btn-primary visible-xs-inline-block off-canvas-toggle " type="button" data-pos="left" data-nav="#t3-off-canvas" data-effect="off-canvas-effect-4">
7
        <i class="fa fa-bars"></i>
8
      </button>
19 9
		</div>
20

  
21
		
22 10
		<div class="t3-navbar navbar-collapse collapse">
23
					<ul class="nav navbar-nav">
24
			<li class="item-107 current">				<a class="logo" href="{{ g.ozwillo_url }}/{{current_lang}}"><img src="/img/logo-h43.png" alt="{% trans %}Home{% endtrans %}"></a>
25
				</li><li class="item-108">				<a class="nav-apps" href="{{ g.ozwillo_portal_url }}/{{current_lang}}/store?ui_locales={{current_lang}}">{% trans %}Catalog{% endtrans %}</a>
11
			<ul class="nav navbar-nav">
12
  			<li class="item-107 current">
13
          <a class="logo" href="{{ g.ozwillo_url }}/{{current_lang}}"><img src="/img/logo-h43.png" alt="{% trans %}Home{% endtrans %}"></a>
26 14
				</li>
27
<li class="item-119 deeper dropdown parent">
28
{% if c.userobj %}
29
  <a class="dropdown-toggle nav-data" href="#" data-toggle="dropdown">{% trans %}Data{% endtrans %}<b class="caret"></b></a>
30
  <ul class="dropdown-menu">
31
    <li{% if current_page == '/' %} class='active'{% endif %}><a href="/{{current_lang}}">{% trans %}Home{% endtrans %}</a></li>
32
    <li{% if current_page.startswith('/dataset') %} class='active'{% endif %}><a href="/{{current_lang}}/dataset">{% trans %}Datasets{% endtrans %}</a></li>
33
    <li{% if current_page.startswith('/organization') %} class='active'{% endif %}><a href="/{{current_lang}}/organization">{% trans %}Organizations{% endtrans %}</a></li>
34
    <li{% if current_page.startswith('/group') %} class='active'{% endif %}><a href="/{{current_lang}}/group">{% trans %}Groups{% endtrans %}</a></li>
35
    <li class="divider"></li>
36
    <li{% if current_page.startswith('/dashboard') %} class='active'{% endif %}><a href="/{{current_lang}}/dashboard">{% trans %}Dashboard{% endtrans %}</a></li>
37
  </ul>
38
  {% else %}
39
    <a class="dropdown-toggle nav-data" href="/">{% trans %}Data{% endtrans %}</a>
40
{% endif %}
41
</li>
42
</ul>
43

  
44
<ul class="nav navbar-nav navbar-right navbar-lang">
45
  <li class="dropdown">{% snippet "language_switcher.html" %}</li>
46
</ul>
47
</li>
48
</ul>
49
          
50
<!-- RIGHT NAV -->
51
<ul class="nav navbar-nav navbar-right">
52
  <li class="item-123">
53
  {% if c.userobj %}
54
  <a class="btn navbar-btn" href="{{ h.url_for('/user/slo') }}">{% trans %}Log out{% endtrans %}</a>
55
  {% else %}
56
  <a class="btn navbar-btn" href="{{ g.ozwillo_portal_url }}/my?ui_locales={{current_lang}}">{% trans %}Log in{% endtrans %}</a>
57
  {% endif %}
58
  </li>
59
<li class="item-112 deeper dropdown parent"><a class="dropdown-toggle" href="/en/oz/discover" data-toggle="dropdown">{% trans %}Discover{% endtrans %} <b class="caret"></b></a>
60
  <ul class="dropdown-menu">
61
    <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/discover">{% trans %}Discovering the Platform{% endtrans %}</a></li>
62
    <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/news">{% trans %}News{% endtrans %}</a></li>
63
    <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/co-construct">{% trans %}Co-construct{% endtrans %}</a></li>
64
    <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/let-s-go">{% trans %}Let's go{% endtrans %}</a></li>
65
    <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects">{% trans %}Projects{% endtrans %}</a></li>
66
</ul></li></ul>
15
        <li class="item-108">
16
          <a class="nav-apps" href="{{ g.ozwillo_portal_url }}/{{current_lang}}/store?ui_locales={{current_lang}}">{% trans %}Catalog{% endtrans %}</a>
17
				</li>
18
        {% if c.userobj %}
19
        <li class="item-119 deeper dropdown parent">
20
          <a class="dropdown-toggle nav-data" href="#" data-toggle="dropdown">{% trans %}Data{% endtrans %} <b class="caret"></b></a>
21
          <ul class="dropdown-menu">
22
            <li{% if current_page == '/' %} class='active'{% endif %}><a href="/{{current_lang}}">{% trans %}Home{% endtrans %}</a></li>
23
            <li{% if current_page.startswith('/dataset') %} class='active'{% endif %}><a href="/{{current_lang}}/dataset">{% trans %}Datasets{% endtrans %}</a></li>
24
            <li{% if current_page.startswith('/organization') %} class='active'{% endif %}><a href="/{{current_lang}}/organization">{% trans %}Organizations{% endtrans %}</a></li>
25
            <li{% if current_page.startswith('/group') %} class='active'{% endif %}><a href="/{{current_lang}}/group">{% trans %}Groups{% endtrans %}</a></li>
26
            <li class="divider"></li>
27
            <li{% if current_page.startswith('/dashboard') %} class='active'{% endif %}><a href="/{{current_lang}}/dashboard">{% trans %}Dashboard{% endtrans %}</a></li>
28
          </ul>
29
        {% else %}
30
        <li class="active deeper dropdown parent">
31
          <a class="dropdown-toggle nav-data" href="/">{% trans %}Data{% endtrans %}</a>
32
        {% endif %}
33
        </li>
34
      </ul>
35
      <ul class="nav navbar-nav navbar-right navbar-lang">
36
        <li class="dropdown">{% snippet "language_switcher.html" %}</li>
37
      </ul>
67 38

  
68
      	    <!-- //RIGHT NAV -->
69
                    
39
      <ul class="nav navbar-nav navbar-right">
40
        <li class="item-123">
41
        {% if c.userobj %}
42
        <a class="btn navbar-btn" href="{{ h.url_for('/user/slo') }}">{% trans %}Log out{% endtrans %}</a>
43
        {% else %}
44
        <a class="btn navbar-btn" href="{{ g.ozwillo_portal_url }}/my?ui_locales={{current_lang}}">{% trans %}Log in{% endtrans %}</a>
45
        {% endif %}
46
        </li>
47
        <li class="item-112 deeper dropdown parent"><a class="dropdown-toggle" href="/en/oz/discover" data-toggle="dropdown">{% trans %}Discover{% endtrans %} <b class="caret"></b></a>
48
          <ul class="dropdown-menu">
49
            <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/discover">{% trans %}Discovering the Platform{% endtrans %}</a></li>
50
            <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/news">{% trans %}News{% endtrans %}</a></li>
51
            <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/co-construct">{% trans %}Co-construct{% endtrans %}</a></li>
52
            <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/let-s-go">{% trans %}Let's go{% endtrans %}</a></li>
53
            <li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects">{% trans %}Projects{% endtrans %}</a></li>
54
          </ul>
55
        </li>
56
      </ul>
70 57
		</div>
71

  
72 58
	</div>
73
</nav>
59
</nav>

Also available in: Unified diff