moderators can now consult the list of actions carried out by other moderators

4 files changed, 88 insertions, 8 deletions

diff --git a/h-source/Application/Views/Meet/contributions.php b/h-source/Application/Views/Meet/contributions.php
index a62160d..1ebbf30 100644
--- a/h-source/Application/Views/Meet/contributions.php
+++ b/h-source/Application/Views/Meet/contributions.php
@@ -39,6 +39,13 @@
 			</div>
 			<?php } ?>
 			
+			<!--talk messages submitted-->
+			<?php if ($hasTalk) { ?>
+			<div class="user_hardware_pages">
+				<a href="<?php echo $this->baseUrl."/meet/talk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b></a>
+			</div>
+			<?php } ?>
+			
 			<!--issues opened-->
 			<?php if ($hasIssues) { ?>
 			<div class="user_hardware_pages">
@@ -53,13 +60,6 @@
 			</div>
 			<?php } ?>
 			
-			<!--talk messages submitted-->
-			<?php if ($hasTalk) { ?>
-			<div class="user_hardware_pages">
-				<a href="<?php echo $this->baseUrl."/meet/talk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b></a>
-			</div>
-			<?php } ?>
-			
 		</div>
 	
 	</div>
\ No newline at end of file
diff --git a/h-source/Application/Views/Moderators/index.php b/h-source/Application/Views/Moderators/index.php
new file mode 100644
index 0000000..7594695
--- /dev/null
+++ b/h-source/Application/Views/Moderators/index.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">
+		
+		<div class="position_tree_box">
+			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <a href="<?php echo $this->baseUrl."/my/home/$lang/$token";?>">panel</a> &raquo; moderators' page
+		</div>
+		
+		<div class="contrib_explain_box">
+			List of actions carried out by moderators
+		</div>
+		
+		<table class="listTable">
+			<tr class="listHead">
+				<td class="simpleText">ACTION ID</td>
+				<td class="simpleText">MODERATOR</td>
+				<td class="simpleText">ACTION</td>
+				<td class="simpleText">TYPE</td>
+				<td class="simpleText">OBJECT ID</td>
+				<td class="simpleText text_item_date">DATE</td>
+				<td class="simpleText">MOTIVATION</td>
+			</tr>
+			<?php foreach ($table as $row) { ?>
+			<tr class="listRow">
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['id_history'];?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $u->getUser($row['history']['created_by']);?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['action'];?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['type'];?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['id'];?></span>
+				</td>
+				<td class="simpleText text_item_date">
+					<span class='textItem'><?php echo smartDate($row['history']['creation_date']);?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['message'];?></span>
+				</td>
+			</tr>
+			<?php } ?>
+		</table>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+		
+	</div>
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index 44f159e..b5cc35e 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -32,6 +32,12 @@
 		</div>
 		<?php } ?>
 		
+		<?php if ($ismoderator) { ?>
+		<div class="moderator_panel_link">
+			watch all the <a href="<?php echo Url::getRoot('moderators/actions/'.$lang);?>">moderators' actions</a>
+		</div>
+		<?php } ?>
+		
 		<ul class='panelApplicationList'>
 			<li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>">Watch your public profile</a></li>
 			<li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>">Edit your profile</a></li>
diff --git a/h-source/Application/Views/Search/results.php b/h-source/Application/Views/Search/results.php
index d092bd7..1b6a27d 100644
--- a/h-source/Application/Views/Search/results.php
+++ b/h-source/Application/Views/Search/results.php
@@ -39,7 +39,7 @@
 			
 			<div class="search_result_item">
 				<div>
-					<?php echo gtext("model name");?>: <b><a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$row['hardware']['type']]."/view/$lang/".$row['hardware']['id_hard']."/".$row['hardware']['model'];?>"><?php echo $row['hardware']['model'];?></a></b>
+					<?php echo gtext("model name");?>: <b><a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$row['hardware']['type']]."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?>"><?php echo $row['hardware']['model'];?></a></b>
 				</div>
 				<div>
 					<?php echo gtext("model type");?>: <b><?php echo $row['hardware']['type'];?></b>