Merge pull request #45 from danharibo/master

Webs
2024-11-23 20:39:25 +01:00 · 2012-06-16 20:14:33 -07:00 · 2012-06-16 20:14:33 -07:00 · d1daf51c67
commit d1daf51c67
parent ad180c962d 6c459c5b23
2 changed files with 9 additions and 5 deletions
--- a/views/polls.jade
+++ b/views/polls.jade
@ -27,10 +27,9 @@ ul#votelist
                .vote-track
                    -if(!isNaN(percentage))
                        .vote-percentage(style="width: #{percentage}%")
-                -if(votes == 1)
-                    |#{votes} vote
-                -else
-                    |#{votes} votes
+                case votes
+                    when 1: #{votes} vote 
+                    default: #{votes} votes 
                -if(!isNaN(percentage))
                    |(#{percentage.toFixed(2)}%) 
    -if(hasYouTubeVids)
--- a/views/quotes.jade
+++ b/views/quotes.jade
@ -15,7 +15,12 @@ ul#quotelist
                -else
                    a(href=quote)
                        =quote
-        -else
+        -else if(quote.match(/~~([^~]+)~~/))
+            -var res = quote.match(/~~([^~]+)~~/)
+            -if(res != null)
+                li.quote
+                    a(href="/quotes/#{res[1]}") #{quote}
+        -else 
            li.quote #{quote}
    -if(hasYouTubeVids)
        script(src='/ytembed.js')