Skip to content

Commit

Permalink
Clean up whitespace and indents.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Belgand
Belgand committed Jun 9, 2012
1 parent bc191ff commit 9bbc26d
Showing 1 changed file with 27 additions and 34 deletions.
61 changes: 27 additions & 34 deletions src/noisebridge.pyclass/noisebridge/pyclass/templates/base.html
View file
Expand Up @@ -29,47 +29,40 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner mainnav">
<div class="container">
<a class="brand" href="/">Noisebridge</a>
<ul class="nav">
<li><a href="{% url search_interests %}">{% trans "Search" %}</a></li>
<li class="dropdown"><a href="#" class="dropdown-toggle"data-toggle="dropdown">{% trans "ToDo" %}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url todo_list %}">{% trans "List All Tasks" %}</a></li>
<li><a href="{% url add_todo %}">{% trans "Add Task" %}</a></li>
<li><a href="#">{% trans "Add Tag" %}</a></li>
<li><a href="{% url whatcanido %}">{% trans "What Can I Do?" %}</a></li>
</ul>
</li>

<li><a href="{% url add_interest %}">{% trans "Add Interest" %}</a></li>
</ul>
<form class="navbar-search pull-left">
<input type="text" class="search-query" placeholder="Search">
</form>
<ul class="nav login pull-right">
{% if user.is_authenticated %}
<li><a class="login_item" href="{{ user.get_absolute_url }}">{{ user.username }}</a></li>
<li><a class="login_item" href="{% url user_settings %}">{% trans "Settings" %}</a></li>
<li><a class="login_item" href="{% url auth_logout %}">{% trans "Log out" %}</a></li>
{% else %}
<li><a class="login_item" href="{% url auth_login %}">{% trans "Log in" %}</a></li>
<li><a class="login_item" href="{% url registration_register %}">{% trans "Register" %}</a></li>
{% endif %}
</ul>





<a class="brand" href="/">Noisebridge</a>
<ul class="nav">
<li><a href="{% url search_interests %}">{% trans "Search" %}</a></li>
<li class="dropdown"><a href="#" class="dropdown-toggle"data-toggle="dropdown">{% trans "ToDo" %}<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url todo_list %}">{% trans "List All Tasks" %}</a></li>
<li><a href="{% url add_todo %}">{% trans "Add Task" %}</a></li>
<li><a href="#">{% trans "Add Tag" %}</a></li>
<li><a href="{% url whatcanido %}">{% trans "What Can I Do?" %}</a></li>
</ul>
</li>
<li><a href="{% url add_interest %}">{% trans "Add Interest" %}</a></li>
</ul>
<form class="navbar-search pull-left">
<input type="text" class="search-query" placeholder="Search">
</form>
<ul class="nav login pull-right">
{% if user.is_authenticated %}
<li><a class="login_item" href="{{ user.get_absolute_url }}">{{ user.username }}</a></li>
<li><a class="login_item" href="{% url user_settings %}">{% trans "Settings" %}</a></li>
<li><a class="login_item" href="{% url auth_logout %}">{% trans "Log out" %}</a></li>
{% else %}
<li><a class="login_item" href="{% url auth_login %}">{% trans "Log in" %}</a></li>
<li><a class="login_item" href="{% url registration_register %}">{% trans "Register" %}</a></li>
{% endif %}
</ul>
</div>
</div>
</div>
</nav>
</header>
{% endblock header %}
<div class="container"> <!-- Start Containter Center page -->


<div class="container"> <!-- Start Containter Center page -->

<!-- Message System -->
{% if messages %}
Expand Down

3 comments on commit 9bbc26d

@kellanjacobs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really Mark? I have to do a conflict merge because you didn't like my spacing. Don't you think this might just be a little anal. Maybe you should fix this when you are fixing the code in the file.

@Belgand
Copy link
Contributor Author

@Belgand Belgand commented on 9bbc26d Jun 10, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kellanjacobs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the way you changed it made it cause a merge conflict. So I had to go in and try to figure out what you had changed. And retest my changes after I fixed it. So it created alot of unnecessary work for both of us. either way such in life. Have a good night

Please sign in to comment.