equal
deleted
inserted
replaced
45 <div id="page"> |
45 <div id="page"> |
46 <div id="sidebar"> |
46 <div id="sidebar"> |
47 <ul> |
47 <ul> |
48 <li> |
48 <li> |
49 <ul> |
49 <ul> |
50 {% if user.is_authenticated %} |
50 {% if user.is_authenticated %} |
51 <li>{{ user.username }}</li> |
51 <li>{{ user.username }}</li> |
52 <li><a href="logout" >{% trans "Logout" %}</a></li> |
52 <li><a href="logout" >{% trans "Logout" %}</a></li> |
53 {% else %} |
53 {% else %} |
54 <li><a href="login">Login</a> </li> |
54 <form id="search" method="post" action="."> |
55 <li><a href="#">Register</a> </li> |
55 {{form.as_p}} |
56 {% endif %} |
56 <input type="submit" value="login" /> |
57 </ul> |
57 <li><a href="/accounts/register">Register</a> </li> |
58 <li id="categories"> |
58 {% endif %} |
|
59 </ul> |
|
60 <li id="categories"> |
59 <h2>Links</h2> |
61 <h2>Links</h2> |
60 <ul> |
62 <ul> |
61 <li><a href="http://scipy.in/#venue">Venue</a> </li> |
63 <li><a href="http://scipy.in/#venue">Venue</a> </li> |
62 <li><a href="http://scipy.in/#theme">Theme</a> </li> |
64 <li><a href="http://scipy.in/#theme">Theme</a> </li> |
63 <li><a href="http://scipy.in/#date">Dates</a> </li> |
65 <li><a href="http://scipy.in/#date">Dates</a> </li> |
64 <li><a href="http://scipy.in/#organizers">Organizers</a> </li> |
66 <li><a href="http://scipy.in/#organizers">Organizers</a> </li> |
65 </ul> |
67 </ul> |
66 </li> |
68 </li> |
67 {% block sidebar %} |
69 {% block sidebar %} |
68 {% endblock %} |
70 {% endblock %} |
69 </ul> |
71 </ul> |
70 </div> |
72 </div> |
71 <!-- end sidebar --> |
73 <!-- end sidebar --> |
72 <!-- start content --> |
74 <!-- start content --> |
73 <div id="content"> |
75 <div id="content"> |