kallithea Changeset - c96651aebd8a

Changeset - c96651aebd8a

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-15 19:45:15
marcin@python-works.com

fixed journal look & feel

3 files changed with 46 insertions and 30 deletions:

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

rhodecode/templates/journal/journal_data.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -477,13 +477,12 @@ def action_parser(user_log): @@
             html_tmpl = '<span id="%s" style="display:none"> %s </span>'
             cs_links += html_tmpl % (uniq_id, ', '.join([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name, revision=rev),
                 title=message(rev), class_='tooltip')
                 for rev in revs[revs_limit:revs_top_limit]]))
         cs_links += _(' into')
         if len(revs) > 1:
             cs_links += compare_view
         return cs_links
     def get_fork_name():
         repo_name = action_params
@@ @@ -495,25 +494,27 @@ def action_parser(user_log): @@
            'user_forked_repo':(_('[forked] repository as:'), get_fork_name),
            'user_updated_repo':(_('[updated] repository'), None),
            'admin_deleted_repo':(_('[delete] repository'), None),
            'admin_created_repo':(_('[created] repository'), None),
            'admin_forked_repo':(_('[forked] repository'), None),
            'admin_updated_repo':(_('[updated] repository'), None),
            'push':(_('[pushed]'), get_cs_links),
            'pull':(_('[pulled]'), None),
            'push':(_('[pushed] into'), get_cs_links),
            'pull':(_('[pulled] into'), None),
            'started_following_repo':(_('[started following] repository'), None),
            'stopped_following_repo':(_('[stopped following] repository'), None),
+            }
     action_str = map.get(action, action)
     action = action_str[0].replace('[', '<span class="journal_highlight">')\
                    .replace(']', '</span>')
     action_params_func = lambda :""
     if action_str[1] is not None:
-        action = action + " " + action_str[1]()
+        action_params_func = action_str[1]
     return literal(action)
+    return [literal(action), action_params_func]
 def action_parser_icon(user_log):
     action = user_log.action
     action_params = None
     x = action.split(':')

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1410,47 +1410,60 @@ font-size:20px; @@
 padding:10px 0px;
 border-bottom:2px solid #DDD;
 margin-left:10px;
 margin-right:10px;
+}
 #journal .journal_container{
 padding:5px;
 clear:both;
 margin:0px 5px 0px 10px;
+}
 #journal .journal_action_container{
 padding-left:38px;
+}
 #journal .journal_user{
 color: #747474;
 font-size: 14px;
 font-weight: bold;
 height: 30px;
+}
 #journal .journal_icon{
 clear: both;
 float: left;
 padding-left: 36px;
 padding-right: 4px;
 padding-top: 3px;
+}
 #journal .journal_action{
 padding-top:4px;
 min-height:2px;
 float:left
+}
 #journal .journal_action_params{
 clear: left;
 padding-left: 22px;
+}
 #journal .journal_repo{
 float: left;
 margin-left: 6px;
 padding-top: 3px;
+}
 #journal .date{
 clear: both;
 color: #777777;
 font-size: 11px;
-padding-left: 56px;
+padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name{
 font-weight: bold;
 font-size: 1.1em;
+}
 #journal .compare_view{
-padding: 5px 0px 5px 3px;
+padding: 5px 0px 5px 0px;
 width: 95px;
+}
 .journal_highlight{
 font-weight: bold;
 padding: 0 2px;
 vertical-align: bottom;

rhodecode/templates/journal/journal_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.journal_day_aggreagate:
     %for day,items in c.journal_day_aggreagate:
     <div class="journal_day">${day}</div>
         % for user,entries in items:
         <div style="padding:10px">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/>
             </div>
             <div class="journal_user">${user.name} ${user.lastname}</div>
             % for entry in entries:
             <div class="journal_icon"> ${h.action_parser_icon(entry)}</div>
             <div class="journal_action">${h.action_parser(entry)}</div>
             <div class="journal_repo">
                 <span class="journal_repo_name">
                 %if entry.repository is not None:
                   ${h.link_to(entry.repository.repo_name,
                               h.url('summary_home',repo_name=entry.repository.repo_name))}
                 %else:
                   ${entry.repository_name}
                 %endif
                 </span>
             </div>
             <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div>
             %endfor
         </div>
         <div style="clear:both;border-bottom:1px dashed #DDD;padding:3px 3px;margin:0px 10px 0px 10px"></div>
 	        <div class="journal_container">
 	            <div class="gravatar">
 	                <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/>
 	            </div>
 	            <div class="journal_user">${user.name} ${user.lastname}</div>
 	            <div class="journal_action_container">
 	            % for entry in entries:
 		            <div class="journal_icon"> ${h.action_parser_icon(entry)}</div>
 		            <div class="journal_action">${h.action_parser(entry)[0]}</div>
 		            <div class="journal_repo">
 		                <span class="journal_repo_name">
 		                %if entry.repository is not None:
 		                  ${h.link_to(entry.repository.repo_name,
 		                              h.url('summary_home',repo_name=entry.repository.repo_name))}
 		                %else:
 		                  ${entry.repository_name}
 		                %endif
 		                </span>
 		            </div>
 		            <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
 		            <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div>
 	            %endfor
 	            </div>
 	        </div>
         %endfor
     %endfor
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
   var data_div = 'journal';

0 comments (0 inline, 0 general)