From 890a723a2fe31d2161a571587a7485ebc9a80dfd Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Sun, 4 Dec 2011 13:38:56 -0500
Subject: [PATCH] Highlight current tag and kill flash copy

---
 snipt/media/css/style.less                    |  4 +++
 snipt/media/js/src/modules/snipt.js           | 22 +++++++-------
 snipt/settings.py                             | 29 +++++++++----------
 .../snipts/templates/snipts/tags-public.html  |  4 +--
 snipt/snipts/templates/snipts/tags-user.html  |  4 +--
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/snipt/media/css/style.less b/snipt/media/css/style.less
index 201c500..36d1729 100644
--- a/snipt/media/css/style.less
+++ b/snipt/media/css/style.less
@@ -305,6 +305,10 @@ section.main {
                     font-weight: bold;
                     margin: 0 0 0 22px;
                 }
+                &.active {
+                    border-bottom: 1px solid #2B6E9B;
+                    color: #2B6E9B;
+                }
             }
         }
         nav.footer {
diff --git a/snipt/media/js/src/modules/snipt.js b/snipt/media/js/src/modules/snipt.js
index b846f04..a6a48e8 100644
--- a/snipt/media/js/src/modules/snipt.js
+++ b/snipt/media/js/src/modules/snipt.js
@@ -33,17 +33,17 @@
             var copy_do = this.$copy_do;
             var copy_done = this.$copy_done;
 
-            this.$copy_button.zclip({
-                afterCopy: function() {
-                    copy_do.hide();
-                    copy_done.fadeIn(500);
-                    setTimeout(function() {
-                        copy_done.hide();
-                        copy_do.fadeIn(500);
-                    }, 1500);
-                },
-                copy: this.$raw.text()
-            });
+            //this.$copy_button.zclip({
+                //afterCopy: function() {
+                    //copy_do.hide();
+                    //copy_done.fadeIn(500);
+                    //setTimeout(function() {
+                        //copy_done.hide();
+                        //copy_do.fadeIn(500);
+                    //}, 1500);
+                //},
+                //copy: this.$raw.text()
+            //});
         }
     });
 
diff --git a/snipt/settings.py b/snipt/settings.py
index 30a76e0..28f4b5d 100644
--- a/snipt/settings.py
+++ b/snipt/settings.py
@@ -198,21 +198,20 @@ ABSOLUTE_URL_OVERRIDES = {
 }
 
 # Caching
-if not DEBUG:
-    INSTALLED_APPS += ('johnny',)
-    JOHNNY_MIDDLEWARE_KEY_PREFIX='johnny_snipt'
-    MIDDLEWARE_CLASSES += (
-        'johnny.middleware.LocalStoreClearMiddleware',
-        'johnny.middleware.QueryCacheMiddleware',
-        'django.middleware.cache.CacheMiddleware',
-    )
-    CACHES = {
-        'default': dict(
-            BACKEND = 'johnny.backends.memcached.MemcachedCache',
-            LOCATION = ['127.0.0.1:11211'],
-            JOHNNY_CACHE = True,
-        )
-    }
+#INSTALLED_APPS += ('johnny',)
+#JOHNNY_MIDDLEWARE_KEY_PREFIX='johnny_snipt'
+#MIDDLEWARE_CLASSES += (
+    #'johnny.middleware.LocalStoreClearMiddleware',
+    #'johnny.middleware.QueryCacheMiddleware',
+    #'django.middleware.cache.CacheMiddleware',
+#)
+#CACHES = {
+    #'default': dict(
+        #BACKEND = 'johnny.backends.memcached.MemcachedCache',
+        #LOCATION = ['127.0.0.1:11211'],
+        #JOHNNY_CACHE = True,
+    #)
+#}
 
 # Extensions
 if DEBUG:
diff --git a/snipt/snipts/templates/snipts/tags-public.html b/snipt/snipts/templates/snipts/tags-public.html
index c0e71fc..fce8f4f 100644
--- a/snipt/snipts/templates/snipts/tags-public.html
+++ b/snipt/snipts/templates/snipts/tags-public.html
@@ -1,9 +1,9 @@
 <section class="tags">
     <h1>Popular public tags</h1>
     <ul>
-        {% for tag in tags %}
+        {% for t in tags %}
             <li>
-                <a href="/public/tag/{{ tag.slug }}/">{{ tag.name }} ({{ tag.count }})</a>
+                <a {% if tag == t.name %}class="active"{% endif %} href="/public/tag/{{ t.slug }}/">{{ t.name }} ({{ t.count }})</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/snipt/snipts/templates/snipts/tags-user.html b/snipt/snipts/templates/snipts/tags-user.html
index da53ccf..588c6ac 100644
--- a/snipt/snipts/templates/snipts/tags-user.html
+++ b/snipt/snipts/templates/snipts/tags-user.html
@@ -1,9 +1,9 @@
 <section class="tags">
     <h1>{{ user.username }}'s tags</h1>
     <ul>
-        {% for tag in tags %}
+        {% for t in tags %}
             <li>
-                <a href="/{{ user.username }}/tag/{{ tag.slug }}/">{{ tag.name }} ({{ tag.count }})</a>
+                <a {% if tag == t.name %}class="active"{% endif %} href="/{{ user.username }}/tag/{{ t.slug }}/">{{ t.name }} ({{ t.count }})</a>
             </li>
         {% endfor %}
     </ul>