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

Removed references to WEFT

Browse source 
WEFT was my trading name when I was actually working. Now I'm retired, I've given up the domain, so links to WEFT no longer work.
This commit is contained in:
Simon Brooke 2022-01-08 12:36:15 +00:00
parent 96fa9c7033
commit 1e6e7fbb87
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
4 changed files with 5 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/public/content/Introduction.md
View file

@ -1,4 +1,4 @@
![One wiki to rule them all](https://www.weft.scot/images/smeagol.png)
![One wiki to rule them all](img/smeagol.png)
# Welcome to Smeagol!
Smeagol is a hackable, extensible Wiki engine which is reasonably user-friendly. It uses [Markdown](http://daringfireball.net/projects/markdown/) as its text format, and [Git](http://git-scm.com/) to provide versioning and backup.
@ -27,13 +27,10 @@ You can run Smeagol from the [[Docker Image]]; alternatively you can run it from
Smeagol is an open source project; you're entitled to make changes yourself. Read more about [[Developing Smeagol]].
## License
Copyright © 2014-2020 Simon Brooke. Licensed under the GNU General Public License,
Copyright © 2014-2022 [Simon Brooke](mailto:simon@journeyman.cc). Licensed under the GNU General Public License,
version 2.0 or (at your option) any later version. If you wish to incorporate
parts of Smeagol into another open source project which uses a less restrictive
license, please contact me; I'm open to dual licensing it.
## Phoning home
Smeagol does currently fetch one image from my home site. Read more about [[Phoning Home]], and how to prevent it (if you want to).
## Advertisement
If you like what you see here, I am available for work on open source Clojure projects.

11
resources/public/content/Phoning Home.md
View file

@ -1,11 +0,0 @@
Smeagol currently requests the WEFT logo in the page footer from my home site. This is mainly so I can get a feel for how many people are using the product. If you object to this, edit the file
resources/templates/base.html
and replace the line
<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>
with the line
<img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>

10
resources/templates/base.html
View file

@ -37,11 +37,7 @@
<p>
<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="https://www.weft.scot/images/weft.logo.64.png">
Developed by <a href="http://www.weft.scot/">WEFT</a>
Smeagol wiki engine {{version}}
</p>
</div>
</div>
@ -82,13 +78,13 @@
<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="https://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
<img height="16" width="16" alt="Free Software Foundation" src="img/gnu.small.png"/>Licensed under the
<a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
</div>
<div>
Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
<img height="16" width="16" alt="Clojure" src="img/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
<img height="16" width="16" alt="GitHub" src="img/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
<img height="16" width="16" alt="Free Software Foundation" src="img/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
</div>
</div>
<footer>

6
src/smeagol/util.clj
View file

@ -60,12 +60,6 @@
(let [a (str (fs/absolute content-dir))]
(subs a 0 (- (count a) (count "content")))))
;; (def local-url-base
;; "Essentially, the slash-terminated absolute path of the `public` resource
;; directory. **NOTE** that this MAY NOT contain `content-dir`."
;; (cjio/file (io/resource-path)))
(defn not-servable-reason
"As a string, the reason this `file-path` cannot safely be served, or `nil`
if it is safe to serve. This reason may be logged, but should *not* be