diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /views/default/annotation | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'views/default/annotation')
| -rw-r--r-- | views/default/annotation/default.php | 2 | ||||
| -rw-r--r-- | views/default/annotation/generic_comment.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index 0e626ad9a..5d29a53e2 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -19,7 +19,7 @@ $owner_link = "<a href=\"{$owner->getURL()}\">$owner->name</a>"; $menu = elgg_view_menu('annotation', array( 'annotation' => $annotation, 'sort_by' => 'priority', - 'class' => 'elgg-menu-hz right', + 'class' => 'elgg-menu-hz float-alt', )); $text = elgg_view("output/longtext", array("value" => $annotation->value)); diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index a4fbf904e..9891510e0 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -2,8 +2,8 @@ /** * Elgg generic comment view * - * @uses $vars['annotation'] ElggAnnotation object - * @uses $vars['full_view'] Display fill view or brief view + * @uses $vars['annotation'] ElggAnnotation object + * @uses $vars['full_view'] Display fill view or brief view */ if (!isset($vars['annotation'])) { @@ -32,7 +32,7 @@ if ($full_view) { $menu = elgg_view_menu('annotation', array( 'annotation' => $comment, 'sort_by' => 'priority', - 'class' => 'elgg-menu-hz right', + 'class' => 'elgg-menu-hz float-alt', )); $comment_text = elgg_view("output/longtext", array("value" => $comment->value)); |