Commit 5a5123375ac6072b6e7cff5ec53dba004171a955
1 parent
5aab4ac2
Exists in
master
and in
39 other branches
Creating user menu
Showing
2 changed files
with
105 additions
and
62 deletions
Show diff stats
src/colab/deprecated/templates/base.html
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | -{% load i18n browserid conversejs %} | 2 | +{% load i18n browserid conversejs gravatar %} |
| 3 | <html> | 3 | <html> |
| 4 | <head> | 4 | <head> |
| 5 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> | 5 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
| @@ -43,66 +43,79 @@ | @@ -43,66 +43,79 @@ | ||
| 43 | <body class="container"> | 43 | <body class="container"> |
| 44 | {% browserid_info %} | 44 | {% browserid_info %} |
| 45 | <div class="row"> | 45 | <div class="row"> |
| 46 | - {% if not user.is_authenticated %} | ||
| 47 | - <div class="col-sm-9 col-lg-11 text-right"> | ||
| 48 | - <a href="{% url 'signup' %}">{% trans "Register" %}</a> | ||
| 49 | - </div> | ||
| 50 | - <div class="col-sm-1 col-lg-1"> | ||
| 51 | - {% browserid_login text='Login' next=request.path %} | ||
| 52 | - </div> | ||
| 53 | - {% else %} | ||
| 54 | - <div class="col-sm-8 col-md-10 text-right"> | ||
| 55 | - {% trans "authenticated as" %} <b>{{ user.username }}</b> | ||
| 56 | - </div> | ||
| 57 | - <div class="col-sm-2 col-md-1 text-center"> | ||
| 58 | - <a href="{% url 'user_profile' user.username %}"> | ||
| 59 | - {% trans "My Profile" %} | ||
| 60 | - </a> | ||
| 61 | - </div> | ||
| 62 | - <div class="col-sm-2 col-md-1 text-center"> | ||
| 63 | - {% browserid_logout text='Logout '%} | ||
| 64 | - </div> | ||
| 65 | - {% endif %} | ||
| 66 | </div> | 46 | </div> |
| 67 | 47 | ||
| 68 | - {% block header %} | ||
| 69 | - <!--<h1><span>{% trans "COLAB" %}</span>--> | ||
| 70 | - <a href="/"> | ||
| 71 | - <img src="{{ STATIC_URL }}img/logo_small.png" alt="{% trans 'Colab' %}" /></a> | ||
| 72 | - </h1> | ||
| 73 | - {% endblock %} | 48 | + {% block header %}{% endblock %} |
| 49 | + | ||
| 50 | + <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> | ||
| 51 | + <div class="navbar-header"> | ||
| 52 | + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main"> | ||
| 53 | + <span class="sr-only">Toggle navigation</span> | ||
| 54 | + <span class="icon-bar"></span> | ||
| 55 | + <span class="icon-bar"></span> | ||
| 56 | + <span class="icon-bar"></span> | ||
| 57 | + </button> | ||
| 58 | + <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"</a> | ||
| 59 | + </div> | ||
| 74 | 60 | ||
| 75 | - <div id="header-menu" class="row"> | ||
| 76 | - | ||
| 77 | - <span class="col-sm-2 text-center"> | ||
| 78 | - <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a> | ||
| 79 | - </span> | ||
| 80 | - <span class="col-sm-2 col-lg-1 text-center"> | ||
| 81 | - <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a> | ||
| 82 | - </span> | ||
| 83 | - <span class="col-sm-2 col-lg-1 text-center"> | ||
| 84 | - <a href="http://listas.interlegis.gov.br/mailman/listinfo/" | ||
| 85 | - target="_blank">{% trans "Contribute" %}</a> | ||
| 86 | - </span> | ||
| 87 | - <span class="col-sm-3 col-lg-2 text-center"> | ||
| 88 | - <a href="http://colab.interlegis.leg.br/newticket" | ||
| 89 | - target="_blank">{% trans "Report a problem" %}</a> | ||
| 90 | - </span> | ||
| 91 | - <span class="col-sm-2 col-lg-1 text-center"> | ||
| 92 | - <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a> | ||
| 93 | - </span> | ||
| 94 | - | ||
| 95 | - <span class="col-sm-6 col-lg-5 text-center"> | ||
| 96 | - <form action="/search/" method="GET" class="form-inline" role="form"> | 61 | + <div class="collapse navbar-collapse navbar-main"> |
| 62 | + <ul class="nav navbar-nav"> | ||
| 63 | + <li> | ||
| 64 | + <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a> | ||
| 65 | + </li> | ||
| 66 | + <li> | ||
| 67 | + <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a> | ||
| 68 | + </li> | ||
| 69 | + <li> | ||
| 70 | + <a href="http://listas.interlegis.gov.br/mailman/listinfo/" | ||
| 71 | + target="_blank">{% trans "Contribute" %}</a> | ||
| 72 | + </li> | ||
| 73 | + <li> | ||
| 74 | + <a href="http://colab.interlegis.leg.br/newticket" | ||
| 75 | + target="_blank">{% trans "Report a problem" %}</a> | ||
| 76 | + </li> | ||
| 77 | + <li> | ||
| 78 | + <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a> | ||
| 79 | + </li> | ||
| 80 | + </ul> | ||
| 81 | + | ||
| 82 | + <ul class="nav navbar-nav navbar-right"> | ||
| 83 | + {% if not user.is_authenticated %} | ||
| 84 | + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
| 85 | + <li>{% browserid_login text='Login' next=request.path %}</li> | ||
| 86 | + {% else %} | ||
| 87 | + <li class="dropdown"> | ||
| 88 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | ||
| 89 | + <ul class="dropdown-menu" role="menu"> | ||
| 90 | + <li> | ||
| 91 | + <div class="user-menu"> | ||
| 92 | + <div class="thumbnail">{% gravatar user.email 100 %}</div> | ||
| 93 | + <div class="user-menu-info"> | ||
| 94 | + <span><b>{{ user.get_full_name }}</b></span> | ||
| 95 | + <span class="quiet">{{ user.email }}</span> | ||
| 96 | + </div> | ||
| 97 | + <div> | ||
| 98 | + <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a> | ||
| 99 | + {% browserid_logout text='Logout' link_class='btn btn-default pull-right' %} | ||
| 100 | + </div> | ||
| 101 | + <div> | ||
| 102 | + </li> | ||
| 103 | + </ul> | ||
| 104 | + </li> | ||
| 105 | + {% endif %} | ||
| 106 | + </ul> | ||
| 107 | + | ||
| 108 | + <form action="/search/" method="GET" id="search-form" class="navbar-form navbar-right" role="search"> | ||
| 109 | + <div class="form-group"> | ||
| 110 | + <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label> | ||
| 97 | <input name="q" id="header-searchbox" | 111 | <input name="q" id="header-searchbox" |
| 98 | class="form-control" value="{{ request.GET.q }}" | 112 | class="form-control" value="{{ request.GET.q }}" |
| 99 | type="search" placeholder="{% trans 'Search here...' %}" /> | 113 | type="search" placeholder="{% trans 'Search here...' %}" /> |
| 100 | - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span> {% trans 'Search' %}</button> | ||
| 101 | - </form> | ||
| 102 | - </span> | 114 | + </div> |
| 115 | + <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span> {% trans 'Search' %}</button> | ||
| 116 | + </form> | ||
| 103 | </div> | 117 | </div> |
| 104 | - | ||
| 105 | - <hr id="header-hr"/> | 118 | + </nav> |
| 106 | 119 | ||
| 107 | <div> | 120 | <div> |
| 108 | {% block main-content %} {% endblock %} | 121 | {% block main-content %} {% endblock %} |
src/colab/static/css/screen.css
| 1 | 1 | ||
| 2 | 2 | ||
| 3 | body { | 3 | body { |
| 4 | - font-size: 15px; | 4 | + padding-top: 70px; |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | /* Header */ | 7 | /* Header */ |
| 8 | -#header-searchbox { | ||
| 9 | - width: 280px; | ||
| 10 | -} | ||
| 11 | 8 | ||
| 12 | -#header-menu { | ||
| 13 | - line-height: 50px; | 9 | + |
| 10 | +#header-searchbox { | ||
| 11 | + width: 200px; | ||
| 14 | } | 12 | } |
| 15 | 13 | ||
| 16 | #header-hr { | 14 | #header-hr { |
| 17 | margin-top: 0; | 15 | margin-top: 0; |
| 18 | } | 16 | } |
| 17 | + | ||
| 18 | +.navbar-default .navbar-brand, | ||
| 19 | +.navbar a.dropdown-toggle { | ||
| 20 | + padding: 0; | ||
| 21 | + margin-top: 5px; | ||
| 22 | + margin-left: 10px; | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +.navbar .user-menu { | ||
| 26 | + padding: 10px; | ||
| 27 | + white-space: nowrap; | ||
| 28 | +} | ||
| 29 | + | ||
| 30 | +.navbar .user-menu a { | ||
| 31 | + margin: 5px 0; | ||
| 32 | +} | ||
| 33 | + | ||
| 34 | +.navbar .user-menu-info { | ||
| 35 | + display: inline-block; | ||
| 36 | + vertical-align: top; | ||
| 37 | + padding-left: 5px; | ||
| 38 | +} | ||
| 39 | + | ||
| 40 | +.navbar .user-menu-info span { | ||
| 41 | + display: block; | ||
| 42 | +} | ||
| 43 | + | ||
| 44 | +.navbar .dropdown-menu .thumbnail { | ||
| 45 | + width: 100px; | ||
| 46 | + display: inline-block; | ||
| 47 | +} | ||
| 48 | + | ||
| 19 | /* End of Header */ | 49 | /* End of Header */ |
| 20 | 50 | ||
| 21 | 51 | ||
| @@ -28,7 +58,7 @@ body { | @@ -28,7 +58,7 @@ body { | ||
| 28 | .preview-message { | 58 | .preview-message { |
| 29 | white-space: nowrap; | 59 | white-space: nowrap; |
| 30 | overflow: hidden; | 60 | overflow: hidden; |
| 31 | - line-height: 28px; | 61 | + line-height: 25px; |
| 32 | border-bottom: solid 1px #ddd; | 62 | border-bottom: solid 1px #ddd; |
| 33 | } | 63 | } |
| 34 | 64 | ||
| @@ -138,7 +168,7 @@ ul.unstyled-list { | @@ -138,7 +168,7 @@ ul.unstyled-list { | ||
| 138 | } | 168 | } |
| 139 | 169 | ||
| 140 | ul.unstyled-list li { | 170 | ul.unstyled-list li { |
| 141 | - min-height: 30px; | 171 | + min-height: 27px; |
| 142 | } | 172 | } |
| 143 | 173 | ||
| 144 | ul.unstyled-list .glyphicon-chevron-right { | 174 | ul.unstyled-list .glyphicon-chevron-right { |