fixing some display issues with reported content - code use a little cleanup

git-svn-id: http://code.elgg.org/elgg/trunk@9195 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index 407717082914895af302e7c073f00e6c8d36f1c3..c047644e3fd1ec019eaa250d5972c47ac1b305ad 100644 (file)
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -23,8 +23,8 @@ $english = array(
        'reportedcontent:archived' => 'The report has been archived',
        'reportedcontent:visit' => 'Visit reported item',
        'reportedcontent:by' => 'Report by',
-       'reportedcontent:objecttitle' => 'Object title',
-       'reportedcontent:objecturl' => 'Object url',
+       'reportedcontent:objecttitle' => 'Page title',
+       'reportedcontent:objecturl' => 'Page url',
        'reportedcontent:reason' => 'Reason for report',
        'reportedcontent:description' => 'Why are you reporting this?',
        'reportedcontent:address' => 'Location of the item',

diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 044a40012f47e862b36eb1e95a8a8e25b2bcf8d5..b8c443450ce2a876333f6b1481033f8402ad95bd 100644 (file)
--- 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 b1e96f56c62dd861703083624b8c40db8c9c65b1..2eba964a1f45259be073fc6eb6dd49ca541f3b39 100644 (file)
--- 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;
 }