From afa4da48697debcafeac92fa0739b34ced8f7aca Mon Sep 17 00:00:00 2001
From: Matthew Scragg <scragg@gmail.com>
Date: Thu, 3 Oct 2013 13:13:10 -0500
Subject: [PATCH] cleaning html, other ui fixes

---
 realms/static/css/style.css     | 34 ++++++++-------------------------
 realms/static/js/dillinger.js   |  3 ++-
 realms/templates/layout.html    |  5 -----
 realms/templates/page/edit.html | 10 ++++++++++
 realms/wiki.py                  |  6 +++++-
 srv/salt/nginx/init.sls         |  4 +++-
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/realms/static/css/style.css b/realms/static/css/style.css
index c8f9e6b..f333f55 100644
--- a/realms/static/css/style.css
+++ b/realms/static/css/style.css
@@ -1,5 +1,6 @@
-.navbar {
-
+body {
+  padding-top: 50px;
+  background-color:#eee;
 }
 
 #main-body {
@@ -42,27 +43,18 @@
   border: 1px solid #EEE;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -moz-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -webkit-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -moz-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   -webkit-box-flex: 1;
   -moz-box-flex: 1;
   -ms-box-flex: 1;
-  -webkit-box-flex: 1;
-  -moz-box-flex: 1;
-  -ms-box-flex: 1;
   -o-box-flex: 1;
   box-flex: 1;
+  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+  box-shadow: 0 1px 2px rgba(0,0,0,.15);
 }
 
 #editor {
@@ -74,27 +66,17 @@
   right: 50%;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -moz-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -webkit-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -moz-box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  box-shadow: 0 0 80px rgba(0,0,0,0.3) inset 0 0 5px rgba(0,0,0,0.6);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   -webkit-box-flex: 1;
   -moz-box-flex: 1;
   -ms-box-flex: 1;
-  -webkit-box-flex: 1;
-  -moz-box-flex: 1;
-  -ms-box-flex: 1;
   -o-box-flex: 1;
   box-flex: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+  box-shadow: 0 1px 2px rgba(0,0,0,.15);
 }
 
 .user-avatar a img {
diff --git a/realms/static/js/dillinger.js b/realms/static/js/dillinger.js
index e1c307b..1897abb 100644
--- a/realms/static/js/dillinger.js
+++ b/realms/static/js/dillinger.js
@@ -129,7 +129,6 @@ $(function(){
 
     if (p.filename != $pagename.val()) {
         updateUserProfile({ filename: $pagename.val(), currentMd: "" });
-
     }
     profile = p
   }
@@ -417,6 +416,8 @@ $(function(){
     isManual && Notifier.showMessage(Notifier.messages.docSavedLocal);
 
     if (isManual) {
+        updateUserProfile({  currentMd: "" });
+
         var data = {
             name: $("#page-name").val(),
             message: $("#page-message").val(),
diff --git a/realms/templates/layout.html b/realms/templates/layout.html
index 3048c01..ab87034 100644
--- a/realms/templates/layout.html
+++ b/realms/templates/layout.html
@@ -12,11 +12,6 @@
     <link href="/static/css/font-awesome.min.css" rel="stylesheet">
     <link href="/static/css/style.css" rel="stylesheet">
 
-    <style>
-        body {
-            padding-top: 60px;
-        }
-    </style>
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="/static/js/html5shiv.js"></script>
diff --git a/realms/templates/page/edit.html b/realms/templates/page/edit.html
index 251e162..deb4945 100644
--- a/realms/templates/page/edit.html
+++ b/realms/templates/page/edit.html
@@ -6,6 +6,16 @@
     <script src="/static/js/dillinger.js"></script>
 {% endblock %}
 {% block body %}
+<style>
+#main-body {
+    background: inherit;
+    border: inherit;
+    padding: 0;
+    -webkit-box-shadow: 0;
+    -moz-box-shadow: 0;
+    box-shadow: 0;
+}
+</style>
 
     <div id="app-wrap" class="container-fluid">
         <div id="app-controls" class="row">
diff --git a/realms/wiki.py b/realms/wiki.py
index 1fa623f..f511c4e 100644
--- a/realms/wiki.py
+++ b/realms/wiki.py
@@ -1,6 +1,10 @@
 import os
+from lxml.html.clean import clean_html
+
 import ghdiff
+
 from gittle import Gittle
+
 from util import to_canonical
 
 
@@ -58,7 +62,7 @@ class Wiki():
         self.path = path
 
     def write_page(self, name, content, message=None, create=False, username=None, email=None):
-        #content = clean_html(content)
+        content = clean_html(content)
         filename = self.cname_to_filename(to_canonical(name))
         f = open(self.path + "/" + filename, 'w')
         f.write(content)
diff --git a/srv/salt/nginx/init.sls b/srv/salt/nginx/init.sls
index c69ca47..fac2699 100644
--- a/srv/salt/nginx/init.sls
+++ b/srv/salt/nginx/init.sls
@@ -6,4 +6,6 @@ nginx:
     - enable: True
     - reload: True
     - require:
-      - pkg: nginx
\ No newline at end of file
+      - pkg: nginx
+
+/etc/
\ No newline at end of file