Commits

Arnaud Grausem committed 43ea011 Merge

Merge with stable

Comments (0)

Files changed (8)

+d92cbd3f49ab67f0b4e318c598ee6495c9fdf89a 0.5.2
     height: auto;
     width: 250px;
     border: 2px solid #848B6A;
+    margin-bottom: 20px;
 }
 
 div#tasks p
     background-color: #FFFFFF;
 }
 
-a.help
-{
-    float: right;
-    height: 16px;
-    margin-right: 10px;
-}
-
 select
 {
     width: 200px;
     border-bottom: 1px solid #777777;
 }
 
+div.childs a
+{
+    margin-right: 36px;
+}
+
+div.childs a.help
+{
+    float: right;
+    height: 16px;
+    margin-right: 10px;
+}
+
 div.tooltip 
 {
     position: absolute;
 #weekly #tasks
 {
     float: left;
+    margin: 0 10px 10px 0;
 }
 
 #weekly #logger

media/js/timesheet.js

         var id = $(this).attr('id');
         get_tasks(id.replace('task_', ''));
     });
-    $('#tasks').children('p').children("a[id*='task_']").parent().addClass('with_child');
     $("a[id*='extra_t_form-']").bind('click', function(e) {
         $('#tactivities').css('width', 'auto');
         $('#tasks').css('margin-right', '10px');

templates/timesheet/includes/tasks.html

 {% for task in tasks %}
     <p class="{% if not forloop.last %}not_last{% endif %} {% if task.has_childs %}with_child{% endif %}">
         <a class="" description="{{ task.description|default:"" }}" id="task_{{ task.id }}" href="#">{{ task.name }}</a>
-        {% if not task.has_childs %}
+        {% if not task.has_childs and task.description %}
         <a class="help" description="{{ task.description|default:"" }}" href="#">
             <img class="action" src="/static/img/help.png" alt="{% trans "Help" %}">
         </a>
 """
 
 
-VERSION = (0, 9, 2, 'beta')
+VERSION = (0, 5, 3, 'stable')

thot/timesheet/managers.py

         
         for task in tasks.select_related('frequencies'):
             try:
-                task.counter = task.work_set.get(task=task, user=user).counter
+                task.counter = task.works.get(task=task, user=user).counter
             except:
                 task.counter = 0
             task_list.append(task)