Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

many things have occured

Browse source
This commit is contained in:
Matthew Scragg 2013-12-03 16:28:16 -06:00
parent db70df22a2
commit a9158f3d30
11 changed files with 36 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

9
realms/templates/wiki/compare.html
View file

@ -3,18 +3,17 @@
<h2>History for <strong>{{ name }}</strong></h2>
<div class="pull-right">
<a href="/_commit/{{ old }}/{{ name }}" class="btn btn-default btn-sm">View Old</a>
<a href="/_commit/{{ new }}/{{ name }}" class="btn btn-info btn-sm">View New</a>
<a href="{{ url_for('wiki.commit', name=name, sha=old) }}" class="btn btn-default btn-sm">View Old</a>
<a href="{{ url_for('wiki.commit', name=name, sha=new) }}" class="btn btn-info btn-sm">View New</a>
</div>
<p>
<a class="btn btn-default btn-sm" href="/_history/{{ name }}">Back to History</a>
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
</p>
{{ diff|safe }}
<p></p>
<p>
<a class="btn btn-default btn-sm" href="/_history/{{ name }}">Back to History</a>
<a class="btn btn-default btn-sm" href="{{ url_for('wiki.history', name=name) }}">Back to History</a>
</p>
{% endblock %}

2
realms/templates/wiki/create.html
View file

@ -4,7 +4,7 @@
<form role="form" method="post">
<div class="form-group">
<label for="name"></label>
<input type="text" class="form-control" id="page" name="name" placeholder="Name" value="{{- name -}}" />
<input id="name" type="text" class="form-control" id="page" name="name" placeholder="Name" value="{{- name -}}" />
</div>
<div class="form-group">

2
realms/templates/wiki/edit.html
View file

@ -55,7 +55,7 @@
<div id="app-controls" class="row">
<div class="col-xs-3">
<div class="input-group">
<span class="input-group-addon btn-info input-sm">realms.io/</span>
<span class="input-group-addon btn-info input-sm">realms.io/wiki/</span>
<input id="page-name" type="text" class="form-control input-sm" name="name" placeholder="Name" value="{{- name -}}" />
</div>
</div>

4
realms/templates/wiki/history.html
View file

@ -21,7 +21,7 @@
<input type="checkbox" name="versions[]" value="{{ h.sha }}" />
</td>
<td>{{ h.author }}</td>
<td><a href="/_commit/{{ h.sha }}/{{ name }}" class='label label-primary'>View</a> {{ h.message }} </td>
<td><a href="{{ url_for('wiki.commit', name=name, sha=h.sha) }}" class='label label-primary'>View</a> {{ h.message }} </td>
<td>{{ h.time|datetime }}</td>
</tr>
{% endfor %}
@ -52,7 +52,7 @@ $(function(){
});
revs.reverse();
revs = revs.join("..");
location.href = "/_compare/{{ name }}/" + revs;
location.href = "{{ url_for('wiki.page') }}_compare/{{ name }}/" + revs;
});
});
</script>

6
realms/templates/wiki/page.html
View file

@ -1,15 +1,15 @@
{% extends 'layout.html' %}
{% block page_menu %}
<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>
<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>
</div>
{% endblock %}
{% block body %}
{% if commit %}
<div id="page-action-bar">
<form method="POST" action="/_revert">
<form method="POST" action="{{ url_for('wiki.revert') }}">
<input type="hidden" value="{{ name }}" name="name" />
<input type="hidden" value="{{ commit }}" name="commit" />
<input type="submit" class="btn btn-danger btn-sm" title="Revert back to this revision" value="Revert" />