aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/appearance/profile_fields/list.php2
-rw-r--r--views/default/css/walled_garden.php4
-rw-r--r--views/default/forms/profile/fields/add.php4
-rw-r--r--views/default/object/elements/full.php45
-rw-r--r--views/default/object/elements/summary.php3
-rw-r--r--views/default/page/walled_garden.php1
-rw-r--r--views/failsafe/messages/exceptions/exception.php4
-rw-r--r--views/failsafe/page/default.php6
-rw-r--r--views/foaf/page/default.php4
-rw-r--r--views/foaf/search/entity_list.php13
-rw-r--r--views/foaf/user/default.php3
-rw-r--r--views/ical/export/entity.php36
-rw-r--r--views/ical/object/default.php2
-rw-r--r--views/ical/page/default.php5
-rw-r--r--views/ical/search/entity_list.php13
15 files changed, 87 insertions, 58 deletions
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 3e287ceac..b9440a95d 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -26,7 +26,7 @@ if ($fieldlist) {
}
}
?>
-<ul id="elgg-profile-fields">
+<ul id="elgg-profile-fields" class="mvm">
<?php
$save = elgg_echo('save');
diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index 75bf0f29e..47850425b 100644
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -28,6 +28,10 @@ $url = elgg_get_site_url();
margin: 35px 15px 15px 35px;
}
+#elgg-walledgarden-intro ul {
+ float: left;
+}
+
#elgg-walledgarden-login {
width: 230px;
float: left;
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index bd58ae381..1ea9c57a9 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -20,8 +20,8 @@ $type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_val
$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
$formbody = <<< END
- <div class="elgg-foot">$label_text: $label_control
- $type_text: $type_control
+ <div>$label_text: $label_control</div>
+ <div class="elgg-foot">$type_text: $type_control
$submit_control</div>
END;
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
new file mode 100644
index 000000000..4a2991442
--- /dev/null
+++ b/views/default/object/elements/full.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Object full rendering
+ *
+ * Sample output
+ * <h2>Title</h3>
+ * <div class="elgg-content">
+ * <div class="elgg-image-block">
+ * </div>
+ * <div class="elgg-output">
+ * </div>
+ * </div>
+ *
+ * @uses $vars['entity'] ElggEntity
+ * @uses $vars['title'] Title (false for no title)
+ * @uses $vars['icon'] HTML for the content icon
+ * @uses $vars['summary'] HTML for the content summary
+ * @uses $vars['body'] HTML for the content body
+ * @uses $vars['class'] Optional additional class for the content wrapper
+ */
+
+$title = elgg_extract('title', $vars);
+$icon = elgg_extract('icon', $vars);
+$summary = elgg_extract('summary', $vars);
+$body = elgg_extract('body', $vars);
+$class = elgg_extract('class', $vars);
+if ($class) {
+ $class = "elgg-content $class";
+} else {
+ $class = "elgg-content";
+}
+
+if ($title) {
+ $title = elgg_view_title($title);
+}
+
+$header = elgg_view_image_block($icon, $summary);
+
+echo <<<HTML
+$title
+<div class="$class">
+$header
+$body
+</div>
+HTML;
diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 3ca4de2be..8d82bc52a 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -49,6 +49,9 @@ if ($metadata) {
echo "<h3>$title_link</h3>";
echo "<div class=\"elgg-subtext\">$subtitle</div>";
echo $tags;
+
+echo elgg_view('object/summary/extend', $vars);
+
if ($content) {
echo "<div class=\"elgg-content\">$content</div>";
}
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 95d17fcff..62d8bb077 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -31,6 +31,7 @@ $title = $site->name;
echo $title;
?>
</h1>
+ <?php echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); ?>
</div>
<div id="elgg-walledgarden-login">
<?php echo $vars['body']; ?>
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index 9fa7dc2a4..c35d80c87 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -11,7 +11,7 @@
?>
-<p class="messages_exception">
+<p class="elgg-messages-exception">
<span title="<?php echo get_class($vars['object']); ?>">
<?php
@@ -26,7 +26,7 @@
if (elgg_get_config('debug')) {
?>
-<p class="messages_exception">
+<p class="elgg-messages-exception">
<?php
echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
diff --git a/views/failsafe/page/default.php b/views/failsafe/page/default.php
index 0ce63cc1d..6d628ebbb 100644
--- a/views/failsafe/page/default.php
+++ b/views/failsafe/page/default.php
@@ -33,7 +33,7 @@ header('Content-type: text/html; charset=utf-8');
p {
margin: 0px 0px 15px 0;
}
- #wrapper {
+ #elgg-wrapper {
background:white;
width:570px;
margin:auto;
@@ -43,7 +43,7 @@ header('Content-type: text/html; charset=utf-8');
border-right: 1px solid #666666;
border-bottom: 1px solid #666666;
}
- .messages_exception {
+ .elgg-messages-exception {
background:#FDFFC3;
display:block;
padding:10px;
@@ -52,7 +52,7 @@ header('Content-type: text/html; charset=utf-8');
</head>
<body>
- <div id="wrapper">
+ <div id="elgg-wrapper">
<h1><?php echo $vars['title']; ?></h1>
<?php echo $vars['body']; ?>
</div>
diff --git a/views/foaf/page/default.php b/views/foaf/page/default.php
index 7dac2a0aa..fad46ed35 100644
--- a/views/foaf/page/default.php
+++ b/views/foaf/page/default.php
@@ -42,8 +42,6 @@ if (!$owner = elgg_get_page_owner_entity()) {
<foaf:name><?php echo $owner->name; ?></foaf:name>
<foaf:homepage rdf:resource="<?php echo $owner->getURL(); ?>" />
<foaf:depiction rdf:resource="<?php echo elgg_format_url($owner->getIconURL('large')); ?>" />
- <?php
- echo $vars['body'];
- ?>
+<?php echo $vars['body']; ?>
</foaf:Person>
</rdf:RDF>
diff --git a/views/foaf/search/entity_list.php b/views/foaf/search/entity_list.php
deleted file mode 100644
index b786865d7..000000000
--- a/views/foaf/search/entity_list.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- echo elgg_view_entity($entity);
- }
-} \ No newline at end of file
diff --git a/views/foaf/user/default.php b/views/foaf/user/default.php
index 8d059bc6b..dcba55562 100644
--- a/views/foaf/user/default.php
+++ b/views/foaf/user/default.php
@@ -6,7 +6,8 @@
* @subpackage Core
*/
-$friends=get_user_friends(elgg_get_page_owner_guid(), $subtype = "", $limit = 10000, $offset = 0);
+// @todo update when get_user_friends is deprecated in 1.9
+$friends = get_user_friends(elgg_get_page_owner_guid(), $subtype = "", $limit = 10000, $offset = 0);
foreach ($friends as $friend) {
?>
diff --git a/views/ical/export/entity.php b/views/ical/export/entity.php
index caa60c7a5..eaa3b56d8 100644
--- a/views/ical/export/entity.php
+++ b/views/ical/export/entity.php
@@ -9,23 +9,25 @@
$entity = $vars['entity'];
-if (
- ($entity instanceof Notable) &&
- ($entity->getCalendarStartTime()) &&
- ($entity->getCalendarEndTime())
-)
-{
-?>
+if ($entity instanceof Notable &&
+ $entity->getCalendarStartTime() &&
+ $entity->getCalendarEndTime()) {
+
+ $timestamp = date("Ymd\THis\Z", $entity->getTimeCreated());
+ $start = date("Ymd\THis\Z", $entity->getCalendarStartTime());
+ $end = date("Ymd\THis\Z", $entity->getCalendarEndTime());
+ $summary = $entity->title;
+ $modified = date("Ymd\THis\Z", $entity->getTimeUpdated());
+
+ echo <<< ICAL
BEGIN:VEVENT
-DTSTAMP:<?php echo date("Ymd\THis\Z", $entity->getTimeCreated()); ?>
-DTSTART:<?php echo date("Ymd\THis\Z", $entity->getCalendarStartTime()); ?>
-DTEND:<?php echo date("Ymd\THis\Z", $entity->getCalendarEndTime()); ?>
-SUMMARY:<?php echo $event->title; ?>
-LAST-MODIFIED:<?php echo date("Ymd\THis\Z", $entity->getTimeUpdated()); ?>
+DTSTAMP:$timestamp
+DTSTART:$start
+DTEND:$end
+SUMMARY:$summary
+LAST-MODIFIED:$modified
END:VEVENT
-<?php
-}
-?>
- if (
- ) \ No newline at end of file
+ICAL;
+
+}
diff --git a/views/ical/object/default.php b/views/ical/object/default.php
index 678676133..77183bb8a 100644
--- a/views/ical/object/default.php
+++ b/views/ical/object/default.php
@@ -7,4 +7,4 @@
*
*/
-elgg_view('export/entity', $vars); \ No newline at end of file
+echo elgg_view('export/entity', $vars); \ No newline at end of file
diff --git a/views/ical/page/default.php b/views/ical/page/default.php
index 9a529b24f..01bd9e86e 100644
--- a/views/ical/page/default.php
+++ b/views/ical/page/default.php
@@ -7,12 +7,13 @@
*
*/
+$site = elgg_get_site_entity();
+
header("Content-Type: text/calendar");
-echo $vars['body'];
?>
BEGIN:VCALENDAR
VERSION:2.0
-PRODID:-//Curverider Ltd//NONSGML Elgg <?php echo get_version(true); ?>//EN
+PRODID:-//Elgg//NONSGML <?php echo $site->name; ?>//EN
<?php echo $vars['body']; ?>
END:VCALENDAR
diff --git a/views/ical/search/entity_list.php b/views/ical/search/entity_list.php
deleted file mode 100644
index 38c19fbb7..000000000
--- a/views/ical/search/entity_list.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity)
- echo elgg_view_entity($entity);
-} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 06:21:31 +0000