aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 01:38:24 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 01:38:24 +0000
commite530f743a69be44b249553ef63f133d4441c013f (patch)
tree786f0c6a5666641224ea228b13334dc4a319f10c
parent73b245e234a33cb4fb530e20bc861dd278e3075c (diff)
downloadelgg-e530f743a69be44b249553ef63f133d4441c013f.tar.gz
elgg-e530f743a69be44b249553ef63f133d4441c013f.tar.bz2
Refs #2895: .elgg-list-metadata => .elgg-menu-metadata. Still not using menu system yet, though
git-svn-id: http://code.elgg.org/elgg/trunk@8487 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/groups/views/default/group/default.php2
-rw-r--r--mod/thewire/views/default/thewire/metadata.php2
-rw-r--r--views/default/css/admin.php10
-rw-r--r--views/default/css/elements/components.php13
-rw-r--r--views/default/css/elements/navigation.php16
-rw-r--r--views/default/navigation/menu/metadata.php2
-rw-r--r--views/default/object/plugin/advanced.php2
-rw-r--r--views/default/page/components/list/body.php2
-rw-r--r--views/default/user/default.php4
9 files changed, 29 insertions, 24 deletions
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 33dd1cb98..77b17402b 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -21,7 +21,7 @@ if ($membership == ACCESS_PUBLIC) {
$num_members = get_group_members($group->guid, 10, 0, 0, true);
$members_string = elgg_echo('groups:member');
-$metadata = "<ul class=\"elgg-list-metadata\"><li>$mem</li>";
+$metadata = "<ul class=\"elgg-menu elgg-menu-metadata\"><li>$mem</li>";
$metadata .= "<li>$num_members $members_string</li>";
// feature link
diff --git a/mod/thewire/views/default/thewire/metadata.php b/mod/thewire/views/default/thewire/metadata.php
index 0ae7cb0a0..6d871b05f 100644
--- a/mod/thewire/views/default/thewire/metadata.php
+++ b/mod/thewire/views/default/thewire/metadata.php
@@ -7,7 +7,7 @@ $entity = $vars['entity'];
$handler = elgg_extract('handler', $vars, '');
?>
-<ul class="elgg-list-metadata">
+<ul class="elgg-menu elgg-menu-metadata">
<?php
if (elgg_is_logged_in()) {
echo '<li>';
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 487e01165..acb5a384d 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -372,16 +372,16 @@ table.mceLayout {
.elgg-list-item {
margin: 3px;
}
-.elgg-list-metadata {
+.elgg-menu-metadata {
float: right;
margin-left: 15px;
font-size: 90%;
}
-.elgg-list-metadata > li {
+.elgg-menu-metadata > li {
float: left;
margin-left: 15px;
}
-.elgg-list-metadata, .elgg-list-metadata a {
+.elgg-menu-metadata, .elgg-menu-metadata a {
color: #aaaaaa;
}
.elgg-simple-list li {
@@ -1259,13 +1259,13 @@ ul.admin_plugins {
}
-.elgg-list-metadata {
+.elgg-menu-metadata {
list-style-type: none;
float: right;
margin-left: 15px;
font-size: 90%;
}
-.elgg-list-metadata > li {
+.elgg-menu-metadata > li {
float: left;
margin-left: 15px;
}
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 50eff516f..b51c15f21 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -63,18 +63,7 @@
.elgg-list > li {
border-bottom: 1px dotted #CCCCCC;
}
-.elgg-list-metadata {
- float: right;
- margin-left: 15px;
- font-size: 90%;
-}
-.elgg-list-metadata > li {
- float: left;
- margin-left: 15px;
-}
-.elgg-list-metadata, .elgg-list-metadata a {
- color: #aaaaaa;
-}
+
.elgg-list-item .elgg-subtext {
margin-bottom: 5px;
}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 7a4759f96..39eb19ec2 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -330,4 +330,20 @@
.elgg-menu-footer.elgg-section-alt {
float: right;
+}
+
+/* ***************************************
+ ENTITY METADATA
+*************************************** */
+.elgg-menu-metadata {
+ float: right;
+ margin-left: 15px;
+ font-size: 90%;
+}
+.elgg-menu-metadata > li {
+ float: left;
+ margin-left: 15px;
+}
+.elgg-menu-metadata, .elgg-menu-metadata a {
+ color: #aaaaaa;
} \ No newline at end of file
diff --git a/views/default/navigation/menu/metadata.php b/views/default/navigation/menu/metadata.php
index 2685a9582..ae6a9bebb 100644
--- a/views/default/navigation/menu/metadata.php
+++ b/views/default/navigation/menu/metadata.php
@@ -11,7 +11,7 @@ $entity = $vars['entity'];
$handler = elgg_extract('handler', $vars, '');
?>
-<ul class="elgg-list-metadata">
+<ul class="elgg-menu elgg-menu-metadata">
<li>
<?php echo elgg_view('output/access', array('entity' => $entity)); ?>
</li>
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index f4b3b6fbc..d89506319 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -155,7 +155,7 @@ $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicen
<div class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>" id="elgg-plugin-<?php echo $plugin->guid; ?>">
<div class="elgg-image-block">
<div class="elgg-image-alt">
- <ul class="elgg-list-metadata">
+ <ul class="elgg-menu elgg-menu-metadata">
<?php echo "$links"; ?>
</ul>
<div class="clearfloat right mtm">
diff --git a/views/default/page/components/list/body.php b/views/default/page/components/list/body.php
index ef62df198..f3042578d 100644
--- a/views/default/page/components/list/body.php
+++ b/views/default/page/components/list/body.php
@@ -3,7 +3,7 @@
* List body
*
* Sample output
- * <ul class="elgg-list-metadata"><li>Public</li><li>Like this</li></ul>
+ * <ul class="elgg-menu elgg-menu-metadata"><li>Public</li><li>Like this</li></ul>
* <h3><a href="">Title</a></h3>
* <p class="elgg-subtext">Posted 3 hours ago by George</p>
* <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 1e45fccd7..7106e6016 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -21,7 +21,7 @@ if (elgg_get_logged_in_user_guid() == $user->guid) {
$title = "<a href=\"" . $user->getUrl() . "\" $rel>" . $user->name . "</a>";
-$metadata = "<ul class=\"elgg-list-metadata\"><li>$user->location</li>";
+$metadata = "<ul class=\"elgg-menu elgg-menu-metadata\"><li>$user->location</li>";
$metadata .= elgg_view("entity/metadata", array('entity' => $user));
$metadata .= "</ul>";
@@ -33,7 +33,7 @@ if ($user->isBanned()) {
$params = array(
'entity' => $user,
'title' => $title,
- 'metadata' => '<ul class="elgg-list-metadata"><li>banned</li></ul>',
+ 'metadata' => '<ul class="elgg-menu elgg-menu-metadata"><li>banned</li></ul>',
);
} else {
$params = array(