Merge pull request #409 from zuzak/github

Add pull request notification

modules/project/pages.js

@@ -93,6 +93,7 @@ var pages = function(dbot) {
                 "languageprog": dbot.t("langhead-progress"),
                 "languagetrans": dbot.t("langhead-translations"),
                 "languagetranshead": dbot.t("translations"),
+                "pullreqs": dbot.t("outstanding-pullreq")
            });
         },
     };

modules/project/strings.json

@@ -189,5 +189,11 @@
     },
     "langhead-native": {
         "en": "Native"
+    },
+    "outstanding-pullreq": {
+        "en": "There are outstanding pull requests"
+    },
+    "oaosidl": {
+        "en": "The Official Aberystwyth Open Source International Development League"
     }
 }

public/project.css

@@ -3,6 +3,10 @@ pre#gitdiff {
     width:80;
     margin:auto;
     text-transform:none;
+    clear:both;
+}
+ul#credits {
+    text-transform:capitalize;
 }
 div#main {
     font-size:18px;
@@ -19,6 +23,7 @@ p.intro {
     border:1px solid #ccc;
     padding:20px;
     border-radius:4px;
+    text-transform:none;
 }
 div.progress.open {
     background-color: #f4fff4;
@@ -74,3 +79,28 @@ h3 {
 #translations td {
     text-transform:none;
 }
+p#pullreq {
+    float:right;
+    border-left:1px solid #ccc;
+    border-top:1px solid #ccc;
+    border-top-left-radius:5px;
+    padding:10px;
+    margin:5px;
+    display:none;
+}
+p#revnum {
+    float:left;
+    border-right:1px solid #ccc;
+    border-top:1px solid #ccc;
+    border-top-right-radius: 5px;
+    margin:5px;
+    padding:10px;
+    margin-bottom:0px;
+}
+h2 {
+    border-bottom: 1px solid #ccc;
+    border-top:1px solid #ccc;
+    margin-left:auto;
+    margin-right:auto;
+    width:40%;
+}

views/project/project.jade

@@ -8,12 +8,13 @@ html(lang='#{curr839}')
     link(rel='stylesheet', type='text/css', href='/styles.css')    
     link(rel="stylesheet", href="/project.css")
     title #{pagetitle}
-    - var mstone = "milestone"
-    style(type="text/css")
-       each milestone in milestones
-         - current = mstone+milestone.number
-         - wdth = ((milestone.open_issues/(milestone.open_issues + milestone.closed_issues))*100)
-         .current { width: wdth% }
+    script
+      $(document).ready(function() {
+          $.get("https://api.github.com/repos/#{repo}/pulls", function(data) {
+          if ($.parseJSON(data).length) { $("#pullreq").show();}
+        }); 
+      }); 
+
   body  
     div.container
       div#page
@@ -23,7 +24,9 @@ html(lang='#{curr839}')
             #{dquote}
           section#git
             h2 #{development} 
-            p.center
+            p#pullreq
+              a(href="https://github.com/"+repo+"/pulls") #{pullreqs}
+            p#revnum
               #{revnum}
             pre#gitdiff
               #{diff}
@@ -36,7 +39,7 @@ html(lang='#{curr839}')
                 th #{closedmilestone}
               each milestone in milestones
                 - var wdth = ((milestone.closed_issues/(milestone.open_issues + milestone.closed_issues))*100) 
-                tr(id=mstone+milestone.number)
+                tr(id="milestone"+milestone.number)
                   td
                     a(href="https://github.com/"+repo+"/issues?milestone="+milestone.number)
                       #{milestone.title}
@@ -79,7 +82,7 @@ html(lang='#{curr839}')
                   td #{language.count} / #{translation.en.count}
             h3 #{credits}
             #{thanks}
-            ul
+            ul#credits
               each author in authors
                 li
                   #{author}