diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 5dd5687..9e4d314 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -494,3 +494,8 @@ padding-right: 0.5em; margin-top: -4px; color: #999; } +.msg-git-hash{ + font-family:monospace; + background-color:#eee; + color:#777; +} diff --git a/pagure/templates/activity.html b/pagure/templates/activity.html index c68db22..4113642 100644 --- a/pagure/templates/activity.html +++ b/pagure/templates/activity.html @@ -74,7 +74,24 @@ function processMessages(item, lastitem) { return "ISSUE#"+item["msg"]["issue"]["id"] } else if (item["topic"].indexOf("io.pagure.prod.pagure.project") > -1 ){ if (item["topic"]=="io.pagure.prod.pagure.project.forked"){ - $("#messages").append("
"+item["msg"]["agent"]+" forked "+item["msg"]["project"]["name"]+" into "+item["msg"]["agent"]+"/"+item["msg"]["project"]["name"]+"
"+item["meta"]["date"]+"
"); + $("#messages").append("
"+item["msg"]["agent"]+" forked "+item["msg"]["project"]["name"]+" into "+item["msg"]["agent"]+"/"+item["msg"]["project"]["name"]+"
"+item["meta"]["date"]+"
"); + } else { + $("#messages").append("
"+item["meta"]["subtitle"]+"
"); + } + return ""; + } else if (item["topic"].indexOf("io.pagure.prod.pagure.git") > -1 ){ + if (lastitem.valueOf() != new String("GITCOMMIT#"+item["msg"]["commit"]["branch"]).valueOf()) + { + $("#messages").append("
New commits to "+item['msg']['commit']['branch'].replace("refs/heads/","")+"
"+item["meta"]["date"]+"
"); + } + if (item["topic"]=="io.pagure.prod.pagure.git.receive"){ + $("#messages").append("\ + \ +
\ + "+item["msg"]["commit"]["name"]+" committed "+item["msg"]["commit"]["rev"].substring(0,6)+" "+item["msg"]["commit"]["message"]+" \ +
\ +
"); + return "GITCOMMIT#"+item["msg"]["commit"]["branch"]; } else { $("#messages").append("
"+item["meta"]["subtitle"]+"
"); } @@ -89,7 +106,7 @@ $(document).ready(function() { var page = null; pants = $.ajax({ type: 'GET', - url: "{{ config.get('DATAGREPPER_URL') }}/raw?category={{ config.get('DATAGREPPER_CATEGORY') }}&contains=%22name%22:%22{{repo.name}}%22&meta=link&meta=date&meta=subtitle", + url: "{{ config.get('DATAGREPPER_URL') }}/raw?delta=2592000&category={{ config.get('DATAGREPPER_CATEGORY') }}&category=git&contains=%22name%22:%22{{repo.name}}%22&meta=link&meta=date&meta=subtitle", async: false, contentType: "application/json", dataType: 'jsonp', @@ -113,7 +130,7 @@ $(document).ready(function() { $("#loadmore").hide(); $.ajax({ type: 'GET', - url: "{{ config.get('DATAGREPPER_URL') }}/raw?category={{ config.get('DATAGREPPER_CATEGORY') }}&contains=%22name%22:%22{{repo.name}}%22&meta=link&meta=date&meta=subtitle&page="+page, + url: "{{ config.get('DATAGREPPER_URL') }}/raw?delta=2592000&category={{ config.get('DATAGREPPER_CATEGORY') }}&category=git&contains=%22name%22:%22{{repo.name}}%22&meta=link&meta=date&meta=subtitle&page="+page, async: false, contentType: "application/json", dataType: 'jsonp',