From 06f82d6837867f6e2dcf39257f6ad26e38738556 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 15:40:01 -0700 Subject: Add GPL license fixes #11 --- src/pronouns/config.clj | 16 ++++++++++++++++ src/pronouns/pages.clj | 33 +++++++++++++++++++++++++++++---- src/pronouns/util.clj | 16 ++++++++++++++++ src/pronouns/web.clj | 16 ++++++++++++++++ 4 files changed, 77 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pronouns/config.clj b/src/pronouns/config.clj index fdb4c97..b0c83d5 100644 --- a/src/pronouns/config.clj +++ b/src/pronouns/config.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.config (:require [pronouns.util :as u])) diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 708d912..25ab4ee 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.pages (:require [clojure.string :as s] [pronouns.config :refer [*pronouns-table*]] @@ -5,6 +21,10 @@ [hiccup.core :refer :all] [hiccup.util :refer [escape-html]])) +(defn href + [url text] + [:a {:href url} text]) + (defn wrap-pronoun [pronoun] [:b pronoun]) @@ -64,15 +84,20 @@ [:p "This is a bit unwieldy. If we have a good guess we'll let you use just the first one or two."]]) (defn contact-block [] - (let [twitter-name (fn [handle] [:a {:href (str "https://www.twitter.com/" handle)} (str "@" handle)])] + (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) + (str "@" handle)))] [:div {:class "contact"} [:p "Written by " (twitter-name "morganastra") ", whose " - [:a {:href "http://pronoun.is/ze/zir?or=she"} "pronoun.is/ze/zir?or=she"] + (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she") ". " - "Visit the project on " [:a {:href "https://github.com/witch-house/pronoun.is"} "github!"]]])) + "pronoun.is is free software under the " + (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") + ", visit the project on " + (href "https://github.com/witch-house/pronoun.is" "github") + ","]])) (defn format-pronoun-examples @@ -101,7 +126,7 @@ (defn make-link [path] (let [link (str "/" path) label path] - [:li [:a {:href link} label]])) + [:li (href link label)])) (defn front [] (let [blah (println *pronouns-table*) diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index ef353a8..5aa9530 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.util (:require [clojure.string :as s])) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 6c758fe..168ed62 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -1,3 +1,19 @@ +;; pronoun.is - a website for pronoun usage examples +;; Copyright (C) 2014 - 2016 Morgan Astra + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU Affero General Public License as +;; published by the Free Software Foundation, either version 3 of the +;; License, or (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU Affero General Public License for more details. + +;; You should have received a copy of the GNU Affero General Public License +;; along with this program. If not, see + (ns pronouns.web (:require [compojure.core :refer [defroutes GET PUT POST DELETE ANY]] [compojure.handler :refer [site]] -- cgit