aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/messageboard/views/default/messageboard/js.php2
-rw-r--r--mod/messages/views/default/object/messages.php2
-rw-r--r--mod/thewire/views/default/thewire/css.php2
-rw-r--r--mod/tinymce/views/default/tinymce/css.php2
-rw-r--r--views/default/annotation/generic_comment.php2
-rw-r--r--views/default/annotation/likes.php2
-rw-r--r--views/default/css/ie.php2
-rw-r--r--views/default/css/ie6.php4
-rw-r--r--views/default/page/upgrade.php12
9 files changed, 14 insertions, 16 deletions
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index c63804408..22aad10b7 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -9,7 +9,7 @@ elgg.messageboard.init = function() {
// delegate() instead of live() because live() has to be at the top level of chains...can't use parent().
// delete is a little-known operator in JS. IE loses its mind if you name a method that.
- form.parent().delegate('.delete-button a', 'click', elgg.messageboard.deletePost);
+ form.parent().delegate('.elgg-button-delete a', 'click', elgg.messageboard.deletePost);
}
elgg.messageboard.submit = function(e) {
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index e000601f9..13b7ca35f 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -54,7 +54,7 @@ $subject_info .= elgg_view('output/url', array(
'text' => $message->title,
));
-$delete_link = "<span class='delete-button'>" . elgg_view("output/confirmlink", array(
+$delete_link = "<span class='elgg-button-delete'>" . elgg_view("output/confirmlink", array(
'href' => "action/messages/delete?guid=" . $message->getGUID(),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index c1c7b5bcb..4f5a12874 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -104,7 +104,7 @@ return true;
.wire_post_options .elgg-button-action.reply.small {
float:right;
}
-.wire_post_options .delete-button {
+.wire_post_options .elgg-button-delete {
position: absolute;
bottom:5px;
right:5px;
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 6980a67e0..69302bd48 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -4,6 +4,8 @@
*
* Overrides on the default TinyMCE skin
* Gives the textarea and buttons rounded corners
+ *
+ * @todo why the crazy long rules?
*/
?>
/* TinyMCE */
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 0cf89b6a7..f5408abbd 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -42,7 +42,7 @@ if ($full_view) {
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
));
- $delete_button = "<span class=\"delete-button\">$delete_button</span>";
+ $delete_button = "<span class=\"elgg-button-delete\">$delete_button</span>";
}
$comment_text = elgg_view("output/longtext", array("value" => $comment->value));
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 748d0b601..459afce61 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -32,7 +32,7 @@ if ($like->canEdit()) {
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
));
- $delete_button = "<span class=\"delete-button\">$delete_button</span>";
+ $delete_button = "<span class=\"elgg-button-delete\">$delete_button</span>";
}
$body = <<<HTML
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index e6b276c89..32e7a77aa 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -26,7 +26,7 @@
.likes-list {display:none;}
.likes-list-holder .likes-list {top:20px !important;} /* position likes list below link in IE to prevent clipping */
-.elgg-likes-user .entity-metadata .delete-button {float:none;}
+.elgg-likes-user .entity-metadata .elgg-button-delete {float:none;}
/* profile */
.elgg-tabs.profile .profile_name {margin-left: -260px;}
diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index d1fdb750c..f8ed208f6 100644
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -12,5 +12,5 @@
.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
/* @todo check this one */
-.delete-button a { background-position-y: 2px; }
-.delete-button a:hover { background-position-y: -14px; } \ No newline at end of file
+.elgg-button-delete a { background-position-y: 2px; }
+.elgg-button-delete a:hover { background-position-y: -14px; } \ No newline at end of file
diff --git a/views/default/page/upgrade.php b/views/default/page/upgrade.php
index b598c3c6a..9cbd45944 100644
--- a/views/default/page/upgrade.php
+++ b/views/default/page/upgrade.php
@@ -10,13 +10,9 @@
<title><?php echo elgg_echo('upgrading'); ?></title>
<meta http-equiv="refresh" content="1;url=<?php echo elgg_get_site_url(); ?>upgrade.php?upgrade=upgrade"/>
</head>
- <body bgcolor="white">
- <table width="100%" height="100%" border="0" style="margin: 0px; padding: 0px">
- <tr>
- <td width="100%" height="100%" valign="middle" align="center">
- <img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif" alt="upgrading" />
- </td>
- </tr>
- </table>
+ <body>
+ <div style="margin-top:200px">
+ <?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
+ </div>
</body>
</html> \ No newline at end of file