From f4a3452514cb14b81830fa18a294ab24d382787a Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 13 Apr 2012 15:43:04 +0200 Subject: [PATCH] fix drop down menus for tablets --- example/settings.py | 12 ++-- setup.py | 6 +- teleforma/htdocs/css/teleforma.css | 60 ++++++++++++------- teleforma/templates/telemeta/base.html | 22 +++---- .../templates/telemeta/search_criteria.html | 2 +- 5 files changed, 55 insertions(+), 47 deletions(-) diff --git a/example/settings.py b/example/settings.py index 757a535c..5b56103f 100644 --- a/example/settings.py +++ b/example/settings.py @@ -94,12 +94,12 @@ STATICFILES_FINDERS = ( SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5' # List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - ('django.template.loaders.cached.Loader', ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - )), -) +#TEMPLATE_LOADERS = ( +# ('django.template.loaders.cached.Loader', ( +# 'django.template.loaders.filesystem.Loader', +# 'django.template.loaders.app_directories.Loader', +# )), +#) MIDDLEWARE_CLASSES = ( diff --git a/setup.py b/setup.py index d95ddbea..4c4dad57 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,15 @@ # -*- coding: utf-8 -*- + from setuptools import setup, find_packages -import os import teleforma CLASSIFIERS = ['Environment :: Web Environment', 'Framework :: Django', 'Intended Audience :: Education', 'Programming Language :: Python', 'Programming Language :: JavaScript', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Analysis', 'Topic :: Multimedia :: Sound/Audio :: Players', 'Topic :: Scientific/Engineering :: Information Analysis', 'Topic :: System :: Archiving', ] -README = os.path.join(os.path.dirname(__file__), 'README.rst') - setup( name = "TeleForma", url = "http://parisson.com", description = "open multimedia e-leaning system", - long_description = open(README).read(), + long_description = open('README.rst').read(), author = "Guillaume Pellerin", author_email = "yomguy@parisson.com", version = teleforma.__version__, diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css index 4f313a5b..de1095dc 100644 --- a/teleforma/htdocs/css/teleforma.css +++ b/teleforma/htdocs/css/teleforma.css @@ -98,6 +98,20 @@ a img { border: none; } color: #000000; } +#logo_wrapper { + width: 3%; + margin: 0 auto; + float: left; +} + +#logo { + width: 3%; + margin:0px auto; + padding-top: 0.6em; + padding-bottom: 0.5em; + + } + #logo a, #logo a:hover { border: none; background: transparent; } #header { @@ -387,7 +401,7 @@ form.login .submit { #searchform fieldset { background-color: #FFF; padding: .8em; - width: 650px; + width: 100%; border: none; margin-bottom: 1em; -moz-border-radius: 8px 0px 8px 8px; @@ -402,10 +416,10 @@ form.login .submit { font-size: 0.8em; display: block; float: left; - width: 30%; + width: 20%; margin-left: 15px; margin-top: .2em; - line-height: 1.8em; + line-height: 1.5em; font-weight: bold; color: #333; text-transform: uppercase; @@ -437,7 +451,7 @@ form.login .submit { background-repeat:repeat; font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif; border-top: 1px solid #333; - padding-left: 5.5%; + padding-left: 5.1%; } #menu a, #menu a:visited{ @@ -535,9 +549,9 @@ color:#FFF; /* display block will make the link fill the whole area of LI */ #nav ul a { display:block; - height:15px; - padding: 5px 5px; - font-size: 11px; + height:22px; + padding: 0.8em 0.5em 0.5em 0.5em; + font-size: 0.9em; text-align:left; -webkit-border-top-left-radius:0px 0px; moz-border-radius-topleft: 0px 0px; @@ -1262,55 +1276,55 @@ a.image-link { /* FORMS */ #id_title { - width: 500px; + width: 250px; } #id_alt_title { - width: 500px; + width: 250px; } #id_collector { - width: 500px; + width: 250px; } #id_creator { - width: 500px; + width: 250px; } #id_cultural_area { - width: 500px; + width: 250px; } #id_location_comment { - width: 500px; + width: 250px; } #id_old_code { - width: 500px; + width: 250px; } #id_code { - width: 500px; + width: 250px; } #id_author { - width: 500px; + width: 250px; } #id_collector_selection { - width: 500px; + width: 250px; } #id_booklet_author { - width: 500px; + width: 250px; } #id_alt_ids { - width: 500px; + width: 250px; } #id_travail { - width: 500px; + width: 250px; } #id_value_add { width: 200px; } #id_value_edit { - width: 500px; + width: 250px; } #id_file { - width: 500px; + width: 250px; } #id_conservation_site { - width: 500px; + width: 250px; } /*focus on elements*/ diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index a25768b8..4ce15ced 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -7,7 +7,7 @@ - + @@ -52,19 +52,19 @@ {% block header %} + {% endblock header %}
diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html index 7177ad7f..6fa737a4 100644 --- a/teleforma/templates/telemeta/search_criteria.html +++ b/teleforma/templates/telemeta/search_criteria.html @@ -71,7 +71,7 @@ $(document).ready(function () {
-
+

{% trans "Advanced Search" %}

{% csrf_token %} -- 2.39.5