diff options
| -rw-r--r-- | services/export/handler.php | 2 | ||||
| -rw-r--r-- | views/default/export/entity.php | 45 | ||||
| -rw-r--r-- | views/default/export/metadata.php | 6 | ||||
| -rw-r--r-- | views/default/export/relationship.php | 17 |
4 files changed, 26 insertions, 44 deletions
diff --git a/services/export/handler.php b/services/export/handler.php index 4c5391ed2..f68ecbfa9 100644 --- a/services/export/handler.php +++ b/services/export/handler.php @@ -110,4 +110,4 @@ else { throw new InvalidParameterException(elgg_echo('InvalidParameterException:MissingParameter')); } -page_draw($title, elgg_view_layout('one_column',elgg_view_title($title) . $body));
\ No newline at end of file +page_draw($title, elgg_view_layout('one_column_with_sidebar', elgg_view_title($title) . $body));
\ No newline at end of file diff --git a/views/default/export/entity.php b/views/default/export/entity.php index 0bbc9d079..12e34335e 100644 --- a/views/default/export/entity.php +++ b/views/default/export/entity.php @@ -20,16 +20,13 @@ $relationships = get_entity_relationships($entity->guid); $exportable_values = $entity->getExportableValues(); ?> -<div class="contentWrapper"> <div> +<h2><?php echo elgg_echo('Entity'); ?></h2> <?php - foreach ($entity as $k => $v) - { + foreach ($entity as $k => $v) { if ((in_array($k, $exportable_values)) || (isadminloggedin())) { ?> - <div> - <p><b><?php echo $k; ?>: </b><?php echo $v; ?></p> - </div> + <p class="margin_none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p> <?php } } @@ -37,15 +34,12 @@ $exportable_values = $entity->getExportableValues(); </div> <?php if ($metadata) { ?> -<div id="metadata"> +<div id="metadata" class="margin_top"> <h2><?php echo elgg_echo('metadata'); ?></h2> <?php - foreach ($metadata as $m) - { + foreach ($metadata as $m) { ?> - <div> - <p><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p> - </div> + <p class="margin_none"><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p> <?php } ?> @@ -54,17 +48,14 @@ $exportable_values = $entity->getExportableValues(); <?php } ?> <?php if ($annotations) { ?> -<div id="annotations"> +<div id="annotations" class="margin_top"> <h2><?php echo elgg_echo('annotations'); ?></h2> <?php - foreach ($annotations as $a) - { + foreach ($annotations as $a) { ?> - <div> - <table> - <p><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p> - </table> - </div> + <table> + <p class="margin_none"><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p> + </table> <?php } ?> @@ -72,20 +63,16 @@ $exportable_values = $entity->getExportableValues(); <?php } ?> <?php if ($relationships) { ?> -<div id="relationship"> +<div id="relationship" class="margin_top"> <h2><?php echo elgg_echo('relationships'); ?></h2> <?php - foreach ($relationships as $r) - { + foreach ($relationships as $r) { ?> - <div> - <table> - <p><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p> - </table> - </div> + <table> + <p class="margin_none"><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p> + </table> <?php } ?> </div> <?php } ?> -</div>
\ No newline at end of file diff --git a/views/default/export/metadata.php b/views/default/export/metadata.php index 32a2fc8ed..61da01f31 100644 --- a/views/default/export/metadata.php +++ b/views/default/export/metadata.php @@ -12,7 +12,5 @@ $m = $vars['metadata']; $e = get_entity($m->entity_guid); ?> -<div> - <p><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid; - ?>: <b><?php echo $m->name; ?></b> <?php echo $m->value; ?></p> -</div>
\ No newline at end of file +<p class="margin_none"><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid; +?>: <b><?php echo $m->name; ?></b> <?php echo $m->value; ?></p>
\ No newline at end of file diff --git a/views/default/export/relationship.php b/views/default/export/relationship.php index ec6a94bd4..3e92625c5 100644 --- a/views/default/export/relationship.php +++ b/views/default/export/relationship.php @@ -13,14 +13,11 @@ $r = $vars['relationship']; $e1 = get_entity($r->guid_one); $e2 = get_entity($r->guid_two); - ?> -<div> - <p><?php - if ($e1) echo "<a href=\"" . $e1->getURL() . "\">GUID:" . $r->guid_one . "</a>"; else echo "GUID:".$r->guid_one; - ?> - <b><?php echo $r->relationship; ?></b> - <?php - if ($e2) echo "<a href=\"" . $e2->getURL() . "\">GUID:" . $r->guid_two . "</a>"; else echo "GUID:".$r->guid_two; - ?></p> -</div>
\ No newline at end of file +<p class="margin_none"><?php + if ($e1) echo "<a href=\"" . $e1->getURL() . "\">GUID:" . $r->guid_one . "</a>"; else echo "GUID:".$r->guid_one; +?> +<b><?php echo $r->relationship; ?></b> +<?php + if ($e2) echo "<a href=\"" . $e2->getURL() . "\">GUID:" . $r->guid_two . "</a>"; else echo "GUID:".$r->guid_two; +?></p> |