moving h-source subdir out.

9 files changed, 746 insertions, 0 deletions

diff --git a/Application/Views/Desktop/Wiki/climb.php b/Application/Views/Desktop/Wiki/climb.php
new file mode 100644
index 0000000..c648e7f
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/climb.php
@@ -0,0 +1,52 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+	<div id="left">
+
+		<?php if (!$isDeleted) { ?>
+		
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
+			</div>
+
+			<div class="notebook_view_title">
+				<?php echo gtext('Make this revision the current revision of the page'); ?> <b><?php echo $tree_name;?></b>
+			</div>
+
+			<div class="notebook_insert_link">
+				<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
+
+			<div class="wiki_external_box">
+
+				<?php echo $notice;?>
+
+				<div class="climb_form_ext_box">
+
+					<form action="<?php echo $this->currPage."/$lang/$id_rev"; ?>" method="POST">
+						<?php echo gtext('I want to make this revision the current revision');?>: <input type="submit" name="confirmAction" value="<?php echo gtext('Confirm');?>">
+					</form>
+
+				</div>
+
+			</div>
+			
+		<?php } ?>
\ No newline at end of file
diff --git a/Application/Views/Desktop/Wiki/differences.php b/Application/Views/Desktop/Wiki/differences.php
new file mode 100644
index 0000000..9c06714
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/differences.php
@@ -0,0 +1,64 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+
+		<?php if (!$isDeleted) { ?>
+		
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree;?>
+			</div>
+
+			<?php if ($showDiff === true) { ?>
+			<div class="notebook_view_title">
+				<?php echo gtext("Differences between the revision of");?> <b><?php echo smartDate($update_new);?></b>, <?php echo gtext("created by");?> <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, <?php echo gtext("and the revision of");?> <b><?php echo smartDate($update_old);?></b>
+			</div>
+			<?php } ?>
+
+			<div class="notebook_insert_link">
+				<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
+
+			<div class="wiki_external_box">
+
+				<div class="diff_color_notice">
+					<?php echo gtext("<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class='gray_text_notice'>gray</span> has not been changed.");?>
+				</div>
+
+				<?php foreach ($diffArray as $label => $text) { ?>
+
+				<div class="diff_ext_box">
+
+					<div class="diff_item_label">
+						<?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b>
+					</div>
+
+					<div class="diff_item_text">
+						<?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?>
+					</div>
+
+				</div>
+
+				<?php } ?>
+
+			</div>
+		<?php } ?>
diff --git a/Application/Views/Desktop/Wiki/form.php b/Application/Views/Desktop/Wiki/form.php
new file mode 100644
index 0000000..38a88c4
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/form.php
@@ -0,0 +1,105 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<script>
+
+		$(document).ready(function() {
+
+			$("#bb_code").markItUp(mySettings);
+
+		});
+
+	</script>
+	
+	<div id="left">
+
+		<?php if ( strcmp($this->action,'insert') === 0 ) { ?>
+		
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> &raquo; <?php echo gtext('Insert'); ?>
+		</div>
+
+		<div class="notebook_view_title">
+			<?php echo gtext('Insert a new wiki page'); ?>
+		</div>
+		
+		<div class="notebook_insert_link">
+			<a title="Back to the wiki main page" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/Main-Page";?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+		</div>
+		
+		<?php } else if ( strcmp($this->action,'update') === 0 ) { ?>
+
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('Update'); ?>
+		</div>
+
+		<div class="notebook_view_title">
+			<?php echo gtext('Edit the wiki page'); ?> <b><?php echo $tree_name;?></b>
+		</div>
+			
+		<div class="notebook_insert_link">
+			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+		</div>
+		
+		<?php } ?>
+
+		<div class="top_licence_notice">
+			<div><b><?php echo gtext("License information");?>:</b></div>
+			<?php echo License::getSubmissionNotice();?>
+		</div>
+		
+		<?php echo $notice;?>
+
+		<div class="notebooks_insert_form">
+
+			<form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang";?>" method="POST">
+
+				<div class="edit_form">
+
+					<div class="form_entry">
+						<div class="entry_label"><?php echo gtext("the title");?>:</div>
+						<?php echo Html_Form::input('title',$values['title'],'input_entry');?>
+					</div>
+
+					<div class="form_entry">
+						<div class="entry_label"><?php echo gtext("the text of the wiki page");?>:<br /><a href="<?php echo $this->baseUrl."/help/index/$lang#wiki-syntax";?>"><?php echo gtext("discover all the wiki tags");?></a></div>
+
+						<?php if (isset($pagePreview)) { ?>
+						<div class="description_preview_title"><?php echo gtext("Page preview");?>:</div>
+						<div class="description_preview">
+							<?php echo decodeWikiText($pagePreview); ?>
+						</div>
+						<?php } ?>
+					
+						<?php echo Html_Form::textarea('page',$values['page'],'textarea_entry','bb_code');?>
+					</div>
+
+					<?php echo $hiddenInput;?>
+
+					<input type="submit" name="previewAction" value="<?php echo gtext("Preview");?>">
+					<input type="submit" name="<?php echo $submitName;?>" value="<?php echo gtext("Save");?>">
+
+				</div>
+
+			</form>
+		</div>
+
diff --git a/Application/Views/Desktop/Wiki/history.php b/Application/Views/Desktop/Wiki/history.php
new file mode 100644
index 0000000..08fa4ac
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/history.php
@@ -0,0 +1,74 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+
+		<?php if (!$isDeleted) { ?>
+		
+			<div class="position_tree_box">
+				<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> &raquo; <a href="<?php echo $wiki->toWikiPage($id);?>"><?php echo $tree_name;?></a> &raquo; <?php echo gtext('History');?>
+			</div>
+
+			<div class="notebook_view_title">
+				<?php echo gtext('History of the wiki page'); ?> <b><?php echo $tree_name;?></b>
+			</div>
+
+			<div class="notebook_insert_link">
+				<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $wiki->toWikiPage($id);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+			</div>
+
+			<div class="wiki_external_box">
+
+				<ul class="page_history">
+
+					<?php if ($this->viewArgs['page'] === 1) { ?>
+					<?php foreach ($rev1 as $rev) { ?>
+					<li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> <?php echo gtext("by");?> <?php echo $u->getLinkToUserFromId($rev['wiki']['created_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
+					<?php } ?>
+					<?php } ?>
+
+					<?php foreach ($rev2 as $rev) { ?>
+					<li class="page_history_item">
+
+						<a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> <?php echo gtext("by");?> <?php echo $u->getLinkToUserFromId($rev['wiki_revisions']['created_by']);?>
+
+						<?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?>
+						(<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>)
+						<?php } ?>
+
+						<?php if ($islogged === 'yes' and !$isBlocked) { ?>
+						(<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo gtext('Make current'); ?></a>)
+						<?php } ?>
+
+					</li>
+					<?php } ?>
+
+				</ul>
+
+			</div>
+
+			<div class="history_page_list">
+				<?php echo gtext("page list");?>: <?php echo $pageList;?>
+			</div>
+			
+		<?php } ?>
+
diff --git a/Application/Views/Desktop/Wiki/modifications.php b/Application/Views/Desktop/Wiki/modifications.php
new file mode 100644
index 0000000..71e50c9
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/modifications.php
@@ -0,0 +1,45 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+		
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> &raquo; <?php echo gtext('Wiki modifications');?>
+		</div>
+		
+		<div class="contrib_explain_box">
+			<?php echo gtext('List of the wiki modifications carried out by users');?>
+		</div>
+		
+		<div class="notebooks_viewall">
+			<ul class="page_history">
+			<?php foreach ($table as $row) { ?>
+				<li class="page_history_item"><?php echo gtext('the text of the wiki page');?> <a href="<?php echo $wiki->toWikiPage($row['history']['id']);?>"><?php echo $wiki->getTheModelName($row['history']['id']);?></a> <?php echo gtext('has been '.$translations[$row['history']['action']].' by');?> <?php echo $u->getLinkToUserFromId($row['history']['created_by'])?> <?php echo gtext('at');?> <?php echo smartDate($row['history']['creation_date']);?></li>
+			<?php } ?>
+			</ul>
+		</div>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+		
+	</div>
diff --git a/Application/Views/Desktop/Wiki/not_found.php b/Application/Views/Desktop/Wiki/not_found.php
new file mode 100644
index 0000000..cd435de
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/not_found.php
@@ -0,0 +1,34 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+		
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> &raquo; <?php echo gtext('Page not-found'); ?>
+		</div>
+
+		<div class="wiki_external_box">
+			<div>
+				<?php echo gtext('the wiki page has not been found');?>. <a href="<?php echo $this->baseUrl."/wiki/insert/$lang";?>"><?php echo gtext('Would you like to insert it?');?></a>
+			</div>
+		</div>
+
diff --git a/Application/Views/Desktop/Wiki/page.php b/Application/Views/Desktop/Wiki/page.php
new file mode 100644
index 0000000..1716edc
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/page.php
@@ -0,0 +1,154 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+
+		<?php
+			$tableName = strcmp($this->action,'page') === 0 ? 'wiki' : 'wiki_revisions';
+			$displayClass = ($isDeleted) ? 'display_none' : null;
+		?>
+
+		<?php if ( strcmp($this->action,'page') === 0 ) { ?>
+
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> &raquo; <?php echo $tree_name;?>
+		</div>
+
+		<!--block the page-->
+		<?php if ($isadmin) { ?>
+		<div class="moderator_box_deleted">
+			<?php if ($isBlocked) { ?>
+				<?php echo gtext('This wiki page has been blocked'); ?>
+
+				<a id="<?php echo $id_wiki;?>" class="pageunblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/unlock.png"><?php echo gtext('unblock the wiki page'); ?></a>
+
+			<?php } else {	?>
+
+				<a id="<?php echo $id_wiki;?>" class="pageblock_page block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/lock.png"><?php echo gtext('block the wiki page'); ?></a>
+
+			<?php } ?>
+
+			<?php if ($isDeleted) { ?>
+				<div class="wiki_hidden_notice"><?php echo gtext('This wiki page has been deleted'); ?></div>
+
+				<a id="<?php echo $id_wiki;?>" class="pageshow_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png"><?php echo gtext('restore the wiki page'); ?></a>
+
+			<?php } else {	?>
+
+				<a id="<?php echo $id_wiki;?>" class="pagehide_page_del block_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png"><?php echo gtext('delete the wiki page'); ?></a>
+
+			<?php } ?>
+
+			<!--view details-->
+			<div class="show_hidden_box_ext">
+				<div class="md_type">page</div>
+				<?php if ($isDeleted) { ?>
+				<a class="hidden_message_view_page" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><?php echo gtext("see the page");?></a> |
+				<?php } ?>
+				<a id="<?php echo $id_wiki;?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+				<div class="moderation_details_box"></div>
+			</div>
+
+		</div>
+		<?php } ?>
+
+		<div class="notebook_insert_link">
+			<div class="view_page_back_button">
+				<a title="Insert a new wiki page" href="<?php echo $this->baseUrl."/".$this->controller."/insert/$lang";?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/new-60.png"></a>
+			</div>
+
+			<?php if (!$isDeleted) { ?>
+				<div class="view_page_history_button">
+					<a title="talk page" href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/talk-60.png"></a>
+				</div>
+
+				<div class="view_page_history_button">
+					<a title="history page" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/history-60.png"></a>
+				</div>
+			<?php } ?>
+
+			<?php if (!$isDeleted and !$isBlocked) { ?>
+			<div class="view_page_update_button">
+				<form action="<?php echo $this->baseUrl."/".$this->controller."/update/$lang";?>" method="POST">
+					<input title="edit page" class="update_submit_class" type="image" src="<?php echo $this->baseUrl;?>/Public/Img/edit-60.png" value="xedit">
+					<input type="hidden" name="id_wiki" value="<?php echo $id_wiki;?>">
+				</form>
+			</div>
+			<?php } ?>
+		</div>
+
+		<?php if (!$isDeleted) { ?>
+			<div class="talk_numb_ext_wiki">
+				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
+			</div>
+		<?php } ?>
+		
+		<?php } else if ( strcmp($this->action,'revision') === 0 ) { ?>
+
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree; ?>
+		</div>
+
+		<div class="notebook_view_title">
+			<?php echo gtext("Revision of the wiki page");?> <b><?php echo $tree_name;?></b>
+		</div>
+			
+		<div class="notebook_insert_link">
+			<a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+		</div>
+
+		<?php } ?>
+
+		<div class="wiki_external_box <?php echo $displayClass;?>">
+
+			<?php if (!$isDeleted or $isadmin) { ?>
+			
+				<!--if revision-->
+				<?php if (strcmp($this->action,'revision') === 0) { ?>
+				<div class="revision_alert">
+					<?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo $u->getLinkToUserFromId($created_by);?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo gtext("Current revision");?></a></a>.
+				</div>
+				<?php } ?>
+
+				<?php foreach ($table as $page) { ?>
+				<div class="wiki_page_title">
+					<?php echo $page[$tableName]['title']?>
+					<?php if ( strcmp($this->action,'page') === 0 ) { ?>
+						<?php if ($isBlocked) { ?>
+							<span class="blocked_notice"><?php echo gtext('This wiki page has been blocked'); ?></span>
+						<?php } ?>
+					<?php } ?>
+				</div>
+				<div class="wiki_page_content">
+					<?php echo decodeWikiText($page[$tableName]['page'])?>
+				</div>
+				<?php } ?>
+
+			<? } ?>
+
+		</div>
+
+		<?php if ($isDeleted) { ?>
+			<div class="revision_alert">
+				<?php echo gtext('This wiki page has been deleted'); ?>
+			</div>
+		<?php } ?>
diff --git a/Application/Views/Desktop/Wiki/pages.php b/Application/Views/Desktop/Wiki/pages.php
new file mode 100644
index 0000000..7a6918a
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/pages.php
@@ -0,0 +1,45 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<div id="left">
+		
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/wiki/page/$lang/Main-Page";?>">Wiki</a> &raquo; <?php echo gtext($topString);?>
+		</div>
+		
+		<div class="contrib_explain_box">
+			<?php echo gtext($topString);?>
+		</div>
+		
+		<div class="notebooks_viewall">
+			<ul class="page_history">
+			<?php foreach ($table as $row) { ?>
+				<li class="page_history_item"><a href="<?php echo $wiki->toWikiPage($row['wiki']['id_wiki']);?>"><?php echo $row['wiki']['title'];?></a></li>
+			<?php } ?>
+			</ul>
+		</div>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+		
+	</div>
diff --git a/Application/Views/Desktop/Wiki/talk.php b/Application/Views/Desktop/Wiki/talk.php
new file mode 100644
index 0000000..4e93798
--- /dev/null
+++ b/Application/Views/Desktop/Wiki/talk.php
@@ -0,0 +1,173 @@
+<?php if (!defined('EG')) die('Direct access not allowed!'); ?>
+
+<?php
+// h-source, a web software to build a community of people that want to share their hardware information.
+// Copyright (C) 2010  Antonio Gallo (h-source-copyright.txt)
+//
+// This file is part of h-source
+//
+// h-source is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// h-source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with h-source.  If not, see <http://www.gnu.org/licenses/>.
+?>
+
+	<script>
+	
+		$(document).ready(function() {
+			
+			$("#bb_code").markItUp(mySettings);
+			
+		});
+		
+	</script>
+
+	<div id="left">
+
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo $tree; ?>
+		</div>
+
+		<div class="notebook_view_title">
+			<?php echo gtext('Talk page of the wiki page'); ?> <b><?php echo $tree_name;?></b>
+		</div>
+
+		<div class="notebook_insert_link">
+			<a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $wiki->toWikiPage($id_wiki);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a>
+		</div>
+
+		<?php if (!$isDeleted) { ?>
+			<?php if (!$isBlocked) { ?>
+
+				<div class="wiki_external_box">
+
+					<?php foreach ($table as $message) { ?>
+
+						<?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?>
+
+							<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+							<div class="talk_message_item">
+
+								<div class="talk_message_item_title_date">
+									<?php if ($ismoderator) { ?>
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a>
+									<?php } ?>
+
+									<div class="talk_message_item_title">
+										<?php echo $message['wiki_talk']['title'];?>
+									</div>
+
+									<div class="talk_message_item_date">
+										<?php echo gtext("by");?> <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+									</div>
+								</div>
+
+								<div class="talk_message_item_content">
+									<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+								</div>
+
+								<?php if ($ismoderator) { ?>
+								<!--view details-->
+								<div class="show_hidden_box_ext">
+									<div class="md_type">wiki_talk</div>
+									<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+									<div class="moderation_details_box"></div>
+								</div>
+							<?php } ?>
+
+							</div>
+
+						<?php } else { ?>
+
+							<?php if ($ismoderator) { ?>
+								<a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a>
+								<div class="talk_message_item_hidden">
+									this message has been deleted
+
+										<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a>
+
+										<!--view details-->
+										<div class="show_hidden_box_ext">
+											<div class="md_type">wiki_talk</div>
+
+											<a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a>
+
+											<div class="details_of_hidden_message">
+												<div class="details_of_hidden_message_inner">
+													<div class="talk_message_item_date">
+														submitted by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?>
+													</div>
+													<div class="message_view_description_hidden">
+														<?php echo decodeWikiText($message['wiki_talk']['message']);?>
+													</div>
+												</div>
+												<div class="moderation_details_box"></div>
+											</div>
+										</div>
+
+
+								</div>
+							<?php } ?>
+
+						<?php } ?>
+
+					<?php } ?>
+				</div>
+
+				<?php if ($islogged === 'yes') { ?>
+
+					<div class="talk_form_external_box">
+						<div class="talk_login_notice">
+							<a name="form"><?php echo gtext("Add a message");?></a>
+						</div>
+
+						<?php echo $notice;?>
+
+						<div class="notebooks_insert_form">
+							<form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST">
+
+								<div class="edit_form">
+
+									<div class="form_entry">
+										<div class="entry_label"><?php echo gtext("TITLE");?>:</div>
+										<?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?>
+									</div>
+
+									<div class="form_entry">
+										<div class="entry_label"><?php echo gtext("MESSAGE");?>:</div>
+										<?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?>
+									</div>
+
+									<input type="submit" name="insertAction" value="<?php echo gtext("Save");?>">
+
+								</div>
+
+							</form>
+						</div>
+					</div>
+
+				<?php } else { ?>
+
+					<div class="talk_login_notice">
+						<a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a>
+					</div>
+
+				<?php } ?>
+
+			<?php } else { ?>
+				<!--is blocked-->
+				<div class="wiki_external_box">
+					<?php echo gtext('This wiki page has been blocked'); ?>
+				</div>
+			<?php } ?>
+			<!--close deleted-->
+		<?php } ?>
+	</div>
\ No newline at end of file