diff --git a/src/lib/views/wiki/PanaceaWikiView.php b/src/lib/views/wiki/PanaceaWikiView.php index b367cf2..c8581dd 100644 --- a/src/lib/views/wiki/PanaceaWikiView.php +++ b/src/lib/views/wiki/PanaceaWikiView.php @@ -53,6 +53,18 @@ $this->action = $action; } + /** + * Gets meta data for this view + * + * @author Tommy Montgomery + * @since 2008-10-26 + * + * @return ViewMetaData + */ + public function getMetaData() { + return ViewMetaData::generate()->addCss($this->cssPath . '/wiki.css'); + } + } ?> \ No newline at end of file diff --git a/src/lib/views/wiki/WikiPageContentView.php b/src/lib/views/wiki/WikiPageContentView.php index 8551614..2b761f4 100644 --- a/src/lib/views/wiki/WikiPageContentView.php +++ b/src/lib/views/wiki/WikiPageContentView.php @@ -31,6 +31,8 @@ public function send() { ?>
+

page->page->transformPageName(); ?>

+ page; ?>
diff --git a/src/lib/views/wiki/WikiPageHistoryView.php b/src/lib/views/wiki/WikiPageHistoryView.php index da764c0..135127f 100644 --- a/src/lib/views/wiki/WikiPageHistoryView.php +++ b/src/lib/views/wiki/WikiPageHistoryView.php @@ -51,9 +51,13 @@

Revision History for page->page->page_name; ?>

+
+ + +
+ + public function send() { + $title = $this->page->page->page_name . ': rev'; + $title .= $this->diff->oldRevision->revision . ' → rev'; + $title .= $this->diff->newRevision->revision; + + ?> -

Diff rdiff->oldRevision->revision; ?>/rdiff->newRevision->revision;?>

+

diff->getInlineDiff(); ?>
diff --git a/src/lib/views/wiki/WikiRevisionHistoryView.php b/src/lib/views/wiki/WikiRevisionHistoryView.php index 627c830..8f1cbb9 100644 --- a/src/lib/views/wiki/WikiRevisionHistoryView.php +++ b/src/lib/views/wiki/WikiRevisionHistoryView.php @@ -99,7 +99,7 @@ revision; ?> created; ?> - message; ?> + message; ?> user_name; ?> @@ -113,7 +113,8 @@ ?> - + + diff --git a/src/media/css/global.css b/src/media/css/global.css index 9af039e..53759c1 100644 --- a/src/media/css/global.css +++ b/src/media/css/global.css @@ -4,7 +4,7 @@ html { body { background-color: #363636; font-family: Verdana, Arial, sans-serif; - font-size: 8pt; + font-size: 9pt; color: #FFFFFF; } a { @@ -27,10 +27,6 @@ ul.menu { border: 2px solid #000000; } -#head { - -} - #logo { width: 535px; height: 173px; @@ -99,44 +95,6 @@ ul.menu { #main p { line-height: 1.2em; } -#main a { - display: inline-block; - padding: 1px 2px; - border-bottom: 1px dotted #000000; - color: #000099; - font-weight: bold; -} -#main a:hover { - background-color: #000099; - color: #FFFFFF; - border-bottom: 1px solid transparent; -} -#main a.broken { - color: #CC3366; -} -#main a.broken:hover { - background-color: #CC6666; - color: #FFFFFF; -} -#main a.broken:after { - content: "\2730"; - margin-left: 3px; - font-weight: normal; -} -#main a.external { - color: #339966; -} -#main a.external:hover { - background-color: #339966; - color: #FFFFFF; -} -#main a.external:after { - content: "\2750\279C"; - letter-spacing: -4px; - font-weight: normal; - margin-left: 3px; - padding-right: 4px; -} #foot { position: relative; @@ -172,55 +130,4 @@ ul.menu { border-top: 1px solid #000000; border-bottom: 1px solid #000000; background-color: #DDDD77; -} - -.wikimenu { - position: relative; -} -.wikimenu ul li { - float: right; - margin-left: 10px; -} -.wikicontent { - margin: 10px auto; -} -.wikicontent h2, .wikicontent h3, .wikicontent h4, .wikicontent h5, .wikicontent h6 { - padding: 2px 5px; -} -.wikicontent h2 { - background-color: #DDDDEE; -} -.wikicontent h3 { - background-color: #C8C8DD; -} - -.wikidiff { - white-space: pre; - font-family: "Courier New", monospace; - font-size: 125%; - border: 2px solid #000000; - padding: 4px; - background-color: #FFFFFF; - overflow: auto; -} -.wikidiff .range { - background-color: #000099; - color: #FFFFFF; - font-weight: bold; - font-size: 125%; -} -.wikidiff div { - padding: 2px; -} -.wikidiff .diff { - background-color: #FFFFFF; -} -.wikidiff .diff del, .wikidiff ins { - text-decoration: none; -} -.wikidiff .diff del { - background-color: #FFBBDD; -} -.wikidiff .diff ins { - background-color: #CCFFCC; } \ No newline at end of file diff --git a/src/media/css/wiki.css b/src/media/css/wiki.css new file mode 100644 index 0000000..bd03181 --- /dev/null +++ b/src/media/css/wiki.css @@ -0,0 +1,159 @@ +.wikimenu { + position: relative; +} +.wikimenu ul li { + float: right; + margin-left: 5px; +} +.wikimenu ul li a { + display: block; + padding: 3px; + color: #996699; + font-weight: bold; +} +.wikimenu ul li a:hover { + background-color: #996699; + color: #FFFFFF; +} + +.wikicontent { + margin-bottom: 10px auto; +} +.wikicontent h1, +.wikicontent h2, +.wikicontent h3, +.wikicontent h4, +.wikicontent h5, +.wikicontent h6 { + padding: 2px 5px; +} +.wikicontent h2 a, +.wikicontent h3 a, +.wikicontent h4 a, +.wikicontent h5 a, +.wikicontent h6 a { + display: block; + color: inherit; + border: inherit; +} +.wikicontent h2 a .headerlink, +.wikicontent h3 a .headerlink, +.wikicontent h4 a .headerlink, +.wikicontent h5 a .headerlink, +.wikicontent h6 a .headerlink { + float: right; + visibility: hidden; + color: #BBBBBB; + font-size: 75%; +} +.wikicontent h2 a:hover, +.wikicontent h3 a:hover, +.wikicontent h4 a:hover, +.wikicontent h5 a:hover, +.wikicontent h6 a:hover { + background-color: inherit; + color: inherit; + border: inherit; +} +.wikicontent h2 a:hover .headerlink, +.wikicontent h3 a:hover .headerlink, +.wikicontent h4 a:hover .headerlink, +.wikicontent h5 a:hover .headerlink, +.wikicontent h6 a:hover .headerlink { + visibility: visible; +} +.wikicontent a { + display: inline-block; + padding: 1px 2px; + border-bottom: 1px dotted #000000; + color: #000099; + font-weight: bold; +} +.wikicontent a:hover { + background-color: #000099; + color: #FFFFFF; + border-bottom: 1px solid transparent; +} +.wikicontent a.broken { + color: #CC3366; +} +.wikicontent a.broken:hover { + background-color: #CC6666; + color: #FFFFFF; +} +.wikicontent a.broken:after { + content: "\2730"; + margin-left: 3px; + font-weight: normal; +} +.wikicontent a.external { + color: #339966; +} +.wikicontent a.external:hover { + background-color: #339966; + color: #FFFFFF; +} +.wikicontent a.external:after { + content: "\2750\279C"; + letter-spacing: -4px; + font-weight: normal; + margin-left: 3px; + padding-right: 4px; +} +.wikicontent h1 { + background-color: #CCCCCC; + text-align: center; + font-family: Georgia, serif; +} +.wikicontent h2 { + background-color: #DDDDEE; +} +.wikicontent h3 { + background-color: #C8C8DD; +} +.wikicontent table { + border-collapse: collapse; +} +.wikicontent table tr td, +.wikicontent table tr th { + padding: 2px; + border: 1px solid #000000; +} +.wikicontent table tr th { + font-weight: bold; + font-size: 115%; + background-color: #DDEEFF; + border-bottom: 2px solid #000000; +} + +.wikidiff { + white-space: pre; + font-family: "Courier New", monospace; + font-size: 125%; + border: 2px solid #000000; + padding: 4px; + background-color: #FFFFFF; + overflow: auto; +} +.wikidiff .range { + background-color: #000099; + color: #FFFFFF; + font-weight: bold; + font-size: 125%; +} +.wikidiff div { + padding: 2px; +} +.wikidiff .diff { + background-color: #FFFFFF; +} +.wikidiff .diff del, +.wikidiff .diff ins { + text-decoration: none; +} +.wikidiff .diff del { + background-color: #FFBBDD; +} +.wikidiff .diff ins { + background-color: #CCFFCC; +} \ No newline at end of file