From 693393f2eb2c3d1bd1d6d30c3ad3cb249a766425 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 12 Mar 2010 18:19:04 +0100 Subject: [PATCH] prepare website to be git-push-able Signed-off-by: Nico Schottelius --- Makefile | 3 +- ikiwiki.setup | 12 +- sidebar.mdwn | 1 + style.css | 432 -------------------------------------------------- 4 files changed, 9 insertions(+), 439 deletions(-) delete mode 100644 style.css diff --git a/Makefile b/Makefile index 7b44ff87..017e0ef5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ DESTDIR=/home/users/nico/privat/rechner/netz/seiten/www.nico.schottelius.org/dst/ PUBDIR=tee.schottelius.org:/home/services/www/nico/www.nico.schottelius.org/www/ BROWSER=conkeror -IKIWIKI=ikiwikitest.sh +#IKIWIKI=ikiwikitest.sh +IKIWIKI=ikiwiki all: $(IKIWIKI) --refresh --setup ikiwiki.setup diff --git a/ikiwiki.setup b/ikiwiki.setup index a775a487..ef282c77 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -15,7 +15,7 @@ use IkiWiki::Setup::Standard { # users who are banned from the wiki banned_users => [], # where the source of the wiki is located - srcdir => './', + srcdir => '/home/nico/www-src/www.nico.schottelius.org', # where to build the wiki destdir => '../dst', # base url to the wiki @@ -29,14 +29,14 @@ use IkiWiki::Setup::Standard { # rcs backend to use rcs => '', # plugins to add to the default configuration - add_plugins => [qw{goodstuff meta sidebar tag rawhtml}], + add_plugins => [qw{git goodstuff meta sidebar tag rawhtml}], # plugins to disable disable_plugins => [qw{smiley openid}], # location of template files - templatedir => '/home/users/nico/b/ikiwiki/templates', + #templatedir => '/home/users/nico/b/ikiwiki/templates', # base wiki source location - underlaydirbase => '/home/users/nico/b/ikiwiki/underlays', - underlaydir => '/home/users/nico/b/ikiwiki/underlays/basewiki', + #underlaydirbase => '/home/users/nico/b/ikiwiki/underlays', + #underlaydir => '/home/users/nico/b/ikiwiki/underlays/basewiki', # display verbose messages? #verbose => 1, # log to syslog? @@ -72,7 +72,7 @@ use IkiWiki::Setup::Standard { # group for wrappers to run in #wrappergroup => 'ikiwiki', # extra library and plugin directory - libdir => '/home/users/nico/b/ikiwiki', + #libdir => '/home/users/nico/b/ikiwiki', # environment variables ENV => {}, # regexp of source files to ignore diff --git a/sidebar.mdwn b/sidebar.mdwn index 9ad507d8..c1929f6e 100644 --- a/sidebar.mdwn +++ b/sidebar.mdwn @@ -16,3 +16,4 @@ * [[Neuigkeiten|neuigkeiten]] * [[Verweise|verweise]] * [[Seitenübersicht / Sitemap|sitemap]] + * [[Änderungen / Changes|recentchanges]] diff --git a/style.css b/style.css deleted file mode 100644 index 317d4c7a..00000000 --- a/style.css +++ /dev/null @@ -1,432 +0,0 @@ -/* ikiwiki style sheet */ - -/* Note that instead of modifying this style sheet, you can instead edit - * local.css and use it to override or change settings in this one. - */ - -.header { - margin: 0; - font-size: 22px; - font-weight: bold; - line-height: 1em; - display: block; -} - -.inlineheader .author { - margin: 0; - font-size: 18px; - font-weight: bold; - display: block; -} - -.actions ul { - margin: 0; - padding: 6px; - list-style-type: none; -} -.actions li { - display: inline; - padding: .2em .4em; -} -.pageheader .actions ul { - border-bottom: 1px solid #000; -} - -.inlinepage .actions ul { - border-bottom: 0; -} - -#otherlanguages ul { - margin: 0; - padding: 6px; - list-style-type: none; -} -#otherlanguages li { - display: inline; - padding: .2em .4em; -} -.pageheader #otherlanguages { - border-bottom: 1px solid #000; -} - -div.inlinecontent { - margin-top: .4em; -} - -.pagefooter { - clear: both; -} -.inlinefooter { - clear: both; -} - -.tags { -} - -#pageinfo { - margin: 1em 0; - border-top: 1px solid #000; -} - -div.tags { - margin-top: 1em; -} - -.mapparent { - text-decoration: none; -} - -.img caption { - font-size: 80%; - caption-side: bottom; - text-align: center; -} - -.align-left { - float:left; -} - -.align-right { - float:right; -} - -#backlinks { - margin-top: 1em; -} - -#searchform { - display: inline; - float: right; -} - -#editcontent { - width: 100%; -} - -img { - border-style: none; -} - -div.recentchanges { - border-style: solid; - border-width: 1px; - overflow: auto; - clear: both; - width: 100%; - background: #eee; - color: black !important; -} -.recentchanges .metadata { - padding: 0px 0.5em; -} -.recentchanges .changelog { - font-style: italic; - clear: both; - display: block; - padding: 1px 2px; - background: white !important; - color: black !important; -} -.recentchanges .desc { - display: none; -} -.recentchanges .diff { - display: none; -} -.recentchanges .committer { - float: left; - margin: 0; - width: 40%; -} -.recentchanges .committype { - float: left; - margin: 0; - width: 5%; - font-size: small; -} -.recentchanges .changedate { - float: left; - margin: 0; - width: 35%; - font-size: small; -} -.recentchanges .pagelinks { - float: right; - margin: 0; - width: 60%; -} - -/* Used for adding a blog page. */ -#blogform { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} - -.inlinepage { - padding: 10px 10px; - border: 1px solid #aaa; -} - -.pagedate, -.pagelicense, -.pagecopyright { - font-style: italic; - display: block; - margin-top: 1em; -} - -.error { - color: #C00; -} - -/* Used for invalid form fields. */ -.fb_invalid { - color: red; - background: white !important; -} - -/* Used for required form fields. */ -.fb_required { - font-weight: bold; -} - -/* Orange feed button. */ -.feedbutton { - background: #ff6600; - color: white !important; - border-left: 1px solid #cc9966; - border-top: 1px solid #ccaa99; - border-right: 1px solid #993300; - border-bottom: 1px solid #331100; - padding: 0px 0.5em 0px 0.5em; - font-family: sans-serif; - font-weight: bold; - font-size: small; - text-decoration: none; - margin-top: 1em; -} -.feedbutton:hover { - color: white !important; - background: #ff9900; -} - -/* Tag cloud. */ -.pagecloud { - float: right; - width: 30%; - text-align: center; - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } - -#sidebar { - line-height: 3ex; - width: 20ex; - float: right; - margin-left: 40px; - margin-bottom: 40px; - padding: 2ex 2ex; - background: white; - color: black !important; -} - -/* outlines */ -li.L1 { - list-style: upper-roman; -} -li.L2 { - list-style: decimal; -} -li.L3 { - list-style: lower-alpha; -} -li.L4 { - list-style: disc; -} -li.L5 { - list-style: square; -} -li.L6 { - list-style: circle; -} -li.L7 { - list-style: lower-roman; -} -li.L8 { - list-style: upper-alpha; -} - -hr.poll { - height: 10pt; - color: white !important; - background: #eee; - border: 2px solid black; -} -div.poll { - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -div.progress { - margin-top: 1ex; - margin-bottom: 1ex; - border: 1px solid #888; - width: 400px; - background: #eee; - color: black !important; - padding: 1px; -} -div.progress-done { - background: #ea6 !important; - color: black !important; - text-align: center; - padding: 1px; -} - -input#openid_url { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} - -input#searchbox { - background: url(wikiicons/search-bg.gif) no-repeat; - background-color: #fff; - background-position: 100% 50%; - color: #000; - padding-right: 16px; -} - -/* Things to hide in printouts. */ -@media print { - .actions { display: none; } - .tags { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - #blogform { display: none; } - #backlinks { display: none; } -} - -/* Provided for use by template plugin for floating info boxes. */ -.infobox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - background: white; - color: black !important; -} - -/* Provided for use by template plugin for floating note boxes. */ -.notebox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - width: 25%; - background: white; - color: black !important; -} - -/* Used by the popup template and for backlinks hiding. */ -.popup { - border-bottom: 1px dotted #366; - color: #366; -} -.popup .balloon, -.popup .paren, -.popup .expand { - display: none; -} -.popup:hover .balloon, -.popup:focus .balloon { - position: absolute; - display: inline; - margin: 1em 0 0 -2em; - padding: 0.625em; - border: 2px solid; - background-color: #dee; - color: black; -} - -/* Formbuilder styling */ -fieldset { - margin: 1ex 0; - border: 1px solid black; -} -legend { - padding: 0 1ex; -} -.fb_submit { - float: left; - margin: 2px 0; -} -#signin_openid_url_label { - float: left; - margin-right: 1ex; -} -#signin_openid { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} - -span.color { - padding: 2px; -} - -.comment-header, -.microblog-header { - font-style: italic; - margin-top: .3em; -} -.comment .author, -.microblog .author { - font-weight: bold; -} -.comment-subject { - font-weight: bold; -} -.comment { - border: 1px solid #aaa; - padding: 3px; -} - -/* Used by the highlight plugin. */ -pre.hl { color:#000000; background-color:#ffffff; } -.hl.num { color:#2928ff; } -.hl.esc { color:#ff00ff; } -.hl.str { color:#ff0000; } -.hl.dstr { color:#818100; } -.hl.slc { color:#838183; font-style:italic; } -.hl.com { color:#838183; font-style:italic; } -.hl.dir { color:#008200; } -.hl.sym { color:#000000; } -.hl.line { color:#555555; } -.hl.mark { background-color:#ffffbb; } -.hl.kwa { color:#000000; font-weight:bold; } -.hl.kwb { color:#830000; } -.hl.kwc { color:#000000; font-weight:bold; } -.hl.kwd { color:#010181; } - -/* For the calendar plugin. */ -.month-calendar-day-this-day { background-color: #eee; } -.year-calendar-this-month { background-color: #eee; }