From 44548615034212a2d856926947dc276ae29fd553 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 4 Oct 2008 14:26:52 +0530 Subject: Prettify the webinterface * Official AutotuA icon! * Various prettifications; do I really need to list them? :p --- master/icons/Makefile | 14 +- master/icons/autotua.svg | 100 +++++ master/icons/password.svg | 557 ++++++++++++++++++++++++ master/master/media/css/default.css | 23 +- master/master/media/css/login.css | 15 +- master/master/media/images/.gitignore | 2 + master/master/templates/basic.html | 4 +- master/master/templates/frontpage.html | 2 +- master/master/templates/registration/login.html | 22 +- 9 files changed, 712 insertions(+), 27 deletions(-) create mode 100644 master/icons/autotua.svg create mode 100644 master/icons/password.svg diff --git a/master/icons/Makefile b/master/icons/Makefile index 11d812b..09c218a 100644 --- a/master/icons/Makefile +++ b/master/icons/Makefile @@ -4,22 +4,22 @@ # INSTALL=install -CONVERT=rsvg-convert --width=96 -CONVERT_SMALL=rsvg-convert --width=32 +CONVERT=rsvg-convert --height=96 +CONVERT_MEDIUM=rsvg-convert --height=48 IMGS=jobs.png master.png slaves.png users.png -IMGS_SMALL=home.png login.png logout.png +IMGS_MEDIUM=autotua.png home.png login.png logout.png password.png IMGMODE=644 all: for img in ${IMGS}; do ${CONVERT} -o $$img $${img%.png}.svg; done - for img in ${IMGS_SMALL}; do ${CONVERT_SMALL} -o $$img $${img%.png}.svg; done + for img in ${IMGS_MEDIUM}; do ${CONVERT_MEDIUM} -o $$img $${img%.png}.svg; done clean: - rm -f ${IMGS} ${IMGS_SMALL} + rm -f ${IMGS} ${IMGS_MEDIUM} install: all test -n "${DESTDIR}" || ( echo "Please define DESTDIR" ; exit 1 ) - ${INSTALL} -m ${IMGMODE} ${IMGS} ${IMGS_SMALL} -t ${DESTDIR}/master/media/images || exit $$? + ${INSTALL} -m ${IMGMODE} ${IMGS} ${IMGS_MEDIUM} -t ${DESTDIR}/master/media/images || exit $$? uninstall: - for img in ${IMGS} ${IMGS_SMALL}; do rm -f ${DESTDIR}/master/media/images/$$img; done + for img in ${IMGS} ${IMGS_MEDIUM}; do rm -f ${DESTDIR}/master/media/images/$$img; done diff --git a/master/icons/autotua.svg b/master/icons/autotua.svg new file mode 100644 index 0000000..217bdb7 --- /dev/null +++ b/master/icons/autotua.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + Auto + Auto + + + diff --git a/master/icons/password.svg b/master/icons/password.svg new file mode 100644 index 0000000..92c084b --- /dev/null +++ b/master/icons/password.svg @@ -0,0 +1,557 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + + Ulisse Perusin + + + Keys + + + keys + key + password + authentication + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/master/master/media/css/default.css b/master/master/media/css/default.css index 6fa6b1e..5e657f9 100644 --- a/master/master/media/css/default.css +++ b/master/master/media/css/default.css @@ -27,16 +27,19 @@ img { float: left; } -a { +a:link { + color: black; text-decoration: none; } -a:link { - color: #4d4d4d; +a:visited { + color: gray; + text-decoration: none; } -a:visited, a:hover { - color: black; +a:hover { + color: #424242; + text-decoration: underline; } #topcurves { @@ -62,6 +65,16 @@ a:visited, a:hover { float: left; margin-right: 1%; margin-left: 1%; + margin-bottom: 1px; +} + +#header img { + margin-bottom: 1px; +} + +#header img:hover { + margin-bottom: 0px; + border-bottom: dotted 1px; } #content { diff --git a/master/master/media/css/login.css b/master/master/media/css/login.css index 15eb665..eb84c2b 100644 --- a/master/master/media/css/login.css +++ b/master/master/media/css/login.css @@ -11,7 +11,16 @@ span.login-box { div.login-box { text-align: center; - width: 30%; - margin-left: 35%; - margin-right: 35%; + width: 80%; +} + +span.login { + width: 33%; +} + +.errors { + color: gray; + margin-bottom: 1em; + text-align: center; + float: none; } diff --git a/master/master/media/images/.gitignore b/master/master/media/images/.gitignore index e24d9f5..c7d2713 100644 --- a/master/master/media/images/.gitignore +++ b/master/master/media/images/.gitignore @@ -1,7 +1,9 @@ +autotua.png home.png jobs.png login.png logout.png master.png +password.png slaves.png users.png diff --git a/master/master/templates/basic.html b/master/master/templates/basic.html index 9e5e53a..cf19de3 100644 --- a/master/master/templates/basic.html +++ b/master/master/templates/basic.html @@ -23,10 +23,10 @@ {% if user.is_authenticated %} {% else %} - + {% endif %} - Zomg, AutotuA. + {% if user.is_authenticated %} diff --git a/master/master/templates/frontpage.html b/master/master/templates/frontpage.html index 6b1b6e9..dd951ad 100644 --- a/master/master/templates/frontpage.html +++ b/master/master/templates/frontpage.html @@ -12,7 +12,7 @@ {% block content %}
- +
diff --git a/master/master/templates/registration/login.html b/master/master/templates/registration/login.html index 3dcf2dd..a6467d8 100644 --- a/master/master/templates/registration/login.html +++ b/master/master/templates/registration/login.html @@ -12,16 +12,20 @@ {% block content %} {% if form.errors %} -

Your username and password didn't match. Please try again.

+
Your username and password didn't match. Please try again.
{% endif %} - + + + {% endblock %} -- cgit v1.2.3-65-gdbad