From c66831fa5138a277a9729174caf14c7eb323fb07 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 20:26:12 +0000 Subject: Standardizing views.` git-svn-id: http://code.elgg.org/elgg/trunk@3555 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/object/default.php | 112 ++++++++++++++++++++------------------- views/default/object/object.php | 20 +++---- views/default/object/plugin.php | 29 +++++----- views/default/object/widget.php | 25 ++++----- 4 files changed, 91 insertions(+), 95 deletions(-) (limited to 'views/default/object') diff --git a/views/default/object/default.php b/views/default/object/default.php index 10ac062d1..3ace73d7f 100644 --- a/views/default/object/default.php +++ b/views/default/object/default.php @@ -1,57 +1,59 @@ $vars['entity'], - 'size' => 'small', - ) - ); - - - $title = $vars['entity']->title; - if (!$title) $title = $vars['entity']->name; - if (!$title) $title = get_class($vars['entity']); - - $controls = ""; - if ($vars['entity']->canEdit()) - { - $controls .= " (guid}\">" . elgg_echo('delete') . ")"; - } - - $info = "

getUrl() . "\">" . $title . " $controls

"; - - if (get_input('search_viewtype') == "gallery") { - - $icon = ""; - - } - - $owner = $vars['entity']->getOwnerEntity(); - $ownertxt = elgg_echo('unknown'); - if ($owner) - $ownertxt = "getURL() . "\">" . $owner->name .""; - - $info .= "
".sprintf(elgg_echo("entity:default:strapline"), - friendly_time($vars['entity']->time_created), - $ownertxt - ); - - $info .= "
"; - - $info = "$info"; - $icon = "$icon"; - - echo elgg_view_listing($icon, $info); +/** + * ElggEntity default view. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +if ($vars['full']) { + echo elgg_view('export/entity', $vars); +} else { + + $icon = elgg_view( + 'graphics/icon', array( + 'entity' => $vars['entity'], + 'size' => 'small', + ) + ); + + + $title = $vars['entity']->title; + if (!$title) { + $title = $vars['entity']->name; + } + if (!$title) { + $title = get_class($vars['entity']); + } + + $controls = ""; + if ($vars['entity']->canEdit()) { + $controls .= " (guid}\">" . elgg_echo('delete') . ")"; + } + + $info = "

getUrl() . "\">" . $title . " $controls

"; + + if (get_input('search_viewtype') == "gallery") { + $icon = ""; + } + + $owner = $vars['entity']->getOwnerEntity(); + $ownertxt = elgg_echo('unknown'); + if ($owner) { + $ownertxt = "getURL() . "\">" . $owner->name .""; } + + $info .= "
".sprintf(elgg_echo("entity:default:strapline"), + friendly_time($vars['entity']->time_created), + $ownertxt + ); + + $info .= "
"; + + $info = "$info"; + $icon = "$icon"; + + echo elgg_view_listing($icon, $info); +} \ No newline at end of file diff --git a/views/default/object/object.php b/views/default/object/object.php index a27a2910f..2be9e1fa1 100644 --- a/views/default/object/object.php +++ b/views/default/object/object.php @@ -1,15 +1,15 @@
diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php index 5f9c5354c..411a9f8d8 100644 --- a/views/default/object/plugin.php +++ b/views/default/object/plugin.php @@ -1,20 +1,19 @@ " . elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin)) . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "

"; - +$entity = $vars['entity']; +$plugin = $vars['plugin']; +$prefix = $vars['prefix']; // Do we want to show admin settings (default) or user settings + +$form_body = elgg_view("{$prefix}settings/{$plugin}/edit", $vars); +$form_body .= "

" . elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin)) . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "

"; ?>
diff --git a/views/default/object/widget.php b/views/default/object/widget.php index b49120e2e..9dd2999ce 100644 --- a/views/default/object/widget.php +++ b/views/default/object/widget.php @@ -1,16 +1,11 @@ \ No newline at end of file +/** + * Elgg default widget view + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ + +echo elgg_view('widgets/wrapper',$vars); -- cgit v1.2.3