aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--h-source/Application/Controllers/SpecialController.php11
-rw-r--r--h-source/Application/Include/languages.php1
-rw-r--r--h-source/Application/Include/myFunctions.php28
-rw-r--r--h-source/Application/Views/My/panel.php1
-rw-r--r--h-source/Application/Views/Special/modactions.php8
-rw-r--r--h-source/Public/Css/main.css19
6 files changed, 48 insertions, 20 deletions
diff --git a/h-source/Application/Controllers/SpecialController.php b/h-source/Application/Controllers/SpecialController.php
index eb80582..9298ad3 100644
--- a/h-source/Application/Controllers/SpecialController.php
+++ b/h-source/Application/Controllers/SpecialController.php
@@ -40,17 +40,6 @@ class SpecialController extends BaseController
{
switch ($action)
{
-// case 'modifications':
-// $data['title'] = 'last modifications - '.Website::$generalName;
-//
-// $whereClauseArray = array(
-// 'gr' => 'registered',
-// 'type' => 'hardware',
-// );
-//
-// $viewFile = 'modifications';
-//
-// break;
case 'modactions':
$data['title'] = 'last moderations - '.Website::$generalName;
$data['viewTitle'] = 'List of actions carried out by moderators';
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index ac75241..a4c4254 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -312,6 +312,7 @@ class Lang
/*0264*/"This issue is closed" => "Questa questione è stata chiusa",
/*0265*/"This issue is opened" => "Questa questione è aperta",
/*0266*/"does it adopt any techniques to track users?" => "adotta qualche tecnica per tracciare gli utenti?",
+ /*0267*/"Actions carried out by users" => "Azioni compiute dagli utenti"
),
'es' => array
(
diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index 7ac5705..44b926b 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -561,6 +561,34 @@ function goToModeratedItem( $row = array() )
$hardInfo = getHardwareInfoFromId($row['id']);
$url = $hardInfo['controller'].'/view/'.Lang::$current.'/'.$row['id'].'/'.encodeUrl($hardInfo['model']);
break;
+ case 'message_ins':
+ $url = 'issues/view/'.Lang::$current.'/'.getIssueNumberFromMessageId($row['id']).'#message-'.$row['id'];
+ break;
+ case 'wiki_talk_ins':
+ $url = 'wiki/talk/'.Lang::$current.'/'.getWikiPageInfoFromTalkId($row['id']).'#wiki-talk-'.$row['id'];
+ break;
+ case 'issue_ins':
+ $url = 'issues/view/'.Lang::$current.'/'.$row['id'];
+ break;
+ case 'talk_ins':
+ $hardInfo = getHardwareInfoFromTalkId($row['id']);
+ if (isset($hardInfo))
+ {
+ $controller = Hardware::$typeToController[$hardInfo['type']];
+ $url = $controller.'/talk/'.Lang::$current.'/'.$hardInfo['id_hard'].'#talk-'.$row['id'];
+ }
+ else
+ {
+ $url = 'last/modactions/'.Lang::$current;
+ }
+ break;
+ case 'hardware':
+ $hardInfo = getHardwareInfoFromId($row['id']);
+ $url = $hardInfo['controller'].'/view/'.Lang::$current.'/'.$row['id'].'/'.encodeUrl($hardInfo['model']);
+ break;
+ case 'wiki':
+ $url = 'wiki/page/'.Lang::$current.'/'.encodeUrl(getWikiNameFromId($row['id']));
+ break;
}
return 'http://'.DOMAIN_NAME.'/'.$url;
}
diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php
index 0116134..67fbe1d 100644
--- a/h-source/Application/Views/My/panel.php
+++ b/h-source/Application/Views/My/panel.php
@@ -48,6 +48,7 @@
<div class="moderator_box_title"><?php echo gtext("Special pages for moderators");?></div>
<ul>
<li><a href="<?php echo Url::getRoot('special/modactions/'.$lang);?>"><?php echo gtext("Actions carried out by moderators");?></a></li>
+ <li><a href="<?php echo Url::getRoot('special/usersactions/'.$lang);?>"><?php echo gtext("Actions carried out by users");?></a></li>
</ul>
</div>
<?php } ?>
diff --git a/h-source/Application/Views/Special/modactions.php b/h-source/Application/Views/Special/modactions.php
index 36aee20..4539aee 100644
--- a/h-source/Application/Views/Special/modactions.php
+++ b/h-source/Application/Views/Special/modactions.php
@@ -38,7 +38,9 @@
<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>
<?php foreach ($table as $row) { ?>
<tr class="listRow">
@@ -46,12 +48,12 @@
<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>
+ <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="simpleText">
+ <td class="type_column">
<span class='textItem'><?php echo HistoryController::$typeTable[$row['history']['type']];?></span>
</td>
<td class="simpleText">
@@ -60,9 +62,11 @@
<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>
diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css
index 97c7da7..cc1dd3e 100644
--- a/h-source/Public/Css/main.css
+++ b/h-source/Public/Css/main.css
@@ -1591,23 +1591,28 @@ ins
.listTable
{
margin:20px 5px;
+ width:100%;
}
/*MODERATORS' PAGE*/
-tr.listRow td{
- font: normal 14px/1 sans-serif,arial;
- padding:10px 5px;
+tr.listRow td
+{
+ font: normal 13px/1 sans-serif,arial;
+ padding:5px 5px;
+}
+tr.listRow td.type_column
+{
+ width:15%;
}
-
tr.listHead {
- font: bold 14px/1 sans-serif,arial;
+ font: bold 13px/1 sans-serif,arial;
}
tr.listHead td {
padding:8px 4px;
background:#ADD8E6;
- border-top:1px solid #4169E1;
- border-bottom:1px solid #4169E1;
+/* border-top:1px solid #4169E1; */
+/* border-bottom:1px solid #4169E1; */
}
.recordsBox {