fix drop down menus for tablets

diff --git a/example/settings.py b/example/settings.py
index 757a535c17743abece5e0e46f12a47f425bd937c..5b56103fdef72896cb63542a1a6f335f5d47c05b 100644 (file)
--- 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 d95ddbea77c339f3d8183f148248ba37127cb350..4c4dad57a3366c755e709567ab91c726f55d0de1 100644 (file)
--- 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 4f313a5b6109b3ca8882d6f7889e8b6da7264cb1..de1095dcd6f14adda3e4f47f4cc67fe38eaf77e9 100644 (file)
--- 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 a25768b8594c52e3532b09d6ec7b2a1c0e2c8896..4ce15ced93f2c35533b8a594cb6ab101e7c5f2e8 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -7,7 +7,7 @@
 
 <head>
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
-<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=1;" />
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.5; user-scalable=1;" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta names="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 
@@ -52,19 +52,19 @@
 {% block header %}
 <div id="header">
 
+<div id="logo_wrapper">
+<div id="logo">
+<img src="{% url telemeta-images "logo_only_22_nb.png" %}" style="vertical-align:middle"
+alt="logo" />
+</div>
+</div>
 
 <div id="menu">
 {% block menu %}
-
 {# spaces between li and a elements breaks layout #}
 
 <ul id="nav">
 
-<div id="logo" style="padding-right:8em; float: left;">
-<!--<img src="{% url telemeta-images "logo_mini_wh.png" %}" style="vertical-align:middle"
-alt="Telemeta Powered"/>-->
-</div>
-
  {% if user.is_authenticated %}
  <li><a href="{% url teleforma-desk %}" class="violet">{% trans "Desk" %}</a>
  </li>
@@ -95,11 +95,7 @@ alt="Telemeta Powered"/>-->
 
  {% if user.is_authenticated %}
   {% if user.is_staff %}
- <li><a href="#admin#" class="blue">{% trans "Admin" %}</a>
-  <ul>
-    <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
-  </ul>
- </li>
+ <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
  {% endif %}
 
  <li><a href="#accounts#" class="blue"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
@@ -121,10 +117,10 @@ alt="Telemeta Powered"/>-->
 {% endif %}
 
 </ul>
-
 {% endblock menu %}
 </div>
 </div>
+
 {% endblock header %}
 
 <div id="content">

diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html
index 7177ad7fa5ac4bc1ebec3fb09301f4004408a8d6..6fa737a49ce945b62793e23b414e308b057b2439 100644 (file)
--- a/teleforma/templates/telemeta/search_criteria.html
+++ b/teleforma/templates/telemeta/search_criteria.html
@@ -71,7 +71,7 @@ $(document).ready(function () {
 
 </div>
 
-<div class="desk_course">
+<div class="desk_center">
 <div class="course">
 <h1>{% trans "Advanced Search" %}</h1>
 <form action="{% url telemeta-search %}" id="searchform">{% csrf_token %}