From e9973f35a33f0ad72ff2fbd74250283d0e23e375 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Fri, 25 Feb 2011 00:25:29 +0000
Subject: added list of actions carried out by administrators

---
 h-source/Application/Views/Last/modactions.php  | 74 +++++++++++++++++++++++++
 h-source/Application/Views/Meet/meet.php        |  2 +-
 h-source/Application/Views/Moderators/index.php | 74 -------------------------
 h-source/Application/Views/My/panel.php         | 14 ++---
 4 files changed, 82 insertions(+), 82 deletions(-)
 create mode 100644 h-source/Application/Views/Last/modactions.php
 delete mode 100644 h-source/Application/Views/Moderators/index.php

(limited to 'h-source/Application/Views')

diff --git a/h-source/Application/Views/Last/modactions.php b/h-source/Application/Views/Last/modactions.php
new file mode 100644
index 0000000..fe50223
--- /dev/null
+++ b/h-source/Application/Views/Last/modactions.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' actions
+		</div>
+		
+		<div class="contrib_explain_box">
+			<?php echo $viewTitle; ?>
+		</div>
+		
+		<table class="listTable">
+			<tr class="listHead">
+				<td class="simpleText">ACTION ID</td>
+				<td class="simpleText"><?php echo $user_status;?></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'><a href="<?php echo goToModeratedItem($row['history']);?>"><?php echo $row['history']['id_history'];?></a></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 HistoryController::$actionTable[$row['history']['action']];?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo HistoryController::$typeTable[$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/Meet/meet.php b/h-source/Application/Views/Meet/meet.php
index e52ef2a..f0e31b3 100644
--- a/h-source/Application/Views/Meet/meet.php
+++ b/h-source/Application/Views/Meet/meet.php
@@ -26,7 +26,7 @@
 			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("meet");?> <b><?php echo $meet_username;?></b>
 		</div>
 		
-		<?php if ($ismoderator) { ?>
+		<?php if ($isadmin) { ?>
 		<div class="moderator_box">
 			<?php if ($isBlocked) { ?>
 				This user has been blocked
diff --git a/h-source/Application/Views/Moderators/index.php b/h-source/Application/Views/Moderators/index.php
deleted file mode 100644
index dabbf56..0000000
--- a/h-source/Application/Views/Moderators/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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' actions
-		</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'><a href="<?php echo goToModeratedItem($row['history']);?>"><?php echo $row['history']['id_history'];?></a></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 30e4d24..babf409 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -26,19 +26,19 @@
 			<a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> &raquo; <?php echo gtext("control panel");?>
 		</div>
 		
-		<?php if ($isBlocked) { ?>
+		<?php if ($userBlocked) { ?>
 		<div class="moderator_box">
 			Your account has been blocked by a moderator of the website. You can neither insert/modify devices nor submit new issues or messages until some other moderator un-block your account.
 		</div>
 		<?php } ?>
 		
-		<?php if ($ismoderator) { ?>
-		<div class="moderator_panel_link">
-			<?php echo gtext("watch all the");?> <a href="<?php echo Url::getRoot('moderators/actions/'.$lang);?>"><?php echo gtext("actions carried out by moderators");?></a>
-		</div>
-		<?php } ?>
-		
 		<ul class='panelApplicationList'>
+			<?php if ($isadmin) { ?>
+				<li><a href="<?php echo Url::getRoot('last/adminactions/'.$lang);?>"><?php echo gtext("Watch all the actions carried out by administrators");?></a></li>
+			<?php } ?>
+			<?php if ($ismoderator) { ?>
+				<li><a href="<?php echo Url::getRoot('last/modactions/'.$lang);?>"><?php echo gtext("Watch all the actions carried out by moderators");?></a></li>
+			<?php } ?>
 			<li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>"><?php echo gtext("Watch your public profile");?></a></li>
 			<li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>"><?php echo gtext("Edit your profile");?></a></li>
 			<li><a href="<?php echo Url::getRoot('my/email/'.$lang.'/'.$token);?>"><?php echo gtext("Change your e-mail address");?></a></li>
-- 
cgit v1.2.3