Fix planet composing form.

diff --git a/static/js/site.js b/static/js/site.js
index 1329e23816f1473bd7aa76365dd81bc13400ee63..648b2a5b7e2119b1a1e21d96c636d782e4616ec4 100644 (file)
--- a/static/js/site.js
+++ b/static/js/site.js
@@ -46,7 +46,7 @@ if (/.*download-splash.*/i.test(window.location.href)) {
        });
 }
 
-$(".planet-search-autocomplete").typeahead({
+/* $(".planet-search-autocomplete").typeahead({
        source: function(query, process) {
                $.get("/api/planet/search/autocomplete", { q: query }, function(data) {
                        if (data.query == query) {
@@ -54,8 +54,7 @@ $(".planet-search-autocomplete").typeahead({
                        }
                });
        },
-});
-
+}); */
 
 function getCookie(name) {
        var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");

diff --git a/templates/admin-planet-compose.html b/templates/admin-planet-compose.html
index ec4f19a1598d75795894a136ae41c1a37aaa44b5..49a30e4a1d7f2f691caa2dec9e3d62d8fe509adc 100644 (file)
--- a/templates/admin-planet-compose.html
+++ b/templates/admin-planet-compose.html
@@ -12,37 +12,35 @@
                        <input type="hidden" name="id" value="{{ entry.id }}">
                {% end %}
 
-               <div class="control-group">
-                       <label class="control-label" for="inputTitle">{{ _("Title") }}</label>
-                       <div class="controls">
-                               <input class="input-block-level" type="text" name="title" id="inputTitle"
+               <div class="form-group">
+                       <label class="control-label col-sm-2" for="inputTitle">{{ _("Title") }}</label>
+                       <div class="col-sm-10">
+                               <input class="form-control" type="text" name="title" id="inputTitle"
                                        {% if entry %}value="{{ entry.title }}"{% end %} placeholder="{{ _("Title") }}">
                        </div>
                </div>
 
-               <div class="control-group">
-                       <div class="controls">
-                               <textarea class="input-block-level" name="markdown" rows="12" id="inputMarkdown"
+               <div class="form-group">
+                       <div class="col-sm-10 col-sm-offset-2">
+                               <textarea class="form-control" name="markdown" rows="12" id="inputMarkdown"
                                        placeholder="{{ _("Content") }}">{% if entry %}{{ entry.markdown }}{% end %}</textarea>
                        </div>
                </div>
 
                <hr>
 
-               <div class="control-group">
-                       <label class="control-label" for="inputTags">{{ _("Tags") }}</label>
-                       <div class="controls">
-                               <input class="input-block-level planet-search-autocomplete" type="text"
+               <div class="form-group">
+                       <label class="control-label col-sm-2" for="inputTags">{{ _("Tags") }}</label>
+                       <div class="col-sm-10">
+                               <input class="form-control planet-search-autocomplete" type="text"
                                        name="tags" id="inputTags" {% if entry %}value="{{ " ".join(entry.tags) }}"{% end %}
                                        placeholder="{{ _("Tags") }}" autocomplete="off">
                        </div>
                </div>
 
-               <hr>
-
-               <div class="control-group">
-                       <label class="control-label">{{ _("Status") }}</label>
-                       <div class="controls">
+               <div class="form-group">
+                       <label class="control-label col-sm-2">{{ _("Status") }}</label>
+                       <div class="col-sm-10">
                                <label class="radio inline">
                                        <input type="radio" name="status" value="draft" {% if not entry or not entry.is_published() %}checked{% end %}>
                                        {{ _("Draft") }}
@@ -54,13 +52,17 @@
                        </div>
                </div>
 
-               <div class="form-actions">
+               <hr>
+
+               <div class="col-sm-10 col-sm-offset-2">
                        <button type="submit" class="btn btn-primary">{{ _("Save") }}</button>
-                       <a class="btn" href="javascript:preview();">{{ _("Preview") }}</a>
-                       <a class="btn" href="/planet">{{ _("Cancel") }}</a>
+                       <a class="btn btn-default" href="javascript:preview();">{{ _("Preview") }}</a>
+                       <a class="btn btn-default" href="/planet">{{ _("Cancel") }}</a>
                </div>
        </form>
 
+       <br class="separator">
+
        <div id="preview"></div>
 
        <script type="text/javascript">