Merge branch 'development' into h-node

3 files changed, 185 insertions, 0 deletions

diff --git a/Application/Views/Desktop/Special/modactions.php b/Application/Views/Desktop/Special/modactions.php
new file mode 100644
index 0000000..3e58c62
--- /dev/null
+++ b/Application/Views/Desktop/Special/modactions.php
@@ -0,0 +1,95 @@
+<?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";?>"><?php echo gtext('panel');?></a> &raquo; list of 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>
+				<?php if (strcmp($this->action,'usersactions') !== 0) { ?>
+				<td class="simpleText">NOTE</td>
+				<?php } ?>
+			</tr>
+			<tr>
+				<td>&nbsp</td>
+				<td>
+					<form class="user_action_filter" action="<?php echo $this->currPage."/1/undef";?>">
+						<input class="user_action_filter_text" type="text" name="username" value="<?php echo $filterValue;?>" />
+						<a title='clear the filter' href='<?php echo $this->currPage."/1/undef";?>'><img src='<?php echo Url::getRoot();?>/Public/Img/Icons/elementary_2_5/clear_filter.png' /></a>
+						<input class="user_action_filter_submit" type='image' title='filter' src='<?php echo $this->baseUrl?>/Public/Img/Icons/elementary_2_5/find.png' value='trova'>
+					</form>
+				</td>
+				<td>&nbsp</td>
+				<td>&nbsp</td>
+				<td>&nbsp</td>
+				<td>&nbsp</td>
+				<?php if (strcmp($this->action,'usersactions') !== 0) { ?>
+				<td>&nbsp</td>
+				<?php } ?>
+			</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->getLinkToUserFromId($row['history']['created_by']);?></span>
+				</td>
+				<td class="simpleText">
+					<span class='textItem'><?php echo HistoryController::$actionTable[$row['history']['action']];?></span>
+				</td>
+				<td class="type_column">
+					<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>
+				<?php if (strcmp($this->action,'usersactions') !== 0) { ?>
+				<td class="simpleText">
+					<span class='textItem'><?php echo $row['history']['message'];?></span>
+				</td>
+				<?php } ?>
+			</tr>
+			<?php } ?>
+		</table>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+		
+	</div>
diff --git a/Application/Views/Desktop/Special/modifications.php b/Application/Views/Desktop/Special/modifications.php
new file mode 100644
index 0000000..1caca34
--- /dev/null
+++ b/Application/Views/Desktop/Special/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; <?php echo gtext('Database modifications');?>
+		</div>
+		
+		<div class="contrib_explain_box">
+			<?php echo gtext('List of the database 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 model');?> <a href="<?php echo Go::toHardwarePage($row['history']['id']);?>"><?php echo $hw->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/Special/pages_deleted.php b/Application/Views/Desktop/Special/pages_deleted.php
new file mode 100644
index 0000000..f0e69d5
--- /dev/null
+++ b/Application/Views/Desktop/Special/pages_deleted.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."/my/home/$lang/$token";?>"><?php echo gtext('panel');?></a> &raquo; <?php echo gtext($titleString);?>
+		</div>
+		
+		<div class="contrib_explain_box">
+			<?php echo gtext($titleString);?>
+		</div>
+
+		<div class="notebooks_viewall">
+			<ul class="page_history">
+			<?php foreach ($table as $row) { ?>
+				<li class="page_history_item"><a href="<?php echo $this->baseUrl."/".Hardware::getControllerFromType($row['hardware']['type'])."/view/$lang/".$row['hardware']['id_hard']."/".encodeUrl($row['hardware']['model']);?>"><?php echo $row['hardware']['model'];?></a></li>
+			<?php } ?>
+			</ul>
+		</div>
+
+		<div class="history_page_list">
+			<?php echo gtext("page list");?>: <?php echo $pageList;?>
+		</div>
+
+	</div>