Mercurial > hg > bts-webui
changeset 125:c7623fe03f65 draft
visual: change notifications and login look
some changes regarding how this two things look.
plus, a start site template, althought still contentless.
| author | diegoe-guest |
|---|---|
| date | Thu, 06 Aug 2009 16:18:34 +0000 |
| parents | 9b3a42bc0b74 |
| children | 5ba6313e5340 |
| files | bts_webui/amancay/images/stock_keyring.png bts_webui/amancay/images/stock_person.png bts_webui/amancay/static/amancay.css bts_webui/amancay/templates/base.html bts_webui/amancay/templates/home.html bts_webui/amancay/views.py bts_webui/registration/templates/registration/login.html bts_webui/registration/urls.py bts_webui/registration/views.py |
| diffstat | 9 files changed, 103 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 index 0000000000000000000000000000000000000000..467c82721c456b7ed81a20e935f4801d2f07e1ba GIT binary patch literal 537 zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPWqb!4=1b^h&exOiKiEBiObAE1aYF-J0Z)#qtZgFN+ zYKlT;a(*6{EgW!hX(VeZ7#SECD|jVlmnJEwXJzK*CMK&Z1ec^{=A{<tC~#$zloVL$ z>q8{;a!ZRdlQR-?a`cj`xVVywQWHyn#+GN6WGIwmq$;?3`UdF0w3L^Z>!oMr7U<;{ zrKfitcV}Q=<nwfK45_%aH)vy4GlPiDW{n?=eMkK>j+Yf`sm*TTi?k|ze@F4byu4jj zsU@WxkukBa9w<C|#Q#Hv<)p~E?k3$O6IH%EsQ6G(zURBe1Gfs61M}P&*cqxB&QCtF zUY|dwXu9vaPk-Nb7Rm&>WZX7m)HyG?;bd&yHEtj>+v&|9A{Z9xdc4r$);n{1gS;uJ zo(x}X`jv_%70U3>s%F^1TwvlmIrsKIiJnC-*7JrjEclWxGfCy*w%fYTK3kT=x?eB- zP%FRtZk|oK&~Fo8$u>n%*M+NAZPDpw*msUIz4k9p6GL0#f_2#<u8h8y4Qw*CURdzC zrtGM$^jx5!ba=8_Vp(oWe*T2io1ty10|WlC-<R9J{>#zi{A^&1F?hQAxvX<aXaWHC Cg2kc$
new file mode 100644 index 0000000000000000000000000000000000000000..f2169a8a2cc0cf1375fec0f73a552c2f9c80681a GIT binary patch literal 594 zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-Xa4HGN?;ONqL0000TbVXQnLvL+uWo~o;Lvm$dbY)~9 zcWHEJAXI2&AV*0}Q14_VZU6uQ$Vo&&R5;6xlEG>dQ51&1tDOmS8asJ_7Md8;b;;6f zk}Q0LD7fqch(y74Aco)rh+t7r5ki97Bpaoxu8X$sAWbqElY8&Xy)NuPl1^I>cX2qJ z|Kt4UTtP~-+RZv}0F*9D$H3c{jaQ$!DO&Ajr`PY=AedTXj5WsCAeh=-ziV6VX6Ghx zz1QzrV~kxa=2l8+wboWjX^k-nq`s`VwZ=H8R%(QQLbTQ(00FUynJ?y4D>W{xT?r_8 z-WH3+oY=%fN}-e@iXx<xc-|IEdjVi0%}N|c02pHs2#kq|j7hb<KEZJq&TyR!N-Lz2 zNF`BP;cPgB;VijGIzR|<G8_%?{TvxLL!>o2Qn*eAf7@p`8X$x?S<xg(=gsSfuIqlk zfA0Zd7*eg&63>L;jNxd2=Xv}({fSbl{QTLAAL~14JbC<-U^e0G?36EGKQSJU0r0nd zc6N6u7K`lfmw12pt^r&ElyiQL^Yh;n@&)pH1uT|-&jO&eBIoA-%2!??o6W8k?Dao) z8L$bUlv-8WRK{i+;5LAi5+T4Qqc2&&+LhjQKroq(@8tLHUOVz+ItB<X0UXCU`tb4a g5&sd6<9ti<zv)TcH|YW&$p8QV07*qoM6N<$f)Mus7XSbN
--- a/bts_webui/amancay/static/amancay.css +++ b/bts_webui/amancay/static/amancay.css @@ -19,6 +19,7 @@ *******************************************************************************/ #header { + margin-top: 0; background: #BF1238; border-bottom: 3px groove #BF1238; color:white; @@ -30,9 +31,14 @@ margin: 0; vertical-align: middle; } +#main_title a { + text-decoration: none; + color: white; +} #main_title img { vertical-align: middle; margin-right: 0.5em; + border: 0; } #navbar { text-align: right; @@ -183,9 +189,11 @@ /************* /amancay style ******************/ /* bug */ +.bug .bug_number { + float: left; +} .bug .bug_number a { font-size: smaller; - float: left; text-decoration: none; border-bottom: 1px dotted blue; } @@ -203,7 +211,7 @@ .bug .bug_extra_information { background-color: #eee; color: #444; - border: 1px dashed #ddd; + border: 1px dashed #bbb; border-left: 0.5em solid #ddd; padding: 0.5em; padding-left: 0.7em; @@ -214,7 +222,7 @@ } .bug .bug_log_body { padding: 1em; - border: 1px dashed #BF1238; + border: 1px solid #bbb; border-top: 0; } .bug .bug_log_header { @@ -378,5 +386,35 @@ float: right; } - - +#id_password, +#id_username { + padding: 2px; + padding-left:20px; + background-repeat: no-repeat; + background-position: 2px 2px; + border: 1px solid #ddd; +} +#id_username { + background-image: url('/images/stock_person.png'); +} +#id_password { + background-image: url('/images/stock_keyring.png'); +} +.button_box { + text-align: right; +} +.info { + padding: 1.5em; + margin: 0.8em; + background: #cc0a34; + color: white; +} +.info a { + color: black; +} +#notification a { + color: white; + font-size: smaller; + border-bottom: 1px dotted white; + text-decoration: none; +}
--- a/bts_webui/amancay/templates/base.html +++ b/bts_webui/amancay/templates/base.html @@ -9,11 +9,19 @@ <script type="text/javascript" src="/static/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/static/amancay_interface.js"></script> {% block extrajs %} {% endblock %} + <script type="text/javascript" language="javascript" charset="utf-8"> + function dismiss_notification() { + fade(document.getElementById('notification')); + } + function pop_notification() { + appear(document.getElementById('notification')); + } + </script> </head> <body> <div id="header"> - <h1 id="main_title"><img src="/static/spiral.png"/>Amancay!</h1> + <h1 id="main_title"><a href="/"><img src="/static/spiral.png"/>Amancay!</a></h1> </div> <div class="colmask leftmenu"> <div class="colleft"> @@ -22,7 +30,7 @@ <div id="navbar"> {% block navbar %} <a href="/">Home</a> • - {% if current_user.is_authenticated %} + {% if user.is_authenticated %} <a href="/accounts/settings">Settings</a> • <a href="/accounts/logout">Logout</a> • {% else %} @@ -36,7 +44,7 @@ </span> </div> {% if info_to_user %} - <div class="info_to_user">{{ info_to_user }}</div> + <div id="notification" class="info"><a href="javascript:dismiss_notification()">[x]</a> {{ info_to_user }}</div> {% endif %} {% block main_content %}{% endblock %} <div class="loading" id="loading"></div>
new file mode 100644 --- /dev/null +++ b/bts_webui/amancay/templates/home.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block title %}Amancay BTS interface{% endblock %} + +{% block toolbox %} +{% include "toolbox.html" %} +{% endblock %} + +{% block main_content %} +Welcome to Amancay! +<br/><br/> +Search for bugs! +<br/><br/> +Latest bugs +<br/><br/> +Your watched packages activity +{% endblock %} +
--- a/bts_webui/amancay/views.py +++ b/bts_webui/amancay/views.py @@ -1,3 +1,4 @@ +# vim: set sw=4 ts=4 sts=4 noet: import datetime # Needed to get_template, prepare context and output Response @@ -25,14 +26,14 @@ """ Our pretty useless index page. """ - item_list = process_post(request) - # Check if it's AJAX or HTML - if request.GET.has_key('xhr'): - return HttpResponse(simplejson.dumps({"item_list": item_list}), - mimetype='application/javascript') + if request.user: + user = request.user else: - # TODO: choose which view to show. - return search(request) + user = None + + return render_to_response('home.html', + {'user': user,} + ) def package(request, package_name): """
--- a/bts_webui/registration/templates/registration/login.html +++ b/bts_webui/registration/templates/registration/login.html @@ -4,28 +4,28 @@ {% block main_content %} +<div class="info">If you don't have an account, you can <a +href="/accounts/register/">sign up</a> for one.<br/> +It's free, and you'll get access to a bunch of nifty features.</div> + {% if form.errors %} <p class="error">Please correct the errors below:</p> {% endif %} - <div class="account_form"> -<form method="post" action="{% if next %}?next={{ next }}{% endif %}"> -<fieldset class="account_form"> -<legend class="account_title">Login</legend> -<ol class="account_form"> -<li><dt><label for="id_username">Username:</label>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %}</dt> -<dd>{{ form.username }}</dd></li> -<li><dt><label for="id_password">Password:</label>{% if form.password.errors %} <span class="error">{{ form.password.errors|join:", " }}</span>{% endif %}</dt> -<dd>{{ form.password }}</dd></li> -</ol> -<dt><input class="submit" type="submit" value="Log in" /></dt> -</dl> -</fieldset> -</form> + <form method="post" action="{% url django.contrib.auth.views.login %}"> + <table> + <tr> + <td><label for="id_username">Username:</label></td> + <td>{% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span>{% endif %} {{ form.username }}</td> + </tr> + <tr> + <td><label for="id_password">Password:</label></td> + <td>{% if form.password.errors %} <span class="error">{{ form.password.errors|join:", " }}</span>{% endif %} {{ form.password }}</td> + </tr> + <tr> + <td colspan="2" class="button_box"><input class="submit" type="submit" value="Log in" /></td> + </tr> + </table> + </form> </div> - -<div class="account_comment">If you don't have an account, you can <a -href="/accounts/register/">sign up</a> for one; it's free, and you'll get -access to a bunch of nifty features.</div> - {% endblock %}
--- a/bts_webui/registration/urls.py +++ b/bts_webui/registration/urls.py @@ -1,3 +1,4 @@ +# vim: set sw=4 ts=4 sts=4 noet: """ URLConf for Django user registration. @@ -17,11 +18,9 @@ # [a-fA-F0-9]+ because a bad activation key should still get to the view; # that way it can return a sensible "invalid key" message instead of a # confusing 404. - (r'^activate/(?P<activation_key>\w+)/$', - 'bts_webui.registration.views.activate'), + (r'^activate/(?P<activation_key>\w+)/$', 'bts_webui.registration.views.activate'), (r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'registration/login.html'}), (r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'registration/logout.html'}), (r'^register/$', 'bts_webui.registration.views.register'), - (r'^register/complete/$', - 'django.views.generic.simple.direct_to_template', {'template': 'registration/registration_complete.html'}), + (r'^register/complete/$', 'django.views.generic.simple.direct_to_template', {'template': 'registration/registration_complete.html'}), )