simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/1.0.0rc1'

Browse source
This commit is contained in:
simon 2017-08-08 23:53:29 +01:00
commit e54e7fac66
24 changed files with 1016 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/templates/base.html
View file

@ -5,8 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{servlet-context}}/content/stylesheet.css" media="screen" rel="stylesheet" type="text/css" />
<link href="{{servlet-context}}/css/print.css" media="print" rel="stylesheet" type="text/css" />
{% style "/content/stylesheet.css" %}
{% block extra-headers %}
{% endblock %}
</head>
@ -21,6 +20,7 @@
<li class="{{edit-users-selected}}"><a href="{{servlet-context}}/edit-users">{{config.edit-users-link}}</a></li>
{% endif %}
{% if user %}
<li class="{{upload-selected}}"><a href="upload">{{config.file-upload-title}}</a></li>
<li class="{{passwd-selected}}"><a href="passwd">{{config.change-pass-link}}</a></li>
<li class="user" id="user">{{config.logged-in-as}} {{user}}</li>
<li class="{{auth-selected}}"><a href="{{servlet-context}}/auth">
@ -79,7 +79,7 @@
<div>
<img height="16" width="16" alt="one wiki to rule them all" src="img/smeagol.png"/>One Wiki to rule them all ||
Smeagol wiki engine {{version}} ||
<img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="http://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
<img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="https://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
</div>
<div>
Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
@ -91,4 +91,3 @@
<footer>
</body>
</html>

4
resources/templates/edit.html
View file

@ -1,7 +1,7 @@
{% extends "templates/base.html" %}
{% block extra-headers %}
<link rel="stylesheet" href="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.css">
<script src="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.js"></script>
{% style "/vendor/simplemde/dist/simplemde.min.css" %}
{% script "/vendor/simplemde/dist/simplemde.min.js" %}
{% endblock %}
{% block content %}

33
resources/templates/upload.html Normal file
View file

@ -0,0 +1,33 @@
{% extends "templates/base.html" %}
{% block content %}
<div id="content" class="auth">
{% if uploaded %}
{% if is-image %}
<img alt="Uploaded image" src="uploads/{{uploaded}}"/>
<p>
{{config.file-upload-link-text}}:
<code>![Uploaded image](uploads/{{uploaded}})</code>
</p>
{% else %}
<p>
{{config.file-upload-link-text}}:
<code>[Uploaded file](uploads/{{uploaded}})</code>
</p>
{% endif %}
{% else %}
<form action="{{servlet-context}}/upload" enctype="multipart/form-data" method="POST">
<p class="widget">
<label for="upload">{{config.file-upload-prompt}}</label>
<input name="upload" id="upload" type="file" required/>
</p>
<p class="widget">
<label for="submit">{{config.save-prompt}}</label>
<input name="submit" id="submit" type="submit" class="action" value="{{config.save-label}}"/>
</p>
</form>
{% endif %}
</div>
{% endblock %}

22
resources/templates/wiki.html
View file

@ -1,5 +1,17 @@
{% extends "templates/base.html" %}
{% block extra-headers %}
{% style "vendor/mermaid/dist/mermaid.css" %}
<!-- there's at the time of writing (20170731) a problem with the dependencies of the Bower
package for vega-embed, so we're currently not installing either it or Vega locally.
TODO: fix -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-rc2/vega.js"></script>
{% script "vendor/vega-lite/build/vega-lite.js" %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0-beta.19/vega-embed.js"></script>
{% script "vendor/mermaid/dist/mermaid.js" %}
{% endblock %}
{% block content %}
<div id="content" class="wiki">
{% if editable %}
@ -10,4 +22,14 @@
{% endif %}
{{content|safe}}
</div>
<script>
//<![CDATA[
if (document.addEventListener) {
document.addEventListener("DOMContentLoaded", function(event) {
mermaid.initialize({startOnLoad:true});
});
}
//]]
</script>
{% endblock %}