improved wiki

3 files changed, 70 insertions, 2 deletions

diff --git a/h-source/Application/Views/Meet/contributions.php b/h-source/Application/Views/Meet/contributions.php
index 2f38987..82921f7 100644
--- a/h-source/Application/Views/Meet/contributions.php
+++ b/h-source/Application/Views/Meet/contributions.php
@@ -59,6 +59,13 @@
 				<a href="<?php echo $this->baseUrl."/meet/messages/$lang/$meet_username".$this->viewStatus;?>">messages submitted by <b><?php echo $meet_username;?></b></a>
 			</div>
 			<?php } ?>
+
+			<!--messages submitted-->
+			<?php if ($hasWiki) { ?>
+			<div class="user_hardware_pages">
+				<a href="<?php echo $this->baseUrl."/meet/wiki/$lang/$meet_username".$this->viewStatus;?>">wiki pages inserted/updated by <b><?php echo $meet_username;?></b></a>
+			</div>
+			<?php } ?>
 			
 		</div>
 	
diff --git a/h-source/Application/Views/Meet/wiki.php b/h-source/Application/Views/Meet/wiki.php
new file mode 100644
index 0000000..b813cda
--- /dev/null
+++ b/h-source/Application/Views/Meet/wiki.php
@@ -0,0 +1,55 @@
+<?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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; wiki contributions
+		</div>
+		
+		<div class="contrib_explain_box">
+			wiki contributions of <?php echo $meet_username;?>
+		</div>
+		
+		<div class="external_users_contrib">
+			<?php foreach ($table as $item) {?>
+			<div class="users_contrib_item">
+
+				<div class="contribution_item">
+					<?php 
+					
+					$name = $item['wiki']['title'];
+					$id_wiki = $item['wiki']['id_wiki'];
+					
+					?>
+					<a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($name);?>"><?php echo $name;?></a>
+				</div>
+				
+			</div>
+			<?php } ?>
+		</div>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+		
+	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php
index 8c415cd..60b5f31 100644
--- a/h-source/Application/Views/right.php
+++ b/h-source/Application/Views/right.php
@@ -92,9 +92,15 @@
 
 		<?php if ( strcmp($this->controller,'wiki') === 0 ) { ?>
 		<div class="wiki_control_box">
+			<div class="last_modifications_title">
+				<?php echo gtext('special pages');?>
+			</div>
 			<ul>
 				<li><a href="<?php echo $this->baseUrl."/wiki/pages/$lang";?>"><?php echo gtext('list of pages'); ?></a></li>
-				<li><a href="<?php echo $this->baseUrl."/wiki/deleted/$lang";?>"><?php echo gtext('list of deleted pages'); ?></a></li>
+				<?php if ($isadmin) { ?>
+					<li><a href="<?php echo $this->baseUrl."/wiki/deleted/$lang";?>"><?php echo gtext('list of deleted pages'); ?></a></li>
+					<li><a href="<?php echo $this->baseUrl."/wiki/blocked/$lang";?>"><?php echo gtext('list of blocked pages'); ?></a></li>
+				<?php } ?>
 				<li><a href="<?php echo $this->baseUrl."/wiki/modifications/$lang";?>"><?php echo gtext('last modifications'); ?></a></li>
 			</ul>
 		</div>
@@ -107,7 +113,7 @@
 			</div>
 			<ul>
 				<?php foreach ($lastModif as $row) { ?>
-					<li><a class="last_modifications_model" href="<?php echo Go::toHardwarePage($row['history']['id']);?>"><?php echo $hw->getTheModelName($row['history']['id']);?></a> <?php echo gtext('by');?> <?php echo getLinkToUser($u->getUser($row['history']['created_by']))?></li>
+					<li><a class="last_modifications_model" href="<?php echo Go::toHardwarePage($row['history']['id']);?>"><?php echo $hw->getTheModelName($row['history']['id']);?></a> <?php echo gtext('by');?> <?php echo $u->getLinkToUserFromId($row['history']['created_by'])?></li>
 				<?php } ?>
 			</ul>
 			<div class="last_modifications_all">