Skip to content

Commit

Permalink
Merge pull request #62 from colab/fix_header
Browse files Browse the repository at this point in the history 
Cleaned up HTML and extracted header
  • Loading branch information
Lucas Kanashiro committed Sep 4, 2015
2 parents 2a30ff9 + 5e8d90a commit b933c10
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 87 deletions.
84 changes: 3 additions & 81 deletions colab/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</head>

<!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
<body class="container" data-no-turbolink>
<body data-no-turbolink>

{% block ribbon %}
{% if ribbon %}
Expand All @@ -62,84 +62,8 @@
{% endif %}
{% endblock %}

{% block navbar %}
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">

<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
</div>
<div class="collapse navbar-collapse navbar-main">
<ul class="nav navbar-nav">

<li>
<a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
</li>

{% plugins_menu %}

<li class="hidden-lg hidden-md">
<a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
</li>
</ul>

<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}

<li class="dropdown hidden-xs hidden-lg">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
<ul class="dropdown-menu">
{% trans 'Login' as login_text %}
<li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
<li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
</ul>
</li>
{% trans 'Login' as login_text %}
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
{% else %}
<li id="user-menu" class="dropdown">
<a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
<ul class="dropdown-menu" role="menu">
<li>
<div class="wrapper">
<div class="thumbnail">{% gravatar user.email 100 %}</div>
<div class="user-info">
<span><b>{{ user.get_full_name }}</b></span>
<span class="quiet">{{ user.email }}</span>
</div>
<div>
<a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
{% trans 'Logout' as logout_text %}
<a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
</div>
</div>
</li>
</ul>
</li>
{% endif %}
</ul>

<form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
<div class="form-group">
<label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
<input name="q" id="header-searchbox"
class="form-control" value="{{ request.GET.q }}"
type="search" placeholder="{% trans 'Search here...' %}" />
</div>
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
</form>
</div>
</div>
</nav>

{% block header %}
{% include 'header.html' %}
{% endblock %}

{% block messages %}
Expand All @@ -166,8 +90,6 @@
{% block main-content %}{% endblock %}
</div>

<div class="row">&nbsp;</div>

{% block footer %}

{% include "footer.html" %}
Expand Down
10 changes: 4 additions & 6 deletions colab/templates/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

{% plugins_menu %}

<li><a href="/paste">{% trans "Paste" %}</a></li>

<li class="hidden-lg hidden-md">
<a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
</li>
Expand All @@ -42,8 +40,8 @@
</ul>
</li>
{% trans 'Login' as login_text %}
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
<li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
{% else %}
<li id="user-menu" class="dropdown">
<a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
Expand Down Expand Up @@ -71,8 +69,8 @@
<div class="form-group">
<label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
<input name="q" id="header-searchbox"
class="form-control" value="{{ request.GET.q }}"
type="search" placeholder="{% trans 'Search here...' %}" />
class="form-control" value="{{ request.GET.q }}"
type="search" placeholder="{% trans 'Search here...' %}" />
</div>
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
</form>
Expand Down

0 comments on commit b933c10

Please sign in to comment.