Metric object now implements comparable. Adjust gravatar css.

diff --git a/resources/bootstrap.gb.css b/resources/bootstrap.gb.css
index 1eae63de088cd4528b724d2f902ec30ac52cc2b4..06c4670954a4950abf42430291d80e9f009df6e0 100644 (file)
--- a/resources/bootstrap.gb.css
+++ b/resources/bootstrap.gb.css
@@ -170,6 +170,13 @@ img.overview {
        border:1px solid #CCCCCC;\r
 }\r
 \r
+img.gravatar {\r
+    background-color: #ffffff;\r
+    border: 1px solid #ddd;\r
+    border-radius: 5px;\r
+    padding: 2px;\r
+}\r
+\r
 div.header, div.commitHeader, table.repositories th {\r
        background-color:#e0e0e0;\r
        background-repeat:repeat-x;\r

diff --git a/src/com/gitblit/models/Metric.java b/src/com/gitblit/models/Metric.java
index e7c49a45a6cf0c5f2a88dd4cbbab397e574d819d..2845c5273e8a9693ac51df19900a5024ebd3dabe 100644 (file)
--- a/src/com/gitblit/models/Metric.java
+++ b/src/com/gitblit/models/Metric.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
  * @author James Moger\r
  * \r
  */\r
-public class Metric implements Serializable {\r
+public class Metric implements Serializable, Comparable<Metric> {\r
 \r
        private static final long serialVersionUID = 1L;\r
 \r
@@ -36,4 +36,15 @@ public class Metric implements Serializable {
        public Metric(String name) {\r
                this.name = name;\r
        }\r
+\r
+       @Override\r
+       public int compareTo(Metric o) {\r
+               if (count > o.count) {\r
+                       return -1;\r
+               }\r
+               if (count < o.count) {\r
+                       return 1;\r
+               }\r
+               return 0;\r
+       }\r
 }
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/GravatarImage.java b/src/com/gitblit/wicket/GravatarImage.java
index ff26fc099efe80b3f14389bcffb03cd9327a844a..88c97c937c4bfb1f4186d2800d1fe417ce0e5766 100644 (file)
--- a/src/com/gitblit/wicket/GravatarImage.java
+++ b/src/com/gitblit/wicket/GravatarImage.java
@@ -50,6 +50,7 @@ public class GravatarImage extends WebComponent {
                String url = MessageFormat.format("http://www.gravatar.com/avatar/{0}?s={1,number,0}&d=identicon", authorhash, width);\r
                add(new AttributeModifier("src", true, new Model<String>(url)));\r
                setVisible(GitBlit.getBoolean(Keys.web.allowGravatar, true));\r
+               WicketUtils.setCssClass(this, "gravatar");\r
        }\r
 \r
        @Override\r