equal
deleted
inserted
replaced
58 {% endif %} |
58 {% endif %} |
59 {% else %} |
59 {% else %} |
60 <li>Welcome, new user. Please log in.</li> |
60 <li>Welcome, new user. Please log in.</li> |
61 <li><a href="/login/" class="top">Login</a></li> |
61 <li><a href="/login/" class="top">Login</a></li> |
62 {% endif %} |
62 {% endif %} |
63 |
|
64 |
|
65 |
|
66 |
|
67 </ul> |
63 </ul> |
68 |
|
69 </div> |
64 </div> |
70 |
65 |
71 <div class="sidebox"> |
66 <div class="sidebox"> |
72 |
67 |
73 <h1>Short About</h1> |
68 <h1>Short About</h1> |
74 |
69 |
75 <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec libero. Suspendisse bibendum. |
70 <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec libero. Suspendisse bibendum. |
76 Cras id urna. Morbi tincidunt, orci ac convallis aliquam, lectus turpis varius lorem, eu |
71 Cras id urna. Morbi tincidunt, orci ac convallis aliquam, lectus turpis varius lorem, eu |
77 posuere nunc justo tempus leo.</p> |
72 posuere nunc justo tempus leo.</p> |
78 |
73 |
79 </div> |
74 </div> |
80 <div class="sidebox"> |
|
81 |
|
82 <h1>Search Box</h1> |
|
83 <form action="#" class="searchform"> |
|
84 <p> |
|
85 <input name="search_query" class="textbox" type="text" /> |
|
86 <input name="search" class="button" value="Search" type="submit" /> |
|
87 </p> |
|
88 </form> |
|
89 |
|
90 </div> |
|
91 |
|
92 </div> |
75 </div> |
93 {% endblock sidebar %} |
76 {% endblock sidebar %} |
94 |
77 |
95 <div id="main"> |
78 <div id="main"> |
96 {% block content %} |
79 {% block content %} |
97 {% comment %} To be filled in inherited templates {% endcomment %} |
80 {% comment %} To be filled in inherited templates {% endcomment %} |
98 {% endblock content %} |
81 {% endblock content %} |
99 </div> |
82 </div> |
100 |
83 |
101 </div></div> |
84 </div></div> |
102 |
85 |