registration and other stuff

This commit is contained in:
Matthew Scragg 2013-10-03 09:58:07 -05:00
parent 613d1c6ca3
commit cba28239a2
13 changed files with 326 additions and 50 deletions

View file

@ -0,0 +1,16 @@
{% extends 'layout.html' %}
{% block body %}
<h2>History for <strong>{{ name }}</strong></h2>
<p>
<a class="btn btn-default btn-sm" href="/history/{{ name }}">Back to History</a>
<a href="" class="btn btn-default btn-sm">Revert Changes</a>
</p>
{{ diff|safe }}
<p></p>
<p>
<a class="btn btn-default btn-sm" href="/history/{{ name }}">Back to History</a>
</p>
{% endblock %}

View file

@ -10,16 +10,16 @@
<div id="app-wrap" class="container-fluid">
<div id="app-controls" class="row">
<div class="col-xs-3">
<input id="page-name" type="text" class="form-control" name="name" placeholder="Name" value="{{- name -}}" />
<input id="page-name" type="text" class="form-control input-sm" name="name" placeholder="Name" value="{{- name -}}" />
</div>
<div class="col-xs-3">
<input id="page-message" type="text" class="form-control" name="page-message" placeholder="Comment" value="" />
<input id="page-message" type="text" class="form-control input-sm" name="page-message" placeholder="Comment" value="" />
</div>
<div class="col-xs-6">
<div class="pull-right">
<a href="#" id="drop6" role="button" class="dropdown-toggle btn btn-default" data-toggle="dropdown">Theme <b class="caret"></b></a>
<a href="#" id="drop6" role="button" class="dropdown-toggle btn btn-default btn-sm" data-toggle="dropdown">Theme <b class="caret"></b></a>
<ul id="theme-list" class="dropdown-menu" role="menu" aria-labelledby="drop6">
<li><a tabindex="-1" href="#" data-value="ace/theme/chrome" class="">Chrome</a></li>
<li><a tabindex="-1" href="#" data-value="ace/theme/clouds" class="">Clouds</a></li>
@ -47,7 +47,7 @@
<li><a tabindex="-1" href="#" data-value="ace/theme/twilight" class="">Twilight</a></li>
<li><a tabindex="-1" href="#" data-value="ace/theme/vibrant_ink" class="">Vibrant Ink</a></li>
</ul>
<a id="save-native" class="btn btn-primary"><i class="icon-save"></i> Save</a>
<a id="save-native" class="btn btn-primary btn-sm"><i class="icon-save"></i> Save</a>
</div>
</div>
</div>

View file

@ -1,16 +1,58 @@
{% extends 'layout.html' %}
{% block body %}
<h2>History</h2>
<table class="table table-bordered">
<h2>History for <strong>{{ name }}</strong></h2>
<p>
<a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
</p>
<table class="table table-bordered revision-tbl">
<thead>
<tr>
<th></th>
<th>Name</th>
<th>Revision Message</th>
<th>Date</th>
</tr>
</thead>
{% for h in history %}
<tr>
<td class="checkbox-cell text-center"><input type="checkbox" /></td>
<td class="checkbox-cell text-center">
<input type="checkbox" name="versions[]" value="{{ h.sha }}" />
</td>
<td>{{ h.author }}</td>
<td><a href="/commit/{{ h.sha }}/{{ name }}" class='label label-primary'>{{ h.sha|truncate(7, True, end="") }}</a> {{ h.message }} </td>
<td>{{ h.time|datetime }}</td>
</tr>
{% endfor %}
</table>
<p>
<a class="btn btn-default btn-sm compare-revisions">Compare Revisions</a>
</p>
{% endblock %}
{% block js %}
<script>
$(function(){
$('.revision-tbl :checkbox').change(function () {
var $cs=$(this).closest('.revision-tbl').find(':checkbox:checked');
if ($cs.length > 2) {
this.checked=false;
}
});
$(".compare-revisions").click(function(){
var $cs = $('.revision-tbl').find(':checkbox:checked');
console.log($cs.length);
if ($cs.length != 2) return;
var revs = [];
$.each($cs, function(i, v){
revs.push(v.value);
});
revs = revs.join("...");
location.href = "/compare/{{ name }}/" + revs;
});
});
</script>
{% endblock %}

View file

@ -1,15 +1,20 @@
{% extends 'layout.html' %}
{% block body %}
<div id="page-content" style="display:none">
{{ page.data|safe }}
</div>
<div class="controls pull-right">
<a class="btn btn-default btn-sm" href="/edit/{{ name }}">Edit</a>
<a class="btn btn-default btn-sm" href="/history/{{ name }}">History</a>
</div>
<div id="page-content" style="display:none">
{{ page.data|safe }}
</div>
{% endblock %}
{% block js %}
<script>
$(function(){
$("#page-content").html(converter({{ page.data|tojson|safe }})).show();
});
</script>
<script>
$(function(){
$("#page-content").html(converter({{ page.data|tojson|safe }})).show();
});
</script>
{% endblock %}