aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/appearance/profile_fields.php12
-rw-r--r--views/default/annotation/generic_comment.php4
-rw-r--r--views/default/css/admin.php4
-rw-r--r--views/default/css/elements/forms.php4
-rw-r--r--views/default/css/elements/layout.php2
-rw-r--r--views/default/css/elements/modules.php2
-rw-r--r--views/default/css/elements/navigation.php5
-rw-r--r--views/default/css/elements/typography.php6
-rw-r--r--views/default/css/ie7.php12
-rw-r--r--views/default/forms/profile/fields/reset.php12
-rw-r--r--views/default/icon/default.php30
-rw-r--r--views/default/input/pulldown.php2
-rw-r--r--views/default/js/elgg.php3
-rw-r--r--views/default/output/tag.php1
-rw-r--r--views/default/output/tagcloud.php2
-rw-r--r--views/default/output/tags.php1
16 files changed, 70 insertions, 32 deletions
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 91d14b874..f1d78c19f 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -5,12 +5,20 @@
$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());
+
+$reset = elgg_view('output/confirmlink', array(
+ 'text' => elgg_echo('reset'),
+ 'href' => 'action/profile/fields/reset',
+ 'title' => elgg_echo('profile:resetdefault'),
+ 'confirm' => elgg_echo('profile:resetdefault:confirm'),
+ 'class' => 'elgg-button elgg-button-cancel',
+ 'is_trusted' => 'true',
+));
$body = <<<__HTML
$add
$list
-$reset
+<div class="mtl">$reset</div>
__HTML;
echo $body;
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 9891510e0..22a8d9211 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -55,13 +55,13 @@ HTML;
//@todo need link to actual comment!
- $on = elgg_echo('on');
+ $commented_on = elgg_echo('generic_comment:on', array($commenter_link, $entity_link));
$excerpt = elgg_get_excerpt($comment->value, 80);
$body = <<<HTML
<span class="elgg-subtext">
- $commenter_link $on $entity_link ($friendlytime): $excerpt
+ $commented_on ($friendlytime): $excerpt
</span>
HTML;
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 059e51dd6..ceeac71a2 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -624,6 +624,10 @@ a.elgg-button {
text-decoration: none;
color: #4690D6;
}
+.ui-autocomplete a.ui-state-hover {
+ background-color: #eee;
+ display: block;
+}
/* ***************************************
USER PICKER
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 2fc156447..f55e57fb4 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -267,6 +267,10 @@ input[type="radio"] {
text-decoration: none;
color: #4690D6;
}
+.ui-autocomplete a.ui-state-hover {
+ background-color: #eee;
+ display: block;
+}
/* ***************************************
USER PICKER
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 25a2bffb7..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -118,4 +118,4 @@
}
.elgg-page-footer a:hover {
color: #666;
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 74092c774..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -191,4 +191,4 @@ a.elgg-widget-collapsed:before {
.elgg-widget-placeholder {
border: 2px dashed #dedede;
margin-bottom: 15px;
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 62f370069..49e36e494 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,7 +16,7 @@
text-align: center;
}
.elgg-pagination li {
- display: inline;
+ display: inline-block;
margin: 0 6px 0 0;
text-align: center;
}
@@ -24,7 +24,8 @@
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-
+
+ display: block;
padding: 2px 6px;
color: #4690d6;
border: 1px solid #4690d6;
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 4c2c3c774..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -157,6 +157,6 @@ h6 { font-size: 0.8em; }
padding: 3px 5px;
}
.elgg-output img {
- max-width: 100%;
- height: auto;
-} \ No newline at end of file
+ max-width: 100%;
+ height: auto;
+}
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index db0125b4b..90274797d 100644
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -24,6 +24,7 @@
.elgg-menu-footer > li > a,
.elgg-menu-footer li,
.elgg-menu-general > li > a,
+.elgg-pagination li,
.elgg-menu-general li {
display: inline;
}
@@ -62,4 +63,13 @@
.elgg-module-walledgarden > .elgg-head,
.elgg-module-walledgarden > .elgg-foot {
width: 530px;
-} \ No newline at end of file
+}
+
+input, textarea {
+ width: 98%;
+}
+
+.elgg-tag a {
+ /* IE7 had a weird wrapping issue for tags */
+ word-wrap: normal;
+}
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
deleted file mode 100644
index c0bb1b7f4..000000000
--- a/views/default/forms/profile/fields/reset.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Reset profile fields form
- */
-
-echo '<div class="elgg-foot">';
-$params = array(
- 'value' => elgg_echo('profile:resetdefault'),
- 'class' => 'elgg-button-cancel',
-);
-echo elgg_view('input/submit', $params);
-echo '</div>';
diff --git a/views/default/icon/default.php b/views/default/icon/default.php
index 087c7eae9..7f13a1189 100644
--- a/views/default/icon/default.php
+++ b/views/default/icon/default.php
@@ -37,13 +37,31 @@ if (isset($vars['href'])) {
$icon_sizes = elgg_get_config('icon_sizes');
$size = $vars['size'];
-$img = elgg_view('output/img', array(
+if (!isset($vars['width'])) {
+ $vars['width'] = $size != 'master' ? $icon_sizes[$size]['w'] : null;
+}
+if (!isset($vars['height'])) {
+ $vars['height'] = $size != 'master' ? $icon_sizes[$size]['h'] : null;
+}
+
+$img_params = array(
'src' => $entity->getIconURL($vars['size']),
- 'alt' => $title,
- 'class' => $class,
- 'width' => $size != 'master' ? $icon_sizes[$size]['w'] : NULL,
- 'height' => $size != 'master' ? $icon_sizes[$size]['h'] : NULL,
-));
+ 'alt' => $title,
+);
+
+if (!empty($class)) {
+ $img_params['class'] = $class;
+}
+
+if (!empty($vars['width'])) {
+ $img_params['width'] = $vars['width'];
+}
+
+if (!empty($vars['height'])) {
+ $img_params['height'] = $vars['height'];
+}
+
+$img = elgg_view('output/img', $img_params);
if ($url) {
$params = array(
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 705329691..fc0595300 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -5,5 +5,5 @@
* @deprecated 1.8
*/
-elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8);
+elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8, 2);
echo elgg_view('input/dropdown', $vars);
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index b82d98ce4..6fe03484d 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -56,7 +56,8 @@ if (0) { ?><script><?php }
elgg.version = '<?php echo get_version(); ?>';
elgg.release = '<?php echo get_version(true); ?>';
elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
elgg.config.domReady = false;
elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
elgg.config.languageReady = false;
diff --git a/views/default/output/tag.php b/views/default/output/tag.php
index 3c002a31b..3e1f1c320 100644
--- a/views/default/output/tag.php
+++ b/views/default/output/tag.php
@@ -20,6 +20,7 @@ if (!empty($vars['object'])) {
}
if (isset($vars['value'])) {
+ $vars['value'] = htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false);
if (!empty($vars['type'])) {
$type = "&type={$vars['type']}";
} else {
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index a212becd8..2fbf1cd0a 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -39,6 +39,8 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
$cloud = '';
foreach ($vars['tagcloud'] as $tag) {
+ $tag->tag = htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8', false);
+
if ($cloud != '') {
$cloud .= ', ';
}
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 3082dd41e..41fd5f168 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -55,6 +55,7 @@ if (!empty($vars['tags'])) {
$list_items = '<li>' . elgg_view_icon('tag', $icon_class) . '</li>';
foreach($vars['tags'] as $tag) {
+ $tag = htmlspecialchars($tag, ENT_QUOTES, 'UTF-8', false);
if (!empty($vars['type'])) {
$type = "&type={$vars['type']}";
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-04 11:47:33 +0000