html indent fix

This commit is contained in:
Matthew Scragg 2014-09-04 16:35:28 -05:00
parent 10831a44e9
commit e4afc0fb0d
10 changed files with 171 additions and 188 deletions

View file

@ -9,10 +9,7 @@
<p> <p>
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a> <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
</p> </p>
{{ diff|safe }} {{ diff|safe }}
<p> <p>
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a> <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
</p> </p>

View file

@ -8,13 +8,13 @@
}); });
TogetherJSConfig_toolName = "Collaboration"; TogetherJSConfig_toolName = "Collaboration";
TogetherJSConfig_suppressJoinConfirmation = true; TogetherJSConfig_suppressJoinConfirmation = true;
{% if session.get('user') %} {% if current_user.is_authenticated() %}
TogetherJSConfig_getUserName = function () { TogetherJSConfig_getUserName = function () {
return {{ session['user'].get('username')|tojson }}; return {{ current_user.username|tojson }};
}; };
TogetherJSConfig_getUserAvatar = function () { TogetherJSConfig_getUserAvatar = function () {
return {{ session['user'].get('avatar')|tojson }}; return {{ current_user.avatar|tojson }};
}; };
{% endif %} {% endif %}
@ -28,25 +28,11 @@
$("#start-togetherjs").removeClass('btn-danger').html('Collaborate').prop('disabled', false); $("#start-togetherjs").removeClass('btn-danger').html('Collaborate').prop('disabled', false);
}; };
</script> </script>
<script src="https://togetherjs.com/togetherjs-min.js"></script> <script src="https://togetherjs.com/togetherjs-min.js"></script>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
{% block css %}
<style>
#main-body {
background: inherit;
border: inherit;
padding: 0;
-webkit-box-shadow: 0;
-moz-box-shadow: 0;
box-shadow: 0;
}
</style>
{% endblock %}
<div id="app-wrap"> <div id="app-wrap">
<div id="app-controls" class="row"> <div id="app-controls" class="row">
<div class="col-xs-3"> <div class="col-xs-3">

View file

@ -33,8 +33,8 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script> <script>
$(function(){ $(function(){
$('.revision-tbl :checkbox').change(function () { $('.revision-tbl :checkbox').change(function () {
var $cs=$(this).closest('.revision-tbl').find(':checkbox:checked'); var $cs=$(this).closest('.revision-tbl').find(':checkbox:checked');
if ($cs.length > 2) { if ($cs.length > 2) {
@ -53,6 +53,6 @@ $(function(){
revs = revs.join(".."); revs = revs.join("..");
location.href = "{{ config.BASE_URL }}/_compare/{{ name }}/" + revs; location.href = "{{ config.BASE_URL }}/_compare/{{ name }}/" + revs;
}); });
}); });
</script> </script>
{% endblock %} {% endblock %}

View file

@ -1,9 +1,9 @@
{% extends 'layout.html' %} {% extends 'layout.html' %}
{% block page_menu %} {% block page_menu %}
<div class="controls pull-right"> <div class="controls pull-right">
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.edit', name=name) }}">Edit</a> <a class="btn btn-default btn-sm" href="{{ url_for('wiki.edit', name=name) }}">Edit</a>
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">History</a> <a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">History</a>
</div> </div>
{% endblock %} {% endblock %}
{% block body %} {% block body %}