Mercurial > kallithea
annotate rhodecode/templates/journal/journal_data.html @ 2375:bc2d8c03c050 beta
Implemented #467 Journal logs comments on changesets
- added created/updated user action to journal
- added created/updated users group action journal
- added ip adresses to most of action_log calls to track IP changes
- rewrote action_parser to simpler and more efficient solution
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 03 Jun 2012 00:40:14 +0200 |
parents | f91d3f9b7230 |
children | 44f328d6f209 |
rev | line source |
---|---|
996
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 ## -*- coding: utf-8 -*- |
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 |
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 %if c.journal_day_aggreagate: |
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
4 %for day,items in c.journal_day_aggreagate: |
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 <div class="journal_day">${day}</div> |
1041
98be43b888c4
Updated new Journal with users and dates aggregates
Marcin Kuzminski <marcin@python-works.com>
parents:
997
diff
changeset
|
6 % for user,entries in items: |
1052
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
7 <div class="journal_container"> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
8 <div class="gravatar"> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
9 <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
10 </div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
11 <div class="journal_user">${user.name} ${user.lastname}</div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
12 <div class="journal_action_container"> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
13 % for entry in entries: |
2375
bc2d8c03c050
Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
14 <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div> |
bc2d8c03c050
Implemented #467 Journal logs comments on changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
15 <div class="journal_action">${h.action_parser(entry)[0]()}</div> |
1052
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
16 <div class="journal_repo"> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
17 <span class="journal_repo_name"> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
18 %if entry.repository is not None: |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
19 ${h.link_to(entry.repository.repo_name, |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
20 h.url('summary_home',repo_name=entry.repository.repo_name))} |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
21 %else: |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
22 ${entry.repository_name} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1746
diff
changeset
|
23 %endif |
1052
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
24 </span> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
25 </div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
26 <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
27 <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
28 %endfor |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
29 </div> |
c96651aebd8a
fixed journal look & feel
Marcin Kuzminski <marcin@python-works.com>
parents:
1045
diff
changeset
|
30 </div> |
996
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
31 %endfor |
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
32 %endfor |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1746
diff
changeset
|
33 |
1746
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
34 <div class="pagination-wh pagination-left"> |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
35 <script type="text/javascript"> |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
36 YUE.onDOMReady(function(){ |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
37 YUE.delegate("journal","click",function(e, matchedEl, container){ |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
38 ypjax(e.target.href,"journal",function(){show_more_event();tooltip_activate();}); |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
39 YUE.preventDefault(e); |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
40 },'.pager_link'); |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
41 }); |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
42 </script> |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
43 ${c.journal_pager.pager('$link_previous ~2~ $link_next')} |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
44 </div> |
996
69e744932d22
Added missing journal_data template
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
45 %else: |
1746
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
46 <div style="padding:5px 0px 10px 10px;"> |
753aeb4a5c58
Journal refresh button
Marcin Kuzminski <marcin@python-works.com>
parents:
1421
diff
changeset
|
47 ${_('No entries yet')} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1746
diff
changeset
|
48 </div> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1746
diff
changeset
|
49 %endif |