go to 0.6, fix profile button

diff --git a/setup.py b/setup.py
index 4c4dad57a3366c755e709567ab91c726f55d0de1..0e7087012b07aa9d2cc4db863c6a934396f4853c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup, find_packages
-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',  ]
 
@@ -12,7 +11,7 @@ setup(
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = teleforma.__version__,
+  version = '0.6',
   install_requires = [
         'django>=1.4',
         'telemeta',

diff --git a/teleforma/__init__.py b/teleforma/__init__.py
index 4b1177601a27335818b4993a0a82e0d1217fdc11..247b34f3bdc1a693a7d4560823a2c05e0a5c0e69 100755 (executable)
--- a/teleforma/__init__.py
+++ b/teleforma/__init__.py
@@ -9,7 +9,7 @@ U{http://parisson.com/products/teleforma}
 """
 
 __docformat__ = 'epytext en'
-__version__ = '0.5'
+__version__ = '0.6'
 __url__ = 'http://parisson.com/products/teleforma'
 __copyright__ = '(C) 2011-2012 Parisson'
 __license__ = 'CeCILL-v2'

diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 905d6986ef99cf9f1fffd7da89206a141630da27..58c0a96c656df27c6cf93a4ab1083fca3f719686 100644 (file)
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -44,14 +44,13 @@
     <h1>{% trans "User profile" %} : {{ usr.username }}
     </h1>
 
-    {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
     <div id="password" style="float: right;">
-    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
     {% if user.is_authenticated and user.username == usr.username %}
     <a href="{% url telemeta-password-change %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
+    {% elif user.is_staff %}
+        <a href="{% url teleforma-user-login usr.id %}" class="component_icon button icon_login">{% trans "Login as" %}</a>
     {%  endif %}
     </div>
-    {%  endif %}
 
    <div class="course_content">
 
@@ -102,10 +101,7 @@
   </div>
 
 <div class="buttons">
-{% if user.username != usr.username and user.is_staff %}
-<a href="{% url teleforma-user-login usr.id %}" class="component_icon button icon_login">{% trans "Login as" %}</a>
-<a href="{% url telemeta-password-change usr.id %}" class="component_icon button icon_login">{% trans "Password reset" %}</a>
-{% endif %}
+<!--<a href="{% url telemeta-password-change %}" class="component_icon button icon_login">{% trans "Password reset" %}</a>-->
 </div>
 
 </div>