M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/delete.html +2 -2
@@ 22,7 22,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
@@ 46,7 46,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/history.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/history.html +1 -1
@@ 36,7 36,7 @@
{% trans "Download" %}
</a>
{% if revision.attachment.article|can_write:user %}
- <button{% if revision == attachment.current_revision %} disabled="disabled"{% endif %} class="btn btn-default">
+ <button{% if revision == attachment.current_revision %} disabled="disabled"{% endif %} class="btn btn-secondary">
<span class="fa fa-flag"></span>
{% trans "Use this!" %}
</button>
M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/index.html +6 -6
@@ 20,7 20,7 @@
<th colspan="4">
<h4 style="margin-top:0;">
<a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">{{ attachment.current_revision.get_filename }}</a>
- <span class="badge">{{ attachment.current_revision.created|naturaltime }}</span>
+ <span class="badge badge-dark">{{ attachment.current_revision.created|naturaltime }}</span>
{% if attachment.current_revision.deleted %}
<span class="badge badge-important">{% trans "deleted" %}</span>
{% endif %}
@@ 35,11 35,11 @@
<td style="width: 25%; text-align: right; white-space: nowrap;" rowspan="2">
{% if attachment|can_write:user %}
{% if not attachment.current_revision.deleted %}
- <a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-default btn-sm">{% trans "Replace" %}</a>
+ <a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-secondary btn-sm">{% trans "Replace" %}</a>
{% if attachment.article == article %}
- <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-default btn-sm">{% trans "Delete" %}</a>
+ <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-secondary btn-sm">{% trans "Delete" %}</a>
{% else %}
- <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-default btn-sm">{% trans "Detach" %}</a>
+ <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-secondary btn-sm">{% trans "Detach" %}</a>
{% endif %}
{% else %}
Deleted
@@ 106,7 106,7 @@
<div class="input-group">
{{ search_form.query }}
<span class="input-group-btn">
- <button class="btn btn-default" type="submit">
+ <button class="btn btn-secondary" type="submit">
<span class="fa fa-search"></span>
</button>
</span>
@@ 132,7 132,7 @@
{% if attachment.current_revision.previous_revision.id %}
<form method="POST" action="{% url 'wiki:attachments_revision_change' path=urlpath.path article_id=article.id attachment_id=attachment.id revision_id=attachment.current_revision.previous_revision.id %}" style="margin:0; padding:0;">
{% csrf_token %}
- <button class="btn btn-default">
+ <button class="btn btn-secondary">
{% trans "Restore" %}
</button>
</form>
M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html +1 -1
@@ 34,7 34,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:attachments_index' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/plugins/attachments/templates/wiki/plugins/attachments/search.html => src/wiki/plugins/attachments/templates/wiki/plugins/attachments/search.html +2 -2
@@ 12,7 12,7 @@
<div class="input-group">
{{ search_form.query }}
<span class="input-group-btn">
- <button class="btn btn-default">
+ <button class="btn btn-secondary">
<span class="fa fa-search"></span>
{% trans "Search files and articles" %}
</button>
@@ 50,7 50,7 @@
<td style="text-align: right">
<form method="POST" action="{% url 'wiki:attachments_add' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">
{% csrf_token %}
- <a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn btn-secondary">
<span class="fa fa-download"></span>
{% trans "Download" %}
</a>
M src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html => src/wiki/plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html +3 -3
@@ 19,7 19,7 @@
{% endwith %}
</div>
<div class="float-right">
- <a class="btn btn-default"
+ <a class="btn btn-secondary"
{% if only_last == "1" %}
href="{% url 'wiki:globalhistory' only_last=0 %}">
{% trans "Show all revisions of all articles" %}
@@ 71,10 71,10 @@
<span class="badge badge-success">{% trans "restored" %}</span>
{% endif %}
{% if article_revision.locked %}
- <span class="badge">{% trans "locked" %}</span>
+ <span class="badge badge-dark">{% trans "locked" %}</span>
{% endif %}
{% if article_revision.previous_revision.locked and not revision.locked %}
- <span class="badge">{% trans "unlocked" %}</span>
+ <span class="badge badge-dark">{% trans "unlocked" %}</span>
{% endif %}
</td>
<td>
M src/wiki/plugins/images/templates/wiki/plugins/images/purge.html => src/wiki/plugins/images/templates/wiki/plugins/images/purge.html +1 -1
@@ 18,7 18,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html => src/wiki/plugins/images/templates/wiki/plugins/images/revision_add.html +1 -1
@@ 18,7 18,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:images_index' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M => +2 -2
@@ 112,7 112,7 @@ function add_image(form) {
</p>
<p>
<button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="btn btn-default btn-md">
<button type="button" onClick="add_image(this.form)" name="{{ plugin.slug }}_save" value="1" class="btn btn-secondary btn-md">
<span class="fa fa-upload"></span>
{% trans "Add image" %}
</button>
@@ 173,7 173,7 @@ function add_image(form) {
</form>
</div>
<div class="modal-footer">
<button class="btn btn-success btn-default" data-dismiss="modal" onClick="insert_image(this.form)"> {% trans "Insert image" %} </button>
<button class="btn btn-success btn-secondary" data-dismiss="modal" onClick="insert_image(this.form)"> {% trans "Insert image" %} </button>
<button class="btn btn-danger" data-dismiss="modal"> {% trans "Cancel" %} </button>
</div>
</div>
M src/wiki/templates/wiki/create.html => src/wiki/templates/wiki/create.html +1 -1
@@ 35,7 35,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-default">
+ <a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/templates/wiki/delete.html => src/wiki/templates/wiki/delete.html +1 -1
@@ 43,7 43,7 @@
<div class="form-group form-actions">
<div class="col-lg-2"></div>
<div class="col-lg-10">
- <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/templates/wiki/deleted.html => src/wiki/templates/wiki/deleted.html +2 -2
@@ 25,7 25,7 @@
<div class="well">
<p>{% trans "You may restore this article and its children by clicking restore." %}</p>
<p>
- <a href="?restore=1" class="btn btn-default">
+ <a href="?restore=1" class="btn btn-secondary">
<span class="fa fa-repeat"></span>
{% trans "Restore" %}
</a>
@@ 42,7 42,7 @@
<form method="POST" class="form form-vertical">
{% csrf_token %}
{% wiki_form purge_form %}
- <button class="btn btn-default">
+ <button class="btn btn-secondary">
<span class="fa fa-remove"></span>
{% trans "Purge" %}
</button>
M src/wiki/templates/wiki/deleted_list.html => src/wiki/templates/wiki/deleted_list.html +1 -1
@@ 20,7 20,7 @@
<tr>
<td><a href="{{article.get_absolute_url}}">{{ article }}</a></td>
<td> {{article.modified}} </td>
- <td><a href="{% url 'wiki:deleted' article_id=article.id %}?restore=1" class="btn btn-default"><span class="fa fa-repeat"></span>
+ <td><a href="{% url 'wiki:deleted' article_id=article.id %}?restore=1" class="btn btn-secondary"><span class="fa fa-repeat"></span>
{% trans "Restore" %}</a></td>
</tr>
{% endfor %}
M src/wiki/templates/wiki/dir.html => src/wiki/templates/wiki/dir.html +2 -2
@@ 13,12 13,12 @@
<form class="form-search directory-toolbar">
<div class="btn-group">
{% if urlpath.parent %}
- <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-default">
+ <a href="{% url 'wiki:dir' path=urlpath.parent.path %}" class="btn btn-secondary">
<span class="fa fa-arrow-up"></span>
{% trans "Up one level" %}
</a>
{% endif %}
- <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-default">
+ <a href="{% url 'wiki:create' path=urlpath.path %}" class="btn btn-secondary">
<span class="fa fa-plus"></span>
{% trans "Add article" %}
</a>
M src/wiki/templates/wiki/edit.html => src/wiki/templates/wiki/edit.html +2 -2
@@ 24,7 24,7 @@
<div class="form-group form-actions">
<div class="col-lg-12">
<div class="col-lg-offset-2">
- <button class="btn btn-default" type="submit" name="preview" value="1" id="id_preview"
+ <button class="btn btn-secondary" type="submit" name="preview" value="1" id="id_preview"
formaction="{% url 'wiki:preview' path=urlpath.path article_id=article.id %}"
formtarget="previewWindow"
>
@@ 74,7 74,7 @@
<iframe name="previewWindow" frameborder="0"></iframe>
</div>
<div class="modal-footer">
- <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+ <a href="#" class="btn btn-secondary btn-lg" data-dismiss="modal">
<span class="fa fa-arrow-circle-left"></span>
{% trans "Back to editor" %}
</a>
M src/wiki/templates/wiki/error.html => src/wiki/templates/wiki/error.html +2 -2
@@ 17,7 17,7 @@
<div class="missing">
<p>{% trans "This article was not found, and neither was its parent article." %}</p>
<p>
- <a href="{% url 'wiki:get' path='' %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Start page" %}</a>
+ <a href="{% url 'wiki:get' path='' %}" class="btn btn-secondary"><i class="fa fa-arrow-left"></i> {% trans "Start page" %}</a>
</p>
</div>
@@ 35,7 35,7 @@
{% if article %}
<p>
- <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default"><i class="fa fa-arrow-left"></i> {% trans "Back to" %} {{ article.current_revision.title }}</a>
+ <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-secondary"><i class="fa fa-arrow-left"></i> {% trans "Back to" %} {{ article.current_revision.title }}</a>
</p>
{% endif %}
M src/wiki/templates/wiki/forms/select.html => src/wiki/templates/wiki/forms/select.html +1 -1
@@ 1,6 1,6 @@
<div{% include "django/forms/widgets/attrs.html" %}>
<button class="btn btn-group-label{{ disabled }}" type="button">{{ label }}</button>
- <button class="btn btn-default dropdown-toggle{{ disabled }}" type="button" data-toggle="dropdown">
+ <button class="btn btn-secondary dropdown-toggle{{ disabled }}" type="button" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">{% for group_name, group_choices, group_index in widget.optgroups %}
M src/wiki/templates/wiki/history.html => src/wiki/templates/wiki/history.html +7 -7
@@ 52,9 52,9 @@
<form method="GET">
<div class="tab-content" style="overflow: visible;">
{% for revision in revisions %}
- <div class="card-group" id="accordion{{ revision.revision_number }}">
+ <div class="" id="accordion{{ revision.revision_number }}">
<div class="card bg-light">
- <div class="card-heading">
+ <div class="card-title">
<a class="card-toggle" style="float: left;" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))">
{% if revision == article.current_revision %}
<i class="fa fa-flag"></i>
@@ 79,12 79,12 @@
</div>
<div class="float-right" style="vertical-align: middle; margin: 8px 8px;">
{% if revision == article.current_revision %}
- <a href="#" class="btn btn-default disabled">
+ <a href="#" class="btn btn-secondary disabled">
<span class="fa fa-lock fa-fw"></span>
{% trans "Preview this revision" %}
</a>
{% else %}
- <button type="submit" class="btn btn-default" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}')">
+ <button type="submit" class="btn btn-secondary" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.r.value='{{ revision.id }}'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}')">
<span class="fa fa-eye fa-fw"></span>
{% trans "Preview this revision" %}
</button>
@@ 124,7 124,7 @@
<div class="form-group form-actions">
<div class="float-right">
- <button type="submit" name="preview" value="1" class="btn btn-default" onclick="$('#mergeModal').modal('show'); this.form.target='mergeWindow'; this.form.action=$('input[type=radio]:checked').attr('merge-button-href'); $('.merge-revision-commit').attr('href', $('input[type=radio]:checked').attr('merge-button-commit-href'))">
+ <button type="submit" name="preview" value="1" class="btn btn-secondary" onclick="$('#mergeModal').modal('show'); this.form.target='mergeWindow'; this.form.action=$('input[type=radio]:checked').attr('merge-button-href'); $('.merge-revision-commit').attr('href', $('input[type=radio]:checked').attr('merge-button-commit-href'))">
<span class="fa fa-random"></span>
{% trans "Merge selected with current..." %}
</button>
@@ 147,7 147,7 @@
<iframe name="previewWindow" frameborder="0"></iframe>
</div>
<div class="modal-footer">
- <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+ <a href="#" class="btn btn-secondary btn-lg" data-dismiss="modal">
<span class="fa fa-arrow-circle-left"></span>
{% trans "Back to history view" %}
</a>
@@ 178,7 178,7 @@
<iframe name="mergeWindow" frameborder="0" style="min-height: 0;"></iframe>
</div>
<div class="modal-footer">
- <a href="#" class="btn btn-default btn-lg" data-dismiss="modal">
+ <a href="#" class="btn btn-secondary btn-lg" data-dismiss="modal">
<span class="fa fa-arrow-circle-left"></span>
{% trans "Back to history view" %}
</a>
M src/wiki/templates/wiki/includes/revision_info.html => src/wiki/templates/wiki/includes/revision_info.html +2 -2
@@ 18,8 18,8 @@
<span class="badge badge-success">{% trans "restored" %}</span>
{% endif %}
{% if revision.locked %}
-<span class="badge">{% trans "locked" %}</span>
+<span class="badge badge-dark">{% trans "locked" %}</span>
{% endif %}
{% if revision.previous_revision.locked and not revision.locked %}
-<span class="badge">{% trans "unlocked" %}</span>
+<span class="badge badge-dark">{% trans "unlocked" %}</span>
{% endif %}
M src/wiki/templates/wiki/move.html => src/wiki/templates/wiki/move.html +2 -2
@@ 11,7 11,7 @@
{% wiki_form form %}
<div class="btn-group" id="dest_selector">
- <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
+ <a class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" href="#">
<span class="dest_selector_title"></span>
<span class="caret"></span>
</a>
@@ 32,7 32,7 @@
</p>
<div class="form-group form-actions">
<div class="col-lg-12 col-lg-offset-2">
- <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-default">
+ <a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-secondary">
<span class="fa fa-arrow-left"></span>
{% trans "Go back" %}
</a>
M src/wiki/templates/wiki/permission_denied.html => src/wiki/templates/wiki/permission_denied.html +2 -2
@@ 19,11 19,11 @@
<p>
{% if not read_denied %}
- <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" class="btn btn-default">
+ <a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}" class="btn btn-secondary">
{% trans "Back to article" %}
</a>
{% elif urlpath.parent %}
- <a href="{% url 'wiki:get' path=urlpath.parent.path %}" class="btn btn-default">
+ <a href="{% url 'wiki:get' path=urlpath.parent.path %}" class="btn btn-secondary">
{% trans "Back to article" %}
</a>
{% endif %}
M src/wiki/templates/wiki/root_missing.html => src/wiki/templates/wiki/root_missing.html +1 -1
@@ 27,7 27,7 @@
{% trans "But since you're logged in as a superuser, we should really get started..." %}
</p>
<a href="{% url 'wiki:root_create' %}" class="btn btn-primary btn-lg">{% trans "Yes, I'll go and create the first article" %}</a>
- <a href="http://django-wiki.readthedocs.org/" class="btn btn-default">{% trans "No thanks, I'd rather read the documentation" %}</a>
+ <a href="http://django-wiki.readthedocs.org/" class="btn btn-secondary">{% trans "No thanks, I'd rather read the documentation" %}</a>
{% endif %}
</div>
M src/wiki/templates/wiki/search.html => src/wiki/templates/wiki/search.html +1 -1
@@ 19,7 19,7 @@
<div class="input-group">
<input type="search" class="form-control search-query" name="q" value="{{ search_query }}" />
<span class="input-group-btn">
- <button class="btn btn-default" type="submit">
+ <button class="btn btn-secondary" type="submit">
<span class="fa fa-search"></span>
</button>
</span>