From 0d62fe465c1c0635905f11d95b07b8e65aef6bab Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 12 Apr 2012 12:59:16 +0200
Subject: [PATCH] add new modules to sandbox, fix doc and styles, users/ goes
 to accounts/

---
 CHANGELOG                                     | 23 +++++++-
 README.rst                                    | 54 +++++++++++++++----
 setup.py                                      |  3 +-
 telemeta/htdocs/css/player.css                |  2 +-
 telemeta/htdocs/timeside/skins/lab/style.css  |  4 +-
 telemeta/templates/telemeta/login.html        |  2 +-
 .../templates/telemeta/mediaitem_detail.html  |  2 +
 telemeta/urls.py                              |  8 +--
 8 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index eeaee8a1..a06cabab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,28 @@
+telemeta (1.4.3-1) unstable; urgency=low
+
+ * add solr-thumbnail for automatic thumbnail handling of all related media images (please install)
+ * add static media handling for solr and all various telemeta public files
+ * fix some wrong user properties
+ * SECURITY: you need to move your TELEMETA_EXPORT_CACHE_DIR from TELEMETA_CACHE_DIR cache (see example/sandbox_sqlite/settings.py)
+ * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player
+ * RECOMMEND: install django-extensions
+
+telemeta (1.4.2-1) unstable; urgency=low
+
+ * add user revisions to user profile
+ * move all edit buttons to main edit pages
+ * new Format object and various enumerations
+ * add last revision to item detail
+ * various bugfixes
+
+telemeta (1.4.1-1) unstable; urgency=low
+
+ * Fix a bug for related media title parsing
+
 telemeta (1.4-1) unstable; urgency=low
 
 For users:
-    
+
  * add a Desk providing links to home and personal data
  * add Fonds, Corpus and their related media to the models and to the search engine
  * add some fancy drop down menus for main tabs
diff --git a/README.rst b/README.rst
index e3d58a3b..6affd9b9 100644
--- a/README.rst
+++ b/README.rst
@@ -45,6 +45,16 @@ See `INSTALL.rst <http://github.com/yomguy/Telemeta/blob/master/INSTALL.rst>`_ a
 News
 ======
 
+1.4.3
+++++++
+
+ * add solr-thumbnail for automatic thumbnail handling of all related media images (please install)
+ * add static media handling for solr and all various telemeta public files
+ * fix some wrong user properties
+ * SECURITY: you need to move your TELEMETA_EXPORT_CACHE_DIR from TELEMETA_CACHE_DIR cache (see example/sandbox_sqlite/settings.py)
+ * EXPERIMENTAL: WebM and MP4 video handling for items, NO transcode but decode, add a nice video.js player
+ * RECOMMEND: install django-extensions
+
 1.4.2
 ++++++
 
@@ -88,23 +98,27 @@ For developers and maintainers:
 
 See INSTALL.rst and email me if any pb! (you may, for example, not use 0002 migration)
 
-Full changelog : see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_
+Full changelog: see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_
 
 
-Development
-===========
+Demo
+====
 
-To participate to the development of telemeta, you will need a login/password couple.
-You're welcome to email us to join and commit your great ideas ;)
+http://demo.telemeta.org
 
-To get the lastest development version, you need subversion and run::
+login: demo
+password: demo
 
-    $ git clone http://vcs.parisson.com/git/telemeta.git
 
-License
-=======
+Original Example
+=================
 
-CeCILL v2 (see LICENSE)
+`Sound archives <http://archives.crem-cnrs.fr>`_ of the French Ethnomusicology Research Center (CREM) et du Musée de l'Homme:
+
+ * a 100 year old world database migrated,
+ * more than 5000 geolocated collections,
+ * more than 32000 geolocated items,
+ * 700 Go of original ethnological music files accessible through the web.
 
 
 Bugs and feedback
@@ -122,7 +136,10 @@ And even if Telemeta suits you, please give us some feedback !
 Related projects
 ================
 
-TimeSide (Web Audio Components): http://code.google.com/p/timeside/
+`TimeSide <http://code.google.com/p/timeside/>`_ - Web Audio Components
+
+    a python library library to compute audio analysis, transcode, and streaming to browsers.
+
 
 
 Contact
@@ -142,6 +159,21 @@ Twitter:
  * http://twitter.com/parisson_studio
 
 
+Development
+===========
+
+You are welcome to participate to the development of the Telemeta project.
+
+To get the lastest development version, you need subversion and run::
+
+    $ git clone http://vcs.parisson.com/git/telemeta.git
+
+License
+=======
+
+CeCILL v2, compatible with GPL v2 (see `LICENSE <http://github.com/yomguy/Telemeta/blob/master/LICENSE`_)
+
+
 Sponsors
 ========
 
diff --git a/setup.py b/setup.py
index 813a3bf0..ba15c071 100644
--- a/setup.py
+++ b/setup.py
@@ -19,10 +19,11 @@ setup(
         'django-json-rpc',
         'timeside',
         'south',
+        'sorl-thumbnail',
         'django-pagination',
         'django-postman',
         'django-socialregistration',
-        'sorl-thumbnail',
+        'django-extensions',
   ],
   platforms=['OS Independent'],
   license='CeCILL v2',
diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index a1c19d95..009155ab 100644
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -19,7 +19,7 @@
     float: left;
     width: 18px;
     padding: 10px 0 0 0;
-    height: 0px !important; 
+    height: 0px !important;
     height /**/:10px; /* for IE5/Win only */
     background-image: url('../images/maximize.png');
     text-decoration: none;
diff --git a/telemeta/htdocs/timeside/skins/lab/style.css b/telemeta/htdocs/timeside/skins/lab/style.css
index 712aec24..9400b0dc 100755
--- a/telemeta/htdocs/timeside/skins/lab/style.css
+++ b/telemeta/htdocs/timeside/skins/lab/style.css
@@ -111,7 +111,7 @@
     background-image: url('img/volumeoff.png');
     width:24px;
 }
-.ts-player .ts-control .ts-volume-bar-container { 
+.ts-player .ts-control .ts-volume-bar-container {
     background: url('img/controlbg-inverted.png');
     background-position: -3px left;
     background-repeat: repeat-x;
@@ -121,7 +121,7 @@
      -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border-radius: 5px;
-    
+
 }
 .ts-player .ts-control .ts-volume-bar { /*width will be changed inside the code*/
     background-color: #e4eaf1;
diff --git a/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html
index e4c58c07..9e51b1a2 100644
--- a/telemeta/templates/telemeta/login.html
+++ b/telemeta/templates/telemeta/login.html
@@ -19,6 +19,6 @@
 <a href="#" class="component_icon button icon_login" style="float: right;"
                 onclick="document.getElementById('_loginForm').submit(); return false;">{% trans "Sign in" %}</a>
 <input type="hidden" name="next" value="{{ next }}" />
-<span style="align: right;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
+<span style="align: right; font-weight: bold;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
 </form>
 {% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 6abb4dd4..12bdb8a6 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -113,8 +113,10 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 
     {% if public_access or perms.telemeta.can_play_all_items %}
     <div id="player_maximized" class="ts-skin-lab">
+       <div id="player_header">
         <a href="#" class="toggle">Minimize</a>
         <a href="#" class="embed_player_frame">&lt;/&gt;</a>
+       </div>
         <div class="wazing"></div>
     </div>
     <div id="rightcol">
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 16593f81..f0baa615 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -304,7 +304,7 @@ urlpatterns = patterns('',
     url(r'^logout/$', general_view.logout, name="telemeta-logout"),
 
     # Users
-    url(r'^users/$', general_view.users, name="telemeta-users"),
+    url(r'^accounts/', general_view.users, name="telemeta-users"),
 
     # Desk
     url(r'^desk/lists/$', general_view.lists, name="telemeta-desk-lists"),
@@ -312,9 +312,9 @@ urlpatterns = patterns('',
     url(r'^desk/home/$', general_view.home, name="telemeta-desk-home"),
 
     # Profiles
-    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),
-    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"),
-    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"),
+    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"),
+    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"),
+    url(r'^accounts/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"),
 
     # Registration
     url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="telemeta-password-change"),
-- 
2.39.5