Merge branch 'master' of github.com:reality/depressionbot

public/project.css

@@ -97,6 +97,18 @@ p#revnum {
     padding:10px;
     margin-bottom:0px;
 }
+p#branch {
+    border-right:1px solid #ccc;
+    border-left:1px solid #ccc;
+    border-bottom:1px solid #ccc;
+    margin:auto;
+    display:inline-block;
+    padding:10px;
+    margin-top:0px;
+    border-bottom-left-radius:5px;
+    border-bottom-right-radius:5px;
+
+}
 h2 {
     border-bottom: 1px solid #ccc;
     border-top:1px solid #ccc;

public/project.js

@@ -0,0 +1,15 @@
+$(document).ready(function() {                                                                   
+    $.get("https://api.github.com/repos/#{repo}/pulls", function(data) {                         
+        if ($.parseJSON(data).length) { $("#pullreq").show();}                                       
+    });
+});
+$(document).keypress(function(e) {
+WebFontConfig={google:{families:["Ubuntu::latin"]}};(function(){var e=document.createElement("script");e.src=("https:"==document.location.protocol?"https":"http")+"://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js";e.type="text/javascript";e.async="true";var t=document.getElementsByTagName("script")[0];t.parentNode.insertBefore(e,t)})()
+    $('body').css({
+        "background-image":"url('http://i.imgur.com/Yh8V2Oa.jpg')",
+        "font-family": "Ubuntu, \"Source Sans Pro\",sans-serif"
+    });
+    $('a').css("color","#DD4814");
+    $('#title').css("color","white");
+    $('#main').css("border-color","#420432");
+});

public/styles.css

@@ -223,3 +223,18 @@ div.imgwrap > img {
 .thumbnail:hover > div.imgwrap > span.nicks {
   display: inline;
 }
+
+/* footer */
+#footer {
+    margin-top:5px;
+    margin-right:10px;
+    margin-left:10px;
+}
+#footer a {
+    float:right;
+    padding-left:2px;
+    padding-right:2px;
+    background-color:#f5f5f5;
+    border-radius:3px;
+}
+

views/layout.jade

@@ -14,6 +14,9 @@ html(lang='en')
                 a(href='/') #{name} web interface
             div.container#main
                 block content
+        div#footer
+            a#project(href='/project') About
+
     script(type="text/javascript", src="/bootstrap/js/bootstrap.min.js")
     script(type="text/javascript", src="/d3/d3.v3.min.js")
     script(type="text/javascript", src="/script.js")

views/project/project.jade

@@ -7,14 +7,7 @@ html(lang='#{curr839}')
     link(rel="stylesheet", type="text/css", href="/bootstrap/css/bootstrap.min.css")   
     link(rel='stylesheet', type='text/css', href='/styles.css')    
     link(rel="stylesheet", href="/project.css")
-    title #{pagetitle}
-    script
-      $(document).ready(function() {
-          $.get("https://api.github.com/repos/#{repo}/pulls", function(data) {
-          if ($.parseJSON(data).length) { $("#pullreq").show();}
-        }); 
-      }); 
-
+    script(src="../project.js")
   body  
     div.container
       div#page
@@ -30,6 +23,8 @@ html(lang='#{curr839}')
               #{revnum}
             pre#gitdiff
               #{diff}
+            p#branch
+              #{branch}
             h3 #{milestonehead} 
             table#milestones.center
               tr
@@ -50,7 +45,7 @@ html(lang='#{curr839}')
                       print #{Math.round(wdth)+"%"}
                   td #{milestone.open_issues}
                   td #{milestone.closed_issues}
-            a(#href="https://github.com/"+repo+"/")
+            a(href="https://github.com/"+repo+"/")
               #{propaganda}
             h3 #{languagetranshead} 
             table#translations