Permalink
Browse files

Major reorganization and new wikipedia-like theme.

- Moved javascripts -> js.
- Moved stylesheets -> css.
- Moved images -> img.
- New screen.css, ie.css, and print.css based on bluetrip
  css framework and wikipedia css.
- Moved folder and page icons into img/icons.
- New two-column tabbed layout based on wikipedia's layout.
- Removed old banner; added lambda-bann.png and gitit-dog.png.
  gitit-dog is derived from http://flickr.com/photos/wolfhound/127936545/
  (creative commons 2 attribution license)
- Made gitit-dog the default logo (saved as logo.png in static/img/);
  users can simply replace this with their own logo.png.
- Updated sample config to include metadata for gitit logo.
- Changed wikiBanner -> wikiLogo, now a path rather than raw HTML.
- Better styling for login/register.
- Changed formattedPage to use page layout structure.
  Added page titles and tab selects.
- Don't give error on null email in registration.
- Added revision number below page title.
- Updated print css and added button for "printable version".
- Implemented "random page" button.
  • Loading branch information...
1 parent 81b44dc commit 419b973b0dde5322fd2dd6497ab5e7ab282b38a6 @jgm committed Nov 22, 2008
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
274 Gitit.hs

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -39,7 +39,7 @@ import Codec.Utils (Octet)
data Config = Config {
repositoryPath :: FilePath, -- path of git repository for pages
staticDir :: FilePath, -- path of static directory
- wikiBanner :: String, -- HTML to be included at top of pages
+ wikiLogo :: Maybe String, -- Nothing, or Just path to an image to be displayed at top left
wikiTitle :: String, -- title of wiki
wikiFooter :: String, -- HTML to be included at bottom of pages
tableOfContents :: Bool, -- should each page have an automatic table of contents?
@@ -59,9 +59,9 @@ defaultConfig :: Config
defaultConfig = Config {
repositoryPath = "wikidata",
staticDir = "static",
- wikiBanner = "",
+ wikiLogo = Just "/img/logo.png",
wikiTitle = "Wiki",
- wikiFooter = "Powered by Gitit",
+ wikiFooter = "powered by <a href=\"http://github.com/jgm/gitit/tree/master/\">gitit</a>",
tableOfContents = True,
maxUploadSize = 100000,
portNumber = 5001,
View
@@ -3,10 +3,12 @@ gitit: Gitit.hs Gitit/Git.hs Gitit/State.hs
.PHONY: static clean
static:
- mkdir -p static/javascripts
- mkdir -p static/stylesheets
- cp javascripts/*.js static/javascripts/
- cp stylesheets/*.css static/stylesheets/
+ mkdir -p static/js
+ mkdir -p static/css
+ mkdir -p static/img
+ cp js/*.js static/js/
+ cp css/*.css static/css/
+ cp -r img/* static/img/
clean:
rm Gitit.hi Gitit.o Gitit/*.hi Gitit/*.o gitit
View
42 TODO
@@ -1,26 +1,26 @@
-- look at Wikipedia for formatting ideas:
-
- - page names: change spaces to underscores
- - change wikilink generator so that the underscores are inserted
- - add talk pages
- - use tabs for edit, history, discuss, etc.
- - left sidebar: search, export, upload, activity, index, help, front, etc.
- - wikipedia-style banner:
- <a style="background-image: url(http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png);" href="/wiki/Main_Page">
- - add: random page? popular pages? pages last visited?
- - banner picture is just upper-left corner
- - login/register on top right
- - add print css
- - add "permanent link" (link to this revision)
- - add "related changes" to history page (like activity, but looks at
- only pages linked from this one)
- - store email with user info, and provide a lost password email
- - paging for long histories, activity lists
+- add talk pages
-- add literate haskell support to pandoc, and to gitit
+- add: popular pages? pages last visited?
+
+- add "permanent link" (link to this revision)
+
+- add "related changes" to history page (like activity, but looks at
+ only pages linked from this one)
+
+- recover lost email link?
+
+- paging for long histories, activity lists
-- a pandoc change: table of contents should come right before
- the first header, after any introductory text.
+- handle logging: see http://groups.google.com/group/HAppS/browse_thread/thread/2b412f24c53f5aa/4ef39b57c6062a87?lnk=gst&q=logging#4ef39b57c6062a87
+
+- ?? change wikilinks so that they are NOT relative (and change note
+ in Help about relative links). That is: insert a leading /
+ in the URL.
+
+- think about using a custom wikilink syntax, say {{Front Page}}.
+ could implement this with generics and a function: [Inline] -> [Inline].
+
+- add literate haskell support to pandoc, and to gitit
- smoother way to migrate when state format is changed?
one approach would be to save user information in a file.
File renamed without changes.
File renamed without changes.
View
@@ -0,0 +1,20 @@
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column {overflow-x:hidden;}
+* html legend {margin:-18px -8px 16px 0;padding:0;}
+ol {margin-left:2em;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+.container ul { list-style: disc outside; margin-left: 2em; } /* IE can't handle :before and :after */
+.container ul li { text-indent: 0; margin-left: 0; }
+.container legend { margin-bottom: 1.6em; } /* IE form margin bug */
+sup, sub { font-size: 100%; } /* IE superscript & subscript bug */
+.container blockquote p, #content blockquote ul, #content blockquote ol, #content blockquote dl, #content blockquote pre, #content blockquote address,
+.container blockquote table, #content blockquote form, #content blockquote h1, #content blockquote h2, #content blockquote h3, #content blockquote h4, #content blockquote h5, #content blockquote h6 { margin-top: .8em; margin-bottom: .8em; } /* IE can't handle :first-child */
+* html .container textarea, * html .container input { padding: 0; } /* IE < 7 form fix */
+.container input[type='submit'], .container input[type='button'] { padding: 0; } /* IE 7 button fix */
+.container legend+* { margin-top: 0; } /* we already added legend margin */
+a abbr, a acronym { text-decoration: underline; } /* IE 7 bug */
View
@@ -0,0 +1,53 @@
+/* --------------------------------------------------------------
+ gitit print css
+ borrows heavily from Mike Crittenden's BlueTripCSS framework (GPL)
+ and from Wikipedia's CSS.
+-------------------------------------------------------------- */
+
+body {
+width:100% !important;
+margin:0 !important;
+padding:0 !important;
+line-height: 1.4;
+word-spacing:1.1pt;
+letter-spacing:0.2pt; font-family: "Times New Roman", serif; color: #000; background: none; font-size: 12pt; }
+
+/*Headings */
+h1,h2,h3,h4,h5,h6 { font-family: Helvetica, Arial, sans-serif; }
+h1{font-size:19pt;}
+h2{font-size:17pt;}
+h3{font-size:15pt;}
+h4,h5,h6{font-size:12pt;}
+
+code { font: 10pt Courier, monospace; }
+blockquote { margin: 1.3em; padding: 1em; font-size: 10pt; }
+hr { background-color: #ccc; }
+
+/* Images */
+img { float: left; margin: 1em 1.5em 1.5em 0; }
+a img { border: none; }
+
+/* Links */
+a:link, a:visited { background: transparent; font-weight: 700; text-decoration: underline;color:#333; }
+a:link[href^="http://"]:after, a[href^="http://"]:visited:after { content: " (" attr(href) ") "; font-size: 90%; }
+a[href^="http://"] {color:#000; }
+
+/* Table */
+table { margin: 1px; text-align:left; }
+th { border-bottom: 1px solid #333; font-weight: bold; }
+td { border-bottom: 1px solid #333; }
+th,td { padding: 4px 10px 4px 0; }
+tfoot { font-style: italic; }
+caption { background: #fff; margin-bottom:2em; text-align:left; }
+thead {display: table-header-group;}
+tr {page-break-inside: avoid;}
+
+/*hide various parts from the site*/
+
+#maincol { margin-left: 1em; margin-right: 1em; border: none; }
+#content { border: none; }
+#sidebar, div.pageControls, #userbox {display:none;}
+#toc { display: none; }
+h1 a:link, h2 a:link, h3 a:link, h4 a:link, h5 a:link, h6 a:link { text-decoration: none; }
+h1.pageTitle { font-size: 220%; }
+#footer { border-top: 1px solid black; margin-top: 1em; padding-top: 1em; }
Oops, something went wrong.

0 comments on commit 419b973

Please sign in to comment.