mirror of
https://github.com/journeyman-cc/smeagol.git
synced 2026-04-12 18:05:06 +00:00
Much restyling to add WEFT branding and a wee advertisement.
Also in the process updated dependencies.
This commit is contained in:
parent
0613577825
commit
ee5630ecb2
12 changed files with 124 additions and 81 deletions
|
|
@ -23,12 +23,27 @@ There's still no mechanism to add a new user to the system through the user inte
|
|||
## Images
|
||||
Smeagol does not currently have any mechanism to upload images. You can, however, link to images already available on the web, like this:
|
||||
|
||||
|
||||
|
||||
|
||||
## Todo
|
||||
* Image (and other media) upload;
|
||||
* Mechanism to add users through the user interface;
|
||||
|
||||
## Advertisement
|
||||
If you like what you see here, I am available for work on open source Clojure projects. Contact me vis [WEFT](http://www.weft.scot/).
|
||||
|
||||
### Phoning home
|
||||
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 & 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 & Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
|
||||
|
||||
## License
|
||||
Copyright © 2014-2015 Simon Brooke. Licensed under the GNU General Public License,
|
||||
version 2.0 or (at your option) any later version. If you wish to incorporate
|
||||
|
|
@ -45,10 +60,6 @@ To start a web server for the application, run:
|
|||
|
||||
lein ring server
|
||||
|
||||
or more probably
|
||||
|
||||
nohup lein ring server > smeagol.log &
|
||||
|
||||
Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run:
|
||||
|
||||
lein ring uberwar
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
This is the header. There isn't yet much in it. You could [edit](edit?page=_header) it to provide internal navigation or branding.
|
||||
This is the header. There isn't yet much in it. You could [edit](edit?page=_header) it to provide internal navigation or branding.
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
This is the left bar. There's nothing in it yet. You could [edit](edit?page=_left-bar) it to provide internal navigation or branding.
|
||||
3
resources/public/content/_side-bar.md
Normal file
3
resources/public/content/_side-bar.md
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
This is the side bar. There's nothing in it yet. You could [edit](edit?page=_side-bar) it to provide internal navigation or branding.
|
||||
|
||||
If you don't like it on the left, float it to the right (or do something entirely different) by editing the [stylesheet](/edit-css?page=stylesheet).
|
||||
|
|
@ -28,6 +28,47 @@ body {
|
|||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
/* footer of the page - not-editable, provided by Smeagol */
|
||||
footer {
|
||||
border-top: thin solid gray;
|
||||
clear: both;
|
||||
font-size: smaller;
|
||||
text-align: center;
|
||||
color: gray;
|
||||
background: rgba(224,224,224,0.95);
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
padding: 0.25em 0;
|
||||
bottom:0;
|
||||
position:fixed;
|
||||
vertical-align: top;
|
||||
z-index:150;
|
||||
_position:absolute;
|
||||
_top:expression(eval(document.documentElement.scrollTop+
|
||||
(document.documentElement.clientHeight-this.offsetHeight)));
|
||||
}
|
||||
|
||||
footer div {
|
||||
padding: 0.1em;
|
||||
}
|
||||
|
||||
|
||||
/* header for all pages in the Wiki - editable, provided by users. */
|
||||
header {
|
||||
margin-top: 0;
|
||||
width:100%;
|
||||
background-color: gray;
|
||||
color: white;
|
||||
}
|
||||
|
||||
header h1 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
header img {
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* ids generally in document order */
|
||||
|
||||
/* top-of-page navigation, not editable, provided by Smeagol */
|
||||
|
|
@ -87,20 +128,8 @@ li.nav-item a:active { background: gray; color: white; }
|
|||
}
|
||||
|
||||
|
||||
/* header for all pages in the Wiki - editable, provided by users. Within main-container */
|
||||
#header {
|
||||
margin-top: 0;
|
||||
width:100%;
|
||||
background-color: gray;
|
||||
color: white;
|
||||
}
|
||||
|
||||
#header h1 {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* left bar for all pages in the Wiki - editable, provided by users. Within main-container */
|
||||
#left-bar {
|
||||
#side-bar {
|
||||
width: 17%;
|
||||
height: 100%;
|
||||
float: left;
|
||||
|
|
@ -151,24 +180,6 @@ li.nav-item a:active { background: gray; color: white; }
|
|||
display: block;
|
||||
}
|
||||
|
||||
/* footer of the page - not-editable, provided by Smeagol */
|
||||
#footer {
|
||||
clear: both;
|
||||
font-size: smaller;
|
||||
text-align: center;
|
||||
color:white;
|
||||
background:rgba(128,128,128,0.95);
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
padding: 0.25em 0;
|
||||
bottom:0;
|
||||
position:fixed;
|
||||
vertical-align: top;
|
||||
z-index:150;
|
||||
_position:absolute;
|
||||
_top:expression(eval(document.documentElement.scrollTop+
|
||||
(document.documentElement.clientHeight-this.offsetHeight)));
|
||||
}
|
||||
|
||||
|
||||
.change {
|
||||
|
|
|
|||
BIN
resources/public/img/weft.logo.64.png
Normal file
BIN
resources/public/img/weft.logo.64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
|
|
@ -9,8 +9,7 @@
|
|||
{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="header" class="wiki">
|
||||
<header class="wiki">
|
||||
<!-- navbar -->
|
||||
<div id="nav">
|
||||
{% if user %}
|
||||
|
|
@ -29,9 +28,9 @@
|
|||
</div>
|
||||
<h1>{{title}}</h1>
|
||||
{{header|safe}}
|
||||
</div>
|
||||
<div id="left-bar" class="wiki">
|
||||
{{left-bar|safe}}
|
||||
</header>
|
||||
<div id="side-bar" class="wiki">
|
||||
{{side-bar|safe}}
|
||||
</div>
|
||||
|
||||
<div id="main-container" class="container">
|
||||
|
|
@ -60,15 +59,21 @@
|
|||
About cookies
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<footer>
|
||||
<div id="credits">
|
||||
<div>
|
||||
One Wiki to rule them all ||
|
||||
<img height="16" width="16" alt="one wiki to rule them all" src="img/smeagol.png"/>Smeagol wiki engine {{version}} || Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
|
||||
<img height="16" width="16" alt="one wiki to rule them all" src="img/smeagol.png"/>Smeagol wiki engine {{version}} ||
|
||||
<img height="16" width="16" alt="The Web Engineering Factory & Toolworks" src="http://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> ||
|
||||
<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>
|
||||
</div>
|
||||
<footer>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue