aboutsummaryrefslogtreecommitdiff
path: root/mod/reportedcontent/views/default
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
committerBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
commitec7b94a64aef23b85866ecdac8e8acc712d29bb6 (patch)
treea108205c3fa0b694d8ce0ebaafd259480d6b530a /mod/reportedcontent/views/default
parentc80ba5aa03264dd64c20ed8ae222e87f9371a44d (diff)
parent2b68a4d217c35a5587c462620789493cf2804ba2 (diff)
downloadelgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.gz
elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'mod/reportedcontent/views/default')
-rw-r--r--mod/reportedcontent/views/default/object/reported_content.php46
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/admin_css.php16
2 files changed, 39 insertions, 23 deletions
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 044a40012..b8c443450 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -21,7 +21,8 @@ if ($report->state == 'archived') {
?>
<div class="reported-content <?php echo $reportedcontent_background; ?>">
- <div class="clearfix controls">
+ <div class="clearfix">
+ <div class="clearfix controls">
<?php
if ($report->state != 'archived') {
$params = array(
@@ -40,28 +41,29 @@ if ($report->state == 'archived') {
);
echo elgg_view('output/url', $params);
?>
+ </div>
+ <p>
+ <b><?php echo elgg_echo('reportedcontent:by'); ?>:</b>
+ <?php echo elgg_view('output/url', array(
+ 'href' => $reporter->getURL(),
+ 'text' => $reporter->name
+ ));
+ ?>,
+ <?php echo elgg_view_friendly_time($report->time_created); ?>
+ </p>
+ <p>
+ <b><?php echo elgg_echo('reportedcontent:objecttitle'); ?>:</b>
+ <?php echo $report->title; ?>
+ <br />
+ <?php echo elgg_view('output/url', array(
+ 'href' => "#report-$report->guid",
+ 'text' => elgg_echo('reportedcontent:moreinfo'),
+ 'class' => "elgg-toggler",
+ ));
+ ?>
+ </p>
</div>
- <p>
- <b><?php echo elgg_echo('reportedcontent:by'); ?>:</b>
- <?php echo elgg_view('output/url', array(
- 'href' => $reporter->getURL(),
- 'text' => $reporter->name
- ));
- ?>,
- <?php echo elgg_view_friendly_time($report->time_created); ?>
- </p>
- <p>
- <b><?php echo elgg_echo('reportedcontent:objecttitle'); ?>:</b>
- <?php echo $report->title; ?>
- <br />
- <?php echo elgg_view('output/url', array(
- 'href' => "#report-$report->guid",
- 'text' => elgg_echo('reportedcontent:moreinfo'),
- 'class' => "elgg-toggler",
- ));
- ?>
- </p>
- <div class="hidden" id="report-<?php echo $report->getGUID();?>">
+ <div class="report-details hidden" id="report-<?php echo $report->getGUID();?>">
<p>
<b><?php echo elgg_echo('reportedcontent:objecturl'); ?>:</b>
<?php echo elgg_view('output/url', array(
diff --git a/mod/reportedcontent/views/default/reportedcontent/admin_css.php b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
index b1e96f56c..2eba964a1 100644
--- a/mod/reportedcontent/views/default/reportedcontent/admin_css.php
+++ b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
@@ -28,5 +28,19 @@
}
.reported-content .controls {
float: right;
- margin: 14px 5px 0 0;
+ margin: 0 0 0 10px;
+}
+.report-details {
+ background-color: white;
+ padding: 5px;
+ margin-bottom: 5px;
+ max-width: 500px;
+
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+.elgg-widget-content .reported-content .elgg-button {
+ display: block;
+ margin: 5px;
}