mirror of
https://github.com/Findus23/acronomy.git
synced 2024-09-19 15:33:45 +02:00
add footer
This commit is contained in:
parent
90c96beb68
commit
1e714f3189
GPG key ID:
54DE4D798D244853
6 changed files with 155 additions and 111 deletions
|
|
@ -112,45 +112,48 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{# {% if user.is_authenticated %}#}
|
||||
{# <div class="mb-4 col-md-4">#}
|
||||
{# <div class="card">#}
|
||||
{# <div class="card-body">#}
|
||||
{# <div class="btn-group-vertical" role="group">#}
|
||||
{# <button data-toggle="collapse" href="#collapseAddWikipediaForm" class="btn btn-secondary" role="button"#}
|
||||
{# aria-expanded="false" aria-controls="collapseAddWikipediaForm">#}
|
||||
{# add Wikipedia Article#}
|
||||
{# </button>#}
|
||||
{# <button data-toggle="collapse" href="#collapseAddPaperForm" class="btn btn-secondary" role="button"#}
|
||||
{# aria-expanded="false" aria-controls="collapseAddPaperForm">#}
|
||||
{# add Reference Paper#}
|
||||
{# </button>#}
|
||||
{# <button data-toggle="collapse" href="#collapseAddWebsiteForm" class="btn btn-secondary" role="button"#}
|
||||
{# aria-expanded="false" aria-controls="collapseAddWebsiteForm">#}
|
||||
{# add Website Link#}
|
||||
{# </button>#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{# <form class="card-footer accordion" id="addAccordion">#}
|
||||
{# <div id="collapseAddWikipediaForm" class="collapse form-group" data-parent="#addAccordion">#}
|
||||
{# <label for="wikiTitle">Wikipedia Title</label>#}
|
||||
{# <input type="text" class="form-control" name="wiki_title" id="wikiTitle">#}
|
||||
{# </div>#}
|
||||
{# <div id="collapseAddPaperForm" class="collapse form-group" data-parent="#addAccordion">#}
|
||||
{# <label for="paperBibcode">Bibcode</label>#}
|
||||
{# <input type="text" class="form-control" name="paper_bibcode" id="paperBibcode">#}
|
||||
{# </div>#}
|
||||
{# <div id="collapseAddWebsiteForm" class="collapse form-group" data-parent="#addAccordion">#}
|
||||
{# <label for="websiteUrl">URL</label>#}
|
||||
{# <input type="url" class="form-control" name="website_url" id="websiteUrl">#}
|
||||
{# </div>#}
|
||||
{# </form>#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{# {% endif %}#}
|
||||
{% comment %}
|
||||
{% if user.is_authenticated %}
|
||||
<div class="mb-4 col-md-4">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="btn-group-vertical" role="group">
|
||||
<button data-toggle="collapse" href="#collapseAddWikipediaForm" class="btn btn-secondary" role="button"
|
||||
aria-expanded="false" aria-controls="collapseAddWikipediaForm">
|
||||
add Wikipedia Article
|
||||
</button>
|
||||
<button data-toggle="collapse" href="#collapseAddPaperForm" class="btn btn-secondary" role="button"
|
||||
aria-expanded="false" aria-controls="collapseAddPaperForm">
|
||||
add Reference Paper
|
||||
</button>
|
||||
<button data-toggle="collapse" href="#collapseAddWebsiteForm" class="btn btn-secondary" role="button"
|
||||
aria-expanded="false" aria-controls="collapseAddWebsiteForm">
|
||||
add Website Link
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<form class="card-footer accordion" id="addAccordion">
|
||||
<div id="collapseAddWikipediaForm" class="collapse form-group" data-parent="#addAccordion">
|
||||
<label for="wikiTitle">Wikipedia Title</label>
|
||||
<input type="text" class="form-control" name="wiki_title" id="wikiTitle">
|
||||
</div>
|
||||
<div id="collapseAddPaperForm" class="collapse form-group" data-parent="#addAccordion">
|
||||
<label for="paperBibcode">Bibcode</label>
|
||||
<input type="text" class="form-control" name="paper_bibcode" id="paperBibcode">
|
||||
</div>
|
||||
<div id="collapseAddWebsiteForm" class="collapse form-group" data-parent="#addAccordion">
|
||||
<label for="websiteUrl">URL</label>
|
||||
<input type="url" class="form-control" name="website_url" id="websiteUrl">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endcomment %}
|
||||
|
||||
</div>
|
||||
{% if user.is_staff %}
|
||||
<a class="btn btn-outline-secondary" href="{% url 'admin:acros_acronym_change' acro.id %}">Admin-Edit</a>
|
||||
{% endif %}
|
||||
<a class="btn btn-outline-secondary" href="{% url 'edit' acro.slug %}">Edit</a>
|
||||
<a class="btn btn-outline-secondary" href="{% url 'edit' acro.slug %}">Edit</a>
|
||||
{% endblock %}
|
||||
|
|
|
|||
124
static/app.js
124
static/app.js
|
|
@ -1,78 +1,74 @@
|
|||
$(function () {
|
||||
$('[data-toggle="tooltip"]').tooltip()
|
||||
})
|
||||
|
||||
|
||||
new Autocomplete('#autocomplete', {
|
||||
new Autocomplete('#autocomplete', {
|
||||
|
||||
// Search function can return a promise
|
||||
// which resolves with an array of
|
||||
// results. In this case we're using
|
||||
// the Wikipedia search API.
|
||||
search: input => {
|
||||
search: input => {
|
||||
|
||||
const acroSearch = input.split(':')[0];
|
||||
const url = "/api/acronym/?search=" + acroSearch
|
||||
const acroSearch = input.split(':')[0];
|
||||
const url = "/api/acronym/?search=" + acroSearch
|
||||
|
||||
return new Promise(resolve => {
|
||||
if (acroSearch.length < 1) {
|
||||
return resolve([])
|
||||
}
|
||||
return new Promise(resolve => {
|
||||
if (acroSearch.length < 1) {
|
||||
return resolve([])
|
||||
}
|
||||
|
||||
fetch(url)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
resolve(data)
|
||||
})
|
||||
})
|
||||
},
|
||||
fetch(url)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
resolve(data)
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
getResultValue: result => (result.name + ": " + result.full_name),
|
||||
getResultValue: result => (result.name + ": " + result.full_name),
|
||||
|
||||
// Open the selected article in
|
||||
// a new window
|
||||
onSubmit: result => {
|
||||
console.log(result)
|
||||
window.location = "/acronym/" + result.slug
|
||||
},
|
||||
autoSelect: true,
|
||||
})
|
||||
const input = document.querySelector('input[name="tags"]')
|
||||
input.classList.remove("form-control")
|
||||
|
||||
document.querySelector("form").addEventListener("submit", function () {
|
||||
const list = JSON.parse(input.value).map(function (item) {
|
||||
return item['value'];
|
||||
// Open the selected article in
|
||||
// a new window
|
||||
onSubmit: result => {
|
||||
console.log(result)
|
||||
window.location = "/acronym/" + result.slug
|
||||
},
|
||||
autoSelect: true,
|
||||
})
|
||||
input.value = list.join(",")
|
||||
console.log(input.value)
|
||||
return false;
|
||||
})
|
||||
const tagify = new Tagify(input, {
|
||||
whitelist: [],
|
||||
maxTags: 10,
|
||||
dropdown: {
|
||||
maxItems: 20,
|
||||
enabled: 0
|
||||
}
|
||||
})
|
||||
fetch("/api/tag/")
|
||||
.then(response => response.json())
|
||||
.then(data =>
|
||||
data.map(function (item) {
|
||||
return item['name'];
|
||||
const input = document.querySelector('input[name="tags"]')
|
||||
input.classList.remove("form-control")
|
||||
|
||||
document.querySelector("form").addEventListener("submit", function () {
|
||||
const list = JSON.parse(input.value).map(function (item) {
|
||||
return item['value'];
|
||||
})
|
||||
)
|
||||
.then(data => {
|
||||
|
||||
tagify.settings.whitelist = data
|
||||
|
||||
input.value = list.join(",")
|
||||
console.log(input.value)
|
||||
return false;
|
||||
})
|
||||
const tagify = new Tagify(input, {
|
||||
whitelist: [],
|
||||
maxTags: 10,
|
||||
dropdown: {
|
||||
maxItems: 20,
|
||||
enabled: 0
|
||||
}
|
||||
})
|
||||
fetch("/api/tag/")
|
||||
.then(response => response.json())
|
||||
.then(data =>
|
||||
data.map(function (item) {
|
||||
return item['name'];
|
||||
})
|
||||
)
|
||||
.then(data => {
|
||||
|
||||
const myCodeMirror = CodeMirror.fromTextArea(
|
||||
document.getElementById("id_description_md"),
|
||||
{
|
||||
lineWrapping: true,
|
||||
lineNumbers: true,
|
||||
}
|
||||
);
|
||||
tagify.settings.whitelist = data
|
||||
|
||||
})
|
||||
|
||||
const myCodeMirror = CodeMirror.fromTextArea(
|
||||
document.getElementById("id_description_md"),
|
||||
{
|
||||
lineWrapping: true,
|
||||
lineNumbers: true,
|
||||
}
|
||||
);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
$primary: #28a745;
|
||||
$lightBackground: #f5f5f5;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
@import "node_modules/bootstrap/scss/button-group";
|
||||
@import "node_modules/bootstrap/scss/input-group";
|
||||
@import "node_modules/bootstrap/scss/custom-forms";
|
||||
//@import "node_modules/bootstrap/scss/nav";
|
||||
@import "node_modules/bootstrap/scss/nav";
|
||||
//@import "node_modules/bootstrap/scss/navbar";
|
||||
@import "node_modules/bootstrap/scss/card";
|
||||
//@import "node_modules/bootstrap/scss/breadcrumb";
|
||||
|
|
@ -154,3 +154,29 @@ h1.acronym {
|
|||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
|
||||
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
|
||||
}
|
||||
|
||||
html {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
||||
body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
|
||||
> .container {
|
||||
flex: 1 0 auto;
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
background: $lightBackground;
|
||||
margin-top: 1rem;
|
||||
|
||||
.nav {
|
||||
justify-content: space-between;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,6 @@
|
|||
{# <div class="container {{ referrers is defined ? "edit" }}">#}
|
||||
<div class="container {% block containerclasses %}{% endblock %}">
|
||||
{% bootstrap_messages %}
|
||||
{% if user.is_authenticated %}
|
||||
<div class="accountStatus">
|
||||
Hello {{ user.get_username }}, <a href="{% url 'logout' %}">Log out</a>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="accountStatus">
|
||||
<a href="{% url 'login' %}">Log in</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% block heading %}
|
||||
{% endblock %}
|
||||
<div id="autocomplete" class="autocomplete">
|
||||
|
|
@ -40,7 +31,9 @@
|
|||
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
|
||||
</div>
|
||||
{% include 'footer.html' %}
|
||||
<script src="{% static "libs/jquery.slim.min.js" %}"></script>
|
||||
<script src="{% static "libs/popper.min.js" %}"></script>
|
||||
<script src="{% static "libs/bootstrap.min.js" %}"></script>
|
||||
|
|
|
|||
25
templates/footer.html
Normal file
25
templates/footer.html
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<footer>
|
||||
<ul class="nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="https://github.com/Findus23/acronomy/" target="_blank" rel="noopener">Source</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="https://lw1.at/i">Privacy</a>
|
||||
</li>
|
||||
{% if user.is_staff %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'admin:index' %}">Admin</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user.is_authenticated %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{% url 'logout' %}">Log out</a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li class="nav-item">
|
||||
<a href="{% url 'login' %}">Log in</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
</ul>
|
||||
</footer>
|
||||
Loading…
Reference in a new issue