Permalink
Browse files

Added page with copyright info.

  • Loading branch information...
1 parent c65ea7e commit b480e49a96ccbf52665b85ba480766c215898011 @stephenmcd committed Apr 9, 2012
Showing with 51 additions and 4 deletions.
  1. +2 −4 README.md
  2. +23 −0 _includes/copyright
  3. +8 −0 _layouts/default.html
  4. +9 −0 copyright.html
  5. +9 −0 static/css/style.css
  6. BIN static/img/logo.png
View
@@ -7,7 +7,5 @@ Thanks for understanding.
# License
-Unless noted otherwise, all files are copyright Stephen McDonald.
-
-Do not reproduce without permission.
-
+Visit the [copyright](http://blog.jupo.org/copyright/) page for complete
+information on reproducing anything found within this repository.
View
@@ -0,0 +1,23 @@
+All of the content found on this site falls under several different
+categories with regard to licensing. I've been asked by people if they
+can reproduce parts of it, that fall under each of these separate areas,
+so I've put together the relevant copyright information for each one below.
+
+#### Design and Layout
+
+The design and layout of this site are not available for reproduction.
+The HTML, CSS, images and JavaScript, unless otherwise noted, are
+copyright Stephen McDonald.
+
+#### Article Content
+
+Articles can be reproduced if the following conditions are met:
+
+* Content of the reproduced article is unmodified
+* My name (Stephen McDonald) is cited as the author
+* A link back to the article's original URL on this site is included
+
+#### Code Samples
+
+Code samples found _within articles_ are public domain, and free to use for any
+purpose.
View
@@ -38,6 +38,14 @@
<div class="container">
<footer>
+<div class="footer-right">
+ <a class="jupo" href="http://jupo.org">
+ <img src="/static/img/logo.png">
+ <h2>Jupo Systems</h2>
+ </a>
+ <span class="arrow">&raquo;</span>
+ <a class="copyright" href="/copyright/">Copyright info</a>
+</div>
<ul class="unstyled">
<li>
<span class="title">{{ site.title }}</span>
View
@@ -0,0 +1,9 @@
+---
+layout: default
+title: Copyright Information
+---
+<h6><a href="/">Home</a></h6>
+{% capture license %}{% include copyright %}{% endcapture %}
+{{ license | unindent | markdownify }}
+
+
View
@@ -1,3 +1,4 @@
+@import url(http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:bold);
/*
Copyright Stephen McDonald. Please see LICENSE.
@@ -57,3 +58,11 @@ em a {font-style:italic;}
.bar {display:none;}
.title, .date {display:block; float:none;}
}
+
+.footer-right {float:right; width:160px; text-align:right;}
+.footer-right img {width:60px; height:60px; float:left;}
+.footer-right h2 {text-decoration:none; font-family:'Yanone Kaffeesatz'; font-weight:bold; color:#666;}
+.footer-right .jupo:hover {text-decoration:none;}
+.footer-right .arrow {margin:0;}
+.footer-right .copyright {margin-right:4px;}
+
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b480e49

Please sign in to comment.