fix styles again

diff --git a/example/settings.py b/example/settings.py
index ffde0958b8a9d179c2a04fb450b79027dd075100..af77a8c8aeeda50a5c96637ea5242379d95b6f47 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -154,6 +154,9 @@ TELEMETA_PUBLIC_ACCESS_PERIOD = 51
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
+LOGIN_URL = '/login'
+LOGIN_REDIRECT_URL = '/desk/courses'
+
 EMAIL_HOST = 'localhost'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 

diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css
index c2260112477f3eae0dc6dda9fa821cf105356eb1..827c9e697be38e14e084adcd3a02d62ecd9ad8c2 100644 (file)
--- a/teleforma/htdocs/css/teleforma_black.css
+++ b/teleforma/htdocs/css/teleforma_black.css
@@ -518,10 +518,11 @@ color:#FFF;
     border-bottom:2px solid #000000;
     background-color: #000000;
     color: #FFF;
+    width:100%;
 }
     
 #nav ul li {
-    width:100px;
+    width: 100%;
     float:left;
     border-bottom:0px solid #fff;
 }

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index d22c2dfdf9cbf7a89892467a3495385475335915..a7429c948af085bd44ab8faf2a8374c73dc8235a 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -63,6 +63,7 @@ alt="Telemeta Powered"/>
  </li>
  {% else %}
   <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
+  <li><a href="{% url telemeta-login %}?next={{ request.path|urlencode }}" class="violet">{% trans "Sign in" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
@@ -81,16 +82,9 @@ alt="Telemeta Powered"/>
  <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
  <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
  </ul>
- 
  </li>
  
- <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
- <ul>
- <li><a href="{% url telemeta-admin-general %}">{% trans "General" %}</a></li>
- <li><a href="{% url telemeta-admin-enumerations %}">{% trans "Enumerations" %}</a></li>
- <li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
- </ul>
- </li>
+ <li><a href="{% url telemeta-admin-general %}" class="violet">{% trans "Admin" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
@@ -105,9 +99,7 @@ alt="Telemeta Powered"/>
     <li><a href="{% url telemeta-logout %}">{% trans "Sign out" %}</a></li>
     </ul>
  </li>
-
- {% else %}
- <li><a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a></li>
+ 
  {% endif %}
 
 {% endif %}

diff --git a/teleforma/templates/telemeta/home.html b/teleforma/templates/telemeta/home.html
new file mode 100644 (file)
index 0000000..e2e2750
--- /dev/null
+++ b/teleforma/templates/telemeta/home.html
@@ -0,0 +1,52 @@
+{% extends "telemeta/base.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+{% block content %}
+<div class="home-content">
+<div id="module-set">
+
+{% block modules %}
+
+{% if sound_pub_item %}
+<div id="module" class="module">
+    <h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlist" style="vertical-align:middle" />
+    {% trans "Musical selection" %}</h3>
+    <ul class="playlist">
+    <li><a href="{% url telemeta-item-detail sound_pub_item.public_id %}"><b>{{ sound_pub_item }}</b></a>{% if sound_pub_item.alt_title %} ({{ sound_pub_item.alt_title }}){% endif %}<br /><span style="font-size: 90%">{{ sound_pub_item.location.fullnames|to_string }}</span><br />
+<iframe width='376' height='215' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/archives/items/{{ sound_pub_item.public_id }}/player/362x130/'></iframe>
+    </li>
+    </ul>
+</div>
+{% endif %}
+
+{% with "Last changes" as title %}
+{% include "telemeta/inc/module_revisions.html" %}
+{% endwith %}
+
+{{ block.super }}
+
+{% endblock %}
+
+</div>
+
+<div class="home-description">
+<img class="align-left" src="{% url telemeta-images "vox.png" %}" alt="vox" style="vertical-align:middle;" />
+{{ page_content|render_flatpage }}
+</div>
+
+{% if sound_pub_items %}
+<div style="margin-top: 1ex;font-size: 90%; width: 66%;">
+<div>
+<h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" />
+    {% trans "Musical selection" %}</h1>
+</div>
+{% for item in sound_pub_items %}
+<div style="float: left; margin: 3px;" align="center"><a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>{% if item.alt_title %} ({{ item.alt_title }}){% endif %}<br /><span style="font-size: 80%">{{ item.location.fullnames|to_string }}</span><br />
+<iframe width='376' height='220' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='/archives/items/{{ item.public_id }}/player/362x130/'></iframe></div>
+{% endfor %}
+</div>
+{% endif %}
+
+</div>
+{% endblock %}