aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-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
5 files changed, 9 insertions, 13 deletions
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