Some messing around to allow user-defined styles. Fixes #23. Actually it was there...

git-svn-id: http://svn.simon-cozens.org/memories/trunk@58 041978f6-d955-411f-a9d7-1d8545c9c3c7

diff --git a/Memories/Config.pm.example b/Memories/Config.pm.example
index 9796ab0971da169b73683c9ce3304cb3d9eb0f8b..fb22d82227ef0b7d96bc5c9368e9a3d82e0a8cf6 100644 (file)
--- a/Memories/Config.pm.example
+++ b/Memories/Config.pm.example
@@ -6,7 +6,10 @@ package Memories::Config;
 Memories->config->uri_base("http://memories.simon-cozens.org/");
 
 # This is where your templates will live.
-Memories->config->{template_root} = "/home/simon/maypole-sites/memories/templates";
+Memories->config->{template_root} = [
+    "/web/memories/mytemplates/", # User-defined templates
+    "/etc/memories/templates/",   # Factory templates
+];
 
 # Here is where uploaded photos will be stored. Your web server user
 # should own this directory.

diff --git a/templates/header b/templates/header
index 797ad0826828cdd0335676844a063aaf24a9a037..20c66396bb7b7c4aa45d2e1be2d803b2f256e382 100644 (file)
--- a/templates/header
+++ b/templates/header
@@ -3,6 +3,7 @@
     <title> Memories - Photo Sharing [% IF photo %] - [% photo.title; END%]</title>
     <meta name="robots" content="nofollow">
     <link title="Maypole" href="[%base%]/static/memories.css" type="text/css" rel="stylesheet"/>
+    <link href="[%base%]/static/tagcloud.css" type="text/css" rel="stylesheet"/>
     <link href="[%base%]/static/star_rating.css" type="text/css" rel="stylesheet"/>
     [% IF photos %]
 <link rel="alternate" type="application/rdf+xml" title="RSS"

diff --git a/templates/static/memories.css b/templates/static/memories.css
index e6df986b3737092e362ee2ad95a145635f0f7e81..cca46496889db5216813e754f5358d4b631c9660 100644 (file)
--- a/templates/static/memories.css
+++ b/templates/static/memories.css
@@ -1,17 +1,17 @@
 BODY { background: #fff; border: 0; margin: 0; padding: 0 }
 a { text-decoration: none; color: #000; }
 p a { font-weight: bold }
-.tagbrowse a { font-weight: bold }
 a:hover { text-decoration: underline }
 a img { border: 0 }
 #nav { background: #994; padding: 2px;  }
 #rhs { background: #fff; height: 100%; width:150px;
 padding: 0 5px 0 5px; border-left: 1px dotted black }
+
+.tagbrowse a { font-weight: bold }
 #suggestionlist { background:#ffd; padding: 10px; margin:10px;
 font-weight: bold; font-family: sans-serif;}
 
-#login { margin-top: 10px;
-font-weight: bold; font-family: sans-serif; background: #eee}
+#login { margin-top: 10px; font-weight: bold; font-family: sans-serif; background: #eee}
 .loginfield { font-weight: bold; font-size: 80%; }
 
 .messages { background: #fff; border: 1px dotted black; margin: 0px 10px
@@ -95,55 +95,3 @@ p { font-family: sans-serif; }
 .frontpagetable th { border: 1px solid black; }
 
 .tagedittagdelete { margin-right: 2em; }
-
-span.tagcloud0 { font-size: 9px;}
-span.tagcloud1 { font-size: 10px;}
-span.tagcloud2 { font-size: 10px;}
-span.tagcloud3 { font-size: 11px;}
-span.tagcloud4 { font-size: 11px;}
-span.tagcloud5 { font-size: 12px;}
-span.tagcloud6 { font-size: 12px;}
-span.tagcloud7 { font-size: 13px;}
-span.tagcloud8 { font-size: 13px;}
-span.tagcloud9 { font-size: 14px;}
-span.tagcloud10 { font-size: 14px;}
-span.tagcloud11 { font-size: 15px;}
-span.tagcloud12 { font-size: 15px;}
-span.tagcloud13 { font-size: 16px;}
-span.tagcloud14 { font-size: 16px;}
-span.tagcloud15 { font-size: 17px;}
-span.tagcloud16 { font-size: 17px;}
-span.tagcloud17 { font-size: 18px;}
-span.tagcloud18 { font-size: 18px;}
-span.tagcloud19 { font-size: 19px;}
-span.tagcloud20 { font-size: 19px;}
-span.tagcloud21 { font-size: 20px;}
-span.tagcloud22 { font-size: 20px;}
-span.tagcloud23 { font-size: 21px;}
-span.tagcloud24 { font-size: 21px;}
-
-span.tagcloud0 a {text-decoration: none; color: #000;}
-span.tagcloud1 a {text-decoration: none; color: #000;}
-span.tagcloud2 a {text-decoration: none; color: #000;}
-span.tagcloud3 a {text-decoration: none; color: #000;}
-span.tagcloud10 a {text-decoration: none; color: #000;}
-span.tagcloud20 a {text-decoration: none; color: #000;}
-span.tagcloud11 a {text-decoration: none; color: #000;}
-span.tagcloud21 a {text-decoration: none; color: #000;}
-span.tagcloud12 a {text-decoration: none; color: #000;}
-span.tagcloud22 a {text-decoration: none; color: #000;}
-span.tagcloud13 a {text-decoration: none; color: #000;}
-span.tagcloud23 a {text-decoration: none; color: #000;}
-span.tagcloud14 a {text-decoration: none; color: #000;}
-span.tagcloud24 a {text-decoration: none; color: #000;}
-span.tagcloud4 a {text-decoration: none; color: #000;}
-span.tagcloud15 a {text-decoration: none; color: #000;}
-span.tagcloud5 a {text-decoration: none; color: #000;}
-span.tagcloud16 a {text-decoration: none; color: #000;}
-span.tagcloud6 a {text-decoration: none; color: #000;}
-span.tagcloud17 a {text-decoration: none; color: #000;}
-span.tagcloud7 a {text-decoration: none; color: #000;}
-span.tagcloud18 a {text-decoration: none; color: #000;}
-span.tagcloud8 a {text-decoration: none; color: #000;}
-span.tagcloud19 a {text-decoration: none; color: #000;}
-span.tagcloud9 a {text-decoration: none; color: #000;}

diff --git a/templates/static/tagcloud.css b/templates/static/tagcloud.css
new file mode 100644 (file)
index 0000000..77ca080
--- /dev/null
+++ b/templates/static/tagcloud.css
@@ -0,0 +1,51 @@
+span.tagcloud0 { font-size: 9px;}
+span.tagcloud1 { font-size: 10px;}
+span.tagcloud2 { font-size: 10px;}
+span.tagcloud3 { font-size: 11px;}
+span.tagcloud4 { font-size: 11px;}
+span.tagcloud5 { font-size: 12px;}
+span.tagcloud6 { font-size: 12px;}
+span.tagcloud7 { font-size: 13px;}
+span.tagcloud8 { font-size: 13px;}
+span.tagcloud9 { font-size: 14px;}
+span.tagcloud10 { font-size: 14px;}
+span.tagcloud11 { font-size: 15px;}
+span.tagcloud12 { font-size: 15px;}
+span.tagcloud13 { font-size: 16px;}
+span.tagcloud14 { font-size: 16px;}
+span.tagcloud15 { font-size: 17px;}
+span.tagcloud16 { font-size: 17px;}
+span.tagcloud17 { font-size: 18px;}
+span.tagcloud18 { font-size: 18px;}
+span.tagcloud19 { font-size: 19px;}
+span.tagcloud20 { font-size: 19px;}
+span.tagcloud21 { font-size: 20px;}
+span.tagcloud22 { font-size: 20px;}
+span.tagcloud23 { font-size: 21px;}
+span.tagcloud24 { font-size: 21px;}
+
+span.tagcloud0 a {text-decoration: none; color: #000;}
+span.tagcloud1 a {text-decoration: none; color: #000;}
+span.tagcloud2 a {text-decoration: none; color: #000;}
+span.tagcloud3 a {text-decoration: none; color: #000;}
+span.tagcloud10 a {text-decoration: none; color: #000;}
+span.tagcloud20 a {text-decoration: none; color: #000;}
+span.tagcloud11 a {text-decoration: none; color: #000;}
+span.tagcloud21 a {text-decoration: none; color: #000;}
+span.tagcloud12 a {text-decoration: none; color: #000;}
+span.tagcloud22 a {text-decoration: none; color: #000;}
+span.tagcloud13 a {text-decoration: none; color: #000;}
+span.tagcloud23 a {text-decoration: none; color: #000;}
+span.tagcloud14 a {text-decoration: none; color: #000;}
+span.tagcloud24 a {text-decoration: none; color: #000;}
+span.tagcloud4 a {text-decoration: none; color: #000;}
+span.tagcloud15 a {text-decoration: none; color: #000;}
+span.tagcloud5 a {text-decoration: none; color: #000;}
+span.tagcloud16 a {text-decoration: none; color: #000;}
+span.tagcloud6 a {text-decoration: none; color: #000;}
+span.tagcloud17 a {text-decoration: none; color: #000;}
+span.tagcloud7 a {text-decoration: none; color: #000;}
+span.tagcloud18 a {text-decoration: none; color: #000;}
+span.tagcloud8 a {text-decoration: none; color: #000;}
+span.tagcloud19 a {text-decoration: none; color: #000;}
+span.tagcloud9 a {text-decoration: none; color: #000;}