aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/appearance/menu_items.php2
-rw-r--r--views/default/admin/appearance/profile_fields.php2
-rw-r--r--views/default/admin/plugin_settings.php2
-rw-r--r--views/default/admin/plugins.php3
-rw-r--r--views/default/admin/settings/advanced.php2
-rw-r--r--views/default/admin/settings/basic.php2
-rw-r--r--views/default/css/admin.php2
-rw-r--r--views/default/css/elements/forms.php2
-rw-r--r--views/default/forms/login.php6
-rw-r--r--views/default/object/elements/full.php10
-rw-r--r--views/default/output/text.php3
-rw-r--r--views/rss/annotation/generic_comment.php2
-rw-r--r--views/rss/group/default.php2
-rw-r--r--views/rss/object/default.php6
-rw-r--r--views/rss/user/default.php2
15 files changed, 21 insertions, 27 deletions
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 4e35e032f..1d5c95cf9 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -7,4 +7,4 @@
*/
-echo elgg_view_form('admin/menu/save');
+echo elgg_view_form('admin/menu/save', array('class' => 'elgg-form-settings'));
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 8371ce83c..91d14b874 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -3,7 +3,7 @@
* Admin area: edit default profile fields
*/
-$add = elgg_view_form('profile/fields/add', array(), array());
+$add = elgg_view_form('profile/fields/add', array('class' => 'elgg-form-settings'), array());
$list = elgg_view('admin/appearance/profile_fields/list');
$reset = elgg_view_form('profile/fields/reset', array(), array());
diff --git a/views/default/admin/plugin_settings.php b/views/default/admin/plugin_settings.php
index c75492270..1c6e9e206 100644
--- a/views/default/admin/plugin_settings.php
+++ b/views/default/admin/plugin_settings.php
@@ -19,7 +19,7 @@ $settings = false;
if (elgg_view_exists("settings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/settings")) {
$title = $plugin->getManifest()->getName();
- $params = array('id' => "$plugin_id-settings");
+ $params = array('id' => "$plugin_id-settings", 'class' => 'elgg-form-settings');
$body = elgg_view_form("plugins/settings/save", $params, $vars);
echo elgg_view_module('info', $title, $body);
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index 5bd0dd55d..c3e7e3ab0 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -22,7 +22,8 @@ foreach ($installed_plugins as $id => $plugin) {
if (!$plugin->isValid()) {
if ($plugin->isActive()) {
// force disable and warn
- register_error(elgg_echo('ElggPlugin:InvalidAndDeactivated', array($plugin->getId())));
+ elgg_add_admin_notice('invalid_and_deactivated_' . $plugin->getID(),
+ elgg_echo('ElggPlugin:InvalidAndDeactivated', array($plugin->getId())));
$plugin->deactivate();
}
continue;
diff --git a/views/default/admin/settings/advanced.php b/views/default/admin/settings/advanced.php
index 12e4303e7..a262740f2 100644
--- a/views/default/admin/settings/advanced.php
+++ b/views/default/admin/settings/advanced.php
@@ -6,4 +6,4 @@
* @subpackage Core
*/
-echo elgg_view_form('admin/site/update_advanced');
+echo elgg_view_form('admin/site/update_advanced', array('class' => 'elgg-form-settings'));
diff --git a/views/default/admin/settings/basic.php b/views/default/admin/settings/basic.php
index 3b8f4f183..9334ba81b 100644
--- a/views/default/admin/settings/basic.php
+++ b/views/default/admin/settings/basic.php
@@ -6,4 +6,4 @@
* @subpackage Core
*/
-echo elgg_view_form('admin/site/update_basic');
+echo elgg_view_form('admin/site/update_basic', array('class' => 'elgg-form-settings'));
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 73996a199..160a2a3e4 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -512,7 +512,7 @@ a.elgg-button {
}
.elgg-form-settings {
- max-width: 600px;
+ max-width: 800px;
}
/* **************************************
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index d14c341a7..e358c86e7 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -72,7 +72,7 @@ input[type="radio"] {
width:auto;
}
.elgg-input-checkboxes.elgg-horizontal li,
-.elgg-input-radio.elgg-horizontal li {
+.elgg-input-radios.elgg-horizontal li {
display: inline;
padding-right: 10px;
}
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 670731883..9536bb439 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -23,13 +23,13 @@
<?php echo elgg_view('login/extend'); ?>
<div class="elgg-foot">
- <?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
-
- <label class="right mtm">
+ <label class="mtm float-alt">
<input type="checkbox" name="persistent" value="true" />
<?php echo elgg_echo('user:persistent'); ?>
</label>
+ <?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
+
<?php
if ($vars['returntoreferer']) {
echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
diff --git a/views/default/object/elements/full.php b/views/default/object/elements/full.php
index 4a2991442..9b89f9706 100644
--- a/views/default/object/elements/full.php
+++ b/views/default/object/elements/full.php
@@ -2,8 +2,7 @@
/**
* Object full rendering
*
- * Sample output
- * <h2>Title</h3>
+ * Sample output:
* <div class="elgg-content">
* <div class="elgg-image-block">
* </div>
@@ -12,14 +11,12 @@
* </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);
@@ -30,14 +27,9 @@ if ($class) {
$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
diff --git a/views/default/output/text.php b/views/default/output/text.php
index 2c9242c1d..5cbfc35b0 100644
--- a/views/default/output/text.php
+++ b/views/default/output/text.php
@@ -6,8 +6,7 @@
* @package Elgg
* @subpackage Core
*
- * @uses $vars['text'] The text to display
- *
+ * @uses $vars['value'] The text to display
*/
echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false); \ No newline at end of file
diff --git a/views/rss/annotation/generic_comment.php b/views/rss/annotation/generic_comment.php
index 9e9107568..de652fc8e 100644
--- a/views/rss/annotation/generic_comment.php
+++ b/views/rss/annotation/generic_comment.php
@@ -16,7 +16,7 @@ $permalink = $annotation->getURL();
$title = elgg_echo('generic_comment:title', array($poster_name));
$creator = elgg_view('page/components/creator', array('entity' => $annotation));
-$extensions = elgg_view('extensions/item');
+$extensions = elgg_view('extensions/item', $vars);
$item = <<<__HTML
<item>
diff --git a/views/rss/group/default.php b/views/rss/group/default.php
index 1276ab8f1..f57c7f82c 100644
--- a/views/rss/group/default.php
+++ b/views/rss/group/default.php
@@ -20,7 +20,7 @@ if ($vars['entity']->description) {
$creator = elgg_view('page/components/creator', $vars);
$georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
$item = <<<__HTML
<item>
diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index b5d269ac7..be8025953 100644
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -15,9 +15,11 @@ if (empty($title)) {
$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
$pubdate = date('r', $vars['entity']->getTimeCreated());
+$description = autop($vars['entity']->description);
+
$creator = elgg_view('page/components/creator', $vars);
$georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
$item = <<<__HTML
<item>
@@ -25,7 +27,7 @@ $item = <<<__HTML
<pubDate>$pubdate</pubDate>
<link>$permalink</link>
<title><![CDATA[$title]]></title>
- <description><![CDATA[{$vars['entity']->description}]]></description>
+ <description><![CDATA[$description]]></description>
$creator$georss$extension
</item>
diff --git a/views/rss/user/default.php b/views/rss/user/default.php
index 1500881f8..1c7bf75e7 100644
--- a/views/rss/user/default.php
+++ b/views/rss/user/default.php
@@ -17,7 +17,7 @@ if ($vars['entity']->description) {
}
$georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
$item = <<<__HTML
<item>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 10:38:32 +0000