very close now

This commit is contained in:
JT Smith 2006-12-05 02:14:11 +00:00
parent 737cbf0fef
commit 5800dc1596
12 changed files with 228 additions and 216 deletions

View file

@ -15,13 +15,13 @@
<div style="float: left; width: 50%;">
<h3><a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a></h3>
<ul><tmpl_loop recentChangesLoop>
<ul><tmpl_loop recentChanges>
<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
</tmpl_loop></ul>
</div>
<div style="float: left;">
<h3><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a></h3>
<ul><tmpl_loop mostPopularLoop>
<ul><tmpl_loop mostPopular>
<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
</tmpl_loop></ul>

View file

@ -0,0 +1,14 @@
#WikiMPTmpl000000000001
#create
#namespace:WikiMaster_mostPopular
#url:default-wiki-most-popular
#title:Default Most Popular
#menuTitle:Default Most Popular
<h2><tmpl_var title></h2>
<ol><tmpl_loop mostPopular>
<li><a href="<tmpl_var url>"><tmpl_var title></a></li>
</tmpl_loop></ol>
<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>

View file

@ -9,6 +9,9 @@
<tbody>
<tr><td><label for="title"><tmpl_var titleLabel></label></td><td><tmpl_var formTitle></td></tr>
<tr><td><label for="content"><tmpl_var contentLabel></label></td><td><tmpl_var formContent></td></tr>
<tmpl_if canAdminister>
<tr><td><label for="isProtected"><tmpl_var protectQuestionLabel></label></td><td><tmpl_var formProtect></td></tr>
</tmpl_if>
<tmpl_if allowsAttachments>
<tr><td><label for="storageId"><tmpl_var attachmentLabel></label></td><td><tmpl_var formAttachment></td></tr>
</tmpl_if>
@ -20,17 +23,7 @@
<tmpl_if canAdminister><tmpl_unless isNew>
<ul>
<li><a href="<tmpl_var deleteUrl>"><tmpl_var deleteLabel></a></li>
<li id="wikiPageProtect"><a href="javascript:wikiPageCall('<tmpl_var protectUrl>');"><tmpl_var protectLabel></a></li>
<li id="wikiPageUnprotect"><a href="javascript:wikiPageCall('<tmpl_var unprotectUrl>');"><tmpl_var unprotectLabel></a></li>
</ul>
</tmpl_unless></tmpl_if>
<script type="text/javascript">
var wikiPageIsProtected = <tmpl_var isProtected>;
function wikiPageCall (url) {
var request = YAHOO.util.Connect.asyncRequest('GET', url, { success:wikiPageCallSuccess, failure:wikiPageCallFail });
}
function wikiPageCallSuccess ( response ) {
}
</script>

View file

@ -5,7 +5,7 @@
#title:Default Wiki Page
#menuTitle:Default Wiki Page
<tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if>
<tmpl_if displayTitle><h2><tmpl_var title></h2></tmpl_if>
<h2><tmpl_var title></h2>
<div id="wikipage" class="yui-navset">
<ul class="yui-nav">
@ -34,7 +34,7 @@ initWikiTabs = function() {
};
initWikiTabs();
</script>
<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
~~~

View file

@ -4,16 +4,11 @@
#url:default-wiki-recent-changes
#title:Default Recent Changes
#menuTitle:Default Recent Changes
<tmpl_if session.var.adminOn><p><tmpl_var controls></p></tmpl_if>
<tmpl_if displayTitle><h2><tmpl_var title></h2></tmpl_if>
<h2><tmpl_var title></h2>
<tmpl_loop rcDays>
<h3><tmpl_var dayDate></h3>
<ul><tmpl_loop dayEntries>
<li><tmpl_var date> <tmpl_var time>: <a href="<tmpl_var viewLatest>"><tmpl_var title></a>
<tmpl_var actionTakenLowerCase> by <tmpl_var username></li>
<ul><tmpl_loop recentChanges>
<li><a href="<tmpl_var url>"><tmpl_var title></a> <tmpl_var actionTaken> on <tmpl_var date> by <tmpl_var username></li>
</tmpl_loop></ul>
</tmpl_loop>
<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
<div style="padding: 8px;"><a href="<tmpl_var searchUrl>"><tmpl_var searchLabel></a> | <a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>

View file

@ -26,7 +26,7 @@
</tmpl_if>
</tmpl_if>
<div id="addFormGoesHere" style="display: none;"></div>
<div style="padding: 8px;"><a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
<div style="padding: 8px;"><a href="<tmpl_var mostPopularUrl>"><tmpl_var mostPopularLabel></a> | <a href="<tmpl_var recentChangesUrl>"><tmpl_var recentChangesLabel></a> | <a href="<tmpl_var wikiHomeUrl>"><tmpl_var wikiHomeLabel></a></div>
~~~
<script type="text/javascript" src="^Extras(yui/build/yahoo/yahoo-min.js);"></script>

View file

@ -64,14 +64,16 @@ sub addWikiAssets {
default 'WikiPageTmpl0000000001',
`pageEditTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
default 'WikiPageEditTmpl000001',
`recentChangesTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
default 'WikiRCTmpl000000000001',
`recentChangesTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL default 'WikiRCTmpl000000000001',
`mostPopularTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL default 'WikiMPTmpl000000000001',
`pageHistoryTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
default 'WikiPHTmpl000000000001',
`searchTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL
default 'WikiSearchTmpl00000001',
`recentChangesCount` int(11) NOT NULL default 50,
`recentChangesCountFront` int(11) NOT NULL default 10,
`mostPopularCount` int(11) NOT NULL default 50,
`mostPopularCountFront` int(11) NOT NULL default 10,
`thumbnailSize` int(11) NOT NULL default 0,
`maxImageSize` int(11) NOT NULL default 0,
`approvalWorkflow` varchar(22) binary not null default 'pbworkflow000000000003',
@ -85,6 +87,9 @@ EOT
`content` mediumtext,
`storageId` varchar(22) character set utf8 collate utf8_bin NULL,
`views` bigint(20) NOT NULL default 0,
isProtected int not null default 0,
actionTaken varchar(35) not null,
actionTakenBy varchar(22) binary not null,
PRIMARY KEY (`assetId`, `revisionDate`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
EOT
@ -95,24 +100,6 @@ EOT
`title` varchar(255) NOT NULL,
PRIMARY KEY (`assetId`, `pageId`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
EOT
# Don't want protection to be versioned, so put it in a
# separate table.
<<'EOT',
CREATE TABLE `WikiPage_protected` (
`assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
PRIMARY KEY (`assetId`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
EOT
<<'EOT',
CREATE TABLE `WikiPage_extraHistory` (
`assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
`userId` varchar(22) character set utf8 collate utf8_bin NOT NULL,
`dateStamp` bigint(20) NOT NULL,
`actionTaken` varchar(255) NOT NULL,
`url` varchar(255) NOT NULL,
`title` varchar(255) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
EOT
);