fixed journal look & feel

rhodecode/lib/helpers.py

@@ -480,7 +480,6 b' def action_parser(user_log):'
                 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
@@ -498,8 +497,8 b' def action_parser(user_log):'
            '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),
             }
@@ -507,10 +506,12 b' def action_parser(user_log):'
     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

rhodecode/public/css/style.css

@@ -1413,6 +1413,16 b' 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;
@@ -1422,7 +1432,6 b' height: 30px;'
 #journal .journal_icon{
 clear: both;
 float: left;
-padding-left: 36px;
 padding-right: 4px;
 padding-top: 3px;
 }
@@ -1431,6 +1440,10 b' 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;
@@ -1440,14 +1453,14 b' padding-top: 3px;'
 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{

rhodecode/templates/journal/journal_data.html

@@ -4,28 +4,30 b''
     %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