Commit 92b2c4aa6508f4f4a8aa324472cab1bb1a1c000f
1 parent
97468cec
Exists in
master
and in
39 other branches
Added outter div to navbar
Showing
1 changed file
with
67 additions
and
65 deletions
Show diff stats
src/colab/deprecated/templates/base.html
| @@ -49,72 +49,74 @@ | @@ -49,72 +49,74 @@ | ||
| 49 | </div> | 49 | </div> |
| 50 | 50 | ||
| 51 | <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> | 51 | <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> |
| 52 | - <div class="navbar-header"> | ||
| 53 | - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main"> | ||
| 54 | - <span class="sr-only">Toggle navigation</span> | ||
| 55 | - <span class="icon-bar"></span> | ||
| 56 | - <span class="icon-bar"></span> | ||
| 57 | - <span class="icon-bar"></span> | ||
| 58 | - </button> | ||
| 59 | - <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a> | ||
| 60 | - </div> | ||
| 61 | - | ||
| 62 | - <div class="collapse navbar-collapse navbar-main"> | ||
| 63 | - <ul class="nav navbar-nav"> | ||
| 64 | - <li> | ||
| 65 | - <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a> | ||
| 66 | - </li> | ||
| 67 | - <li> | ||
| 68 | - <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a> | ||
| 69 | - </li> | ||
| 70 | - <li> | ||
| 71 | - <a href="http://listas.interlegis.gov.br/mailman/listinfo/" | ||
| 72 | - target="_blank">{% trans "Contribute" %}</a> | ||
| 73 | - </li> | ||
| 74 | - <li> | ||
| 75 | - <a href="http://colab.interlegis.leg.br/newticket" | ||
| 76 | - target="_blank">{% trans "Report a problem" %}</a> | ||
| 77 | - </li> | ||
| 78 | - <li> | ||
| 79 | - <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a> | ||
| 80 | - </li> | ||
| 81 | - </ul> | ||
| 82 | - | ||
| 83 | - <ul class="nav navbar-nav navbar-right"> | ||
| 84 | - {% if not user.is_authenticated %} | ||
| 85 | - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
| 86 | - <li>{% browserid_login text='Login' next=request.path %}</li> | ||
| 87 | - {% else %} | ||
| 88 | - <li id="user-menu" class="dropdown"> | ||
| 89 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | ||
| 90 | - <ul class="dropdown-menu" role="menu"> | ||
| 91 | - <li> | ||
| 92 | - <div class="wrapper"> | ||
| 93 | - <div class="thumbnail">{% gravatar user.email 100 %}</div> | ||
| 94 | - <div class="user-info"> | ||
| 95 | - <span><b>{{ user.get_full_name }}</b></span> | ||
| 96 | - <span class="quiet">{{ user.email }}</span> | ||
| 97 | - </div> | ||
| 98 | - <div> | ||
| 99 | - <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a> | ||
| 100 | - {% browserid_logout text='Logout' link_class='btn btn-default pull-right' %} | ||
| 101 | - </div> | ||
| 102 | - </div> | ||
| 103 | - </li> | ||
| 104 | - </ul> | 52 | + <div class="container"> |
| 53 | + <div class="navbar-header"> | ||
| 54 | + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main"> | ||
| 55 | + <span class="sr-only">Toggle navigation</span> | ||
| 56 | + <span class="icon-bar"></span> | ||
| 57 | + <span class="icon-bar"></span> | ||
| 58 | + <span class="icon-bar"></span> | ||
| 59 | + </button> | ||
| 60 | + <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a> | ||
| 61 | + </div> | ||
| 62 | + | ||
| 63 | + <div class="collapse navbar-collapse navbar-main"> | ||
| 64 | + <ul class="nav navbar-nav"> | ||
| 65 | + <li> | ||
| 66 | + <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a> | ||
| 105 | </li> | 67 | </li> |
| 106 | - {% endif %} | ||
| 107 | - </ul> | ||
| 108 | - | ||
| 109 | - <form action="/search/" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search"> | ||
| 110 | - <div class="form-group"> | ||
| 111 | - <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label> | ||
| 112 | - <input name="q" id="header-searchbox" | ||
| 113 | - class="form-control" value="{{ request.GET.q }}" | ||
| 114 | - type="search" placeholder="{% trans 'Search here...' %}" /> | ||
| 115 | - </div> | ||
| 116 | - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button> | ||
| 117 | - </form> | 68 | + <li> |
| 69 | + <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a> | ||
| 70 | + </li> | ||
| 71 | + <li> | ||
| 72 | + <a href="http://listas.interlegis.gov.br/mailman/listinfo/" | ||
| 73 | + target="_blank">{% trans "Contribute" %}</a> | ||
| 74 | + </li> | ||
| 75 | + <li> | ||
| 76 | + <a href="http://colab.interlegis.leg.br/newticket" | ||
| 77 | + target="_blank">{% trans "Report a problem" %}</a> | ||
| 78 | + </li> | ||
| 79 | + <li> | ||
| 80 | + <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a> | ||
| 81 | + </li> | ||
| 82 | + </ul> | ||
| 83 | + | ||
| 84 | + <ul class="nav navbar-nav navbar-right"> | ||
| 85 | + {% if not user.is_authenticated %} | ||
| 86 | + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
| 87 | + <li>{% browserid_login text='Login' next=request.path %}</li> | ||
| 88 | + {% else %} | ||
| 89 | + <li id="user-menu" class="dropdown"> | ||
| 90 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | ||
| 91 | + <ul class="dropdown-menu" role="menu"> | ||
| 92 | + <li> | ||
| 93 | + <div class="wrapper"> | ||
| 94 | + <div class="thumbnail">{% gravatar user.email 100 %}</div> | ||
| 95 | + <div class="user-info"> | ||
| 96 | + <span><b>{{ user.get_full_name }}</b></span> | ||
| 97 | + <span class="quiet">{{ user.email }}</span> | ||
| 98 | + </div> | ||
| 99 | + <div> | ||
| 100 | + <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a> | ||
| 101 | + {% browserid_logout text='Logout' link_class='btn btn-default pull-right' %} | ||
| 102 | + </div> | ||
| 103 | + </div> | ||
| 104 | + </li> | ||
| 105 | + </ul> | ||
| 106 | + </li> | ||
| 107 | + {% endif %} | ||
| 108 | + </ul> | ||
| 109 | + | ||
| 110 | + <form action="/search/" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search"> | ||
| 111 | + <div class="form-group"> | ||
| 112 | + <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label> | ||
| 113 | + <input name="q" id="header-searchbox" | ||
| 114 | + class="form-control" value="{{ request.GET.q }}" | ||
| 115 | + type="search" placeholder="{% trans 'Search here...' %}" /> | ||
| 116 | + </div> | ||
| 117 | + <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button> | ||
| 118 | + </form> | ||
| 119 | + </div> | ||
| 118 | </div> | 120 | </div> |
| 119 | </nav> | 121 | </nav> |
| 120 | 122 |