From 0cd4db0f943e26a85dd9b0767c1e7439ca43ad56 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 11 Apr 2012 15:47:22 +0200 Subject: [PATCH] fix home --- teleforma/htdocs/css/teleforma_black.css | 4 ++-- teleforma/templates/telemeta/base.html | 2 +- teleforma/templates/telemeta/home.html | 25 +----------------------- teleforma/templates/telemeta/users.html | 1 + 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css index de400f40..2cb119c6 100644 --- a/teleforma/htdocs/css/teleforma_black.css +++ b/teleforma/htdocs/css/teleforma_black.css @@ -1348,7 +1348,7 @@ input,textarea{ float: left; width:55%; padding: 0em 0em 0em 1em; - max-height: 600px; + max-height: 550px; overflow-y: scroll; } @@ -1356,7 +1356,7 @@ input,textarea{ float: left; width:75%; padding: 0em 0.8em 0em 1em; - max-height: 600px; + max-height: 550px; overflow-y: scroll; } diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 3073781d..5909bd14 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -64,7 +64,7 @@ alt="Telemeta Powered"/>--> {% else %}
  • {% trans "Home" %}
  • -
  • {% trans "Sign in" %}
  • +
  • {% trans "Sign in" %}
  • {% endif %} {% if user.is_authenticated %} diff --git a/teleforma/templates/telemeta/home.html b/teleforma/templates/telemeta/home.html index e2e27505..64ca6568 100644 --- a/teleforma/templates/telemeta/home.html +++ b/teleforma/templates/telemeta/home.html @@ -8,18 +8,6 @@ {% block modules %} -{% if sound_pub_item %} -
    -

    playlist - {% trans "Musical selection" %}

    - -
    -{% endif %} - {% with "Last changes" as title %} {% include "telemeta/inc/module_revisions.html" %} {% endwith %} @@ -35,18 +23,7 @@ {{ page_content|render_flatpage }} -{% if sound_pub_items %} -
    -
    -

    playlists - {% trans "Musical selection" %}

    -
    -{% for item in sound_pub_items %} -
    {{ item }}{% if item.alt_title %} ({{ item.alt_title }}){% endif %}
    {{ item.location.fullnames|to_string }}
    -
    -{% endfor %} -
    -{% endif %} +{% trans "Connexion" %} {% endblock %} diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html index 176185e3..a5382100 100644 --- a/teleforma/templates/telemeta/users.html +++ b/teleforma/templates/telemeta/users.html @@ -33,6 +33,7 @@ {% endif %}
    {% trans "Users" %}
    +
    {% if users %} {% include "telemeta/inc/user_list.html" %} {% else %} -- 2.39.5