Merge branch 'master' of github.com:discord-python/site

3 files changed, 18 insertions, 6 deletions

diff --git a/templates/main/base.html b/templates/main/base.html
index cbdd937b..cfe41099 100644
--- a/templates/main/base.html
+++ b/templates/main/base.html
@@ -17,6 +17,7 @@
             <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}">
             <link rel="stylesheet" href="{{ static_file('uikit_blurple.css') }}"/>
             <link rel="stylesheet" href="{{ static_file('style.css') }}"/>
+            <link rel="stylesheet" href="{{ static_file('css/pygments-monokai.css') }}"/>
 
             <!-- OpenGraph metadata -->
             <meta property="og:title" content="Python Discord | {% block og_title %}{% endblock %}">
diff --git a/templates/wiki/base.html b/templates/wiki/base.html
index 02ab1b55..4bb227df 100644
--- a/templates/wiki/base.html
+++ b/templates/wiki/base.html
@@ -16,6 +16,7 @@
             <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}">
             <link rel="stylesheet" href="{{ static_file('uikit_blurple.css') }}"/>
             <link rel="stylesheet" href="{{ static_file('style.css') }}"/>
+            <link rel="stylesheet" href="{{ static_file('css/pygments-monokai.css') }}"/>
 
             <!-- OpenGraph metadata -->
             <meta property="og:title" content="Python Discord | {% block og_title %}{% endblock %}">
@@ -30,7 +31,7 @@
         <div class="uk-offcanvas-content uk-flex uk-flex-column">
             {% include "main/navigation.html" %}
             <div class="uk-flex uk-flex-row uk-flex-1">
-                <div class="uk-card uk-card-body uk-flex-left uk-flex">
+                <div class="uk-card uk-card-body uk-flex-left uk-flex uk-card-primary">
                     <ul class="uk-nav-default uk-nav-parent-icon" uk-nav>
                         {% if (can_edit or debug) and current_page == "page" %}
                             <li>
diff --git a/templates/wiki/page_edit.html b/templates/wiki/page_edit.html
index 7664511e..b797577d 100644
--- a/templates/wiki/page_edit.html
+++ b/templates/wiki/page_edit.html
@@ -14,7 +14,7 @@
             <button class="uk-button uk-button-secondary" type="button" value="Preview" id="preview">Preview</button>
         </div>
         <div class="uk-width-auto">
-            <input class="uk-button uk-button-primary" type="submit" value="Save" />
+            <input class="uk-button uk-button-primary" type="submit" id="submit" value="Save" />
         </div>
         <div class="uk-width-1-1">
             <div id="editor" class="uk-textarea" style="resize: vertical; min-height: 15rem;">{{ rst }}</div>
@@ -24,10 +24,12 @@
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
     </form>
 
-    <h2>Preview</h2>
+    <div class="uk-container uk-container-small" style="padding: 1rem 1rem 0.1rem;">
+        <h2 id="preview-title">{{ title }}</h2>
 
-    <div class="uk-alert" id="preview-div" style="padding: 1rem 1rem 0.1rem;">
-        {{ preview | safe }}
+        <div id="preview-div">
+            {{ preview | safe }}
+        </div>
     </div>
 
     <script type="application/javascript">
@@ -42,6 +44,8 @@
                 let response = JSON.parse(this.responseText);
 
                 if (response.error !== undefined) {
+                    document.getElementById("submit").disabled = true;
+
                     if (response.error_lines !== undefined) {
                         editor.session.setAnnotations(response.error_lines);
                         document.getElementById("preview-div").innerHTML ="<h3>Error - see editor margin</h3>";
@@ -50,7 +54,9 @@
                         document.getElementById("preview-div").innerHTML ="<h3>Error</h3><p>" + response.error + "<p>";
                     }
                 } else {
+                    document.getElementById("submit").disabled = false;
                     document.getElementById("preview-div").innerHTML = response.data;
+
                     editor.session.setAnnotations([]);
                 }
             });
@@ -81,6 +87,10 @@
                 clearTimeout(timer);
             }
             timer = setTimeout(function() {document.getElementById("preview").click()}, 1000);
-        })
+        });
+
+        document.getElementById("title").oninput = function() {
+            document.getElementById("preview-title").textContent = document.getElementById("title").value;
+        }
     </script>
 {% endblock %}
\ No newline at end of file