From 4876e0dd7fbffe854bc94b1d4c833615f090e5d5 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Sat, 10 Mar 2012 23:36:44 -0500
Subject: [PATCH] Working on edit view and fixing tag slug bug

---
 media/css/style.css                             | 14 ++++++++++++++
 media/css/style.scss                            | 17 +++++++++++++++++
 media/js/src/application.js                     |  1 -
 media/js/src/modules/site.js                    |  1 -
 media/js/src/modules/snipt.js                   |  1 -
 .../snipts/snipt-edit-js-template.html          | 10 ++++++++--
 snipts/views.py                                 |  4 ++++
 7 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/media/css/style.css b/media/css/style.css
index a27ac26..0aef526 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -930,6 +930,20 @@ body.editing article.editing div.container section.code div#editor {
 body.editing article.editing div.container section.code div#editor .ace_print_margin {
   display: none;
 }
+body.editing article.editing div.container header h1 {
+  margin-left: 9px;
+  margin-top: 5px;
+  margin-bottom: 6px;
+}
+body.editing article.editing div.container header h1 input {
+  color: #666;
+  font: bold 16px/20px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
+  margin: 0;
+  width: 811px;
+}
+body.editing article.editing div.container header h2 {
+  border: none;
+}
 body.editing article.editing div.container:after {
   display: none;
 }
diff --git a/media/css/style.scss b/media/css/style.scss
index bc37d1b..b147270 100644
--- a/media/css/style.scss
+++ b/media/css/style.scss
@@ -1070,6 +1070,23 @@ body.editing {
                     }
                 }
             }
+            header {
+                h1 {
+                    margin-left: 9px;
+                    margin-top: 5px;
+                    margin-bottom: 6px;
+
+                    input {
+                        color: #666;
+                        font: bold 16px/20px $Helvetica;
+                        margin: 0;
+                        width: 811px;
+                    }
+                }
+                h2 {
+                    border: none;
+                }
+            }
             &:after {
                 display: none;
             }
diff --git a/media/js/src/application.js b/media/js/src/application.js
index 7649d59..d767102 100644
--- a/media/js/src/application.js
+++ b/media/js/src/application.js
@@ -1,4 +1,3 @@
-
 var snipt = {
     module: function() {
         var modules = {};
diff --git a/media/js/src/modules/site.js b/media/js/src/modules/site.js
index 52d774d..43905c1 100644
--- a/media/js/src/modules/site.js
+++ b/media/js/src/modules/site.js
@@ -1,4 +1,3 @@
-
 (function(Site) {
 
     var Snipt = snipt.module('snipt');
diff --git a/media/js/src/modules/snipt.js b/media/js/src/modules/snipt.js
index 114771c..1f62f53 100644
--- a/media/js/src/modules/snipt.js
+++ b/media/js/src/modules/snipt.js
@@ -1,4 +1,3 @@
-
 (function(Snipt) {
 
     Snipt.SniptModel = Backbone.Model.extend({
diff --git a/snipts/templates/snipts/snipt-edit-js-template.html b/snipts/templates/snipts/snipt-edit-js-template.html
index 3bb6616..bcdc0d2 100644
--- a/snipts/templates/snipts/snipt-edit-js-template.html
+++ b/snipts/templates/snipts/snipt-edit-js-template.html
@@ -16,8 +16,10 @@
                     <div class="group">
                         <div class="container">
                             <header>
-                                <h2><%= snipt.lexer_name %></h2>
-                                <h1><input type="text" value="<%= snipt.title %>" /></h1>
+                                <h2>&nbsp;</h2>
+                                <h1>
+                                    <input type="text" value="<%= snipt.title %>" />
+                                </h1>
                             </header>
                             <section class="code">
                                 <div id="editor"><%= snipt.code %></div>
@@ -27,6 +29,10 @@
                         </div>
                         <aside>
                             <div class="inner">
+                                <label for="</label>">Type</label>
+                                <select name="lexer" id="id_lexer">
+                                    <option value="0">test</option>
+                                </select>
                                 <label>
                                     Public
                                     <input type="checkbox" name="" value="" />
diff --git a/snipts/views.py b/snipts/views.py
index 6a8351c..9b0f557 100644
--- a/snipts/views.py
+++ b/snipts/views.py
@@ -26,6 +26,8 @@ def list_public(request, tag_slug=None):
     if tag_slug:
         snipts = snipts.filter(tags__slug__in=[tag_slug])
         tag = get_object_or_404(Tag, slug=tag_slug)
+    else:
+        tag = None
 
     return {
         'has_snipts': True,
@@ -61,6 +63,8 @@ def list_user(request, username, tag_slug=None):
     if tag_slug:
         snipts = snipts.filter(tags__slug__in=[tag_slug])
         tag = get_object_or_404(Tag, slug=tag_slug)
+    else:
+        tag = None
 
     return {
         'has_snipts': True,