aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/admin/components/plugin.php73
-rw-r--r--views/default/css/admin.php20
-rw-r--r--views/default/page/shells/default.php30
3 files changed, 81 insertions, 42 deletions
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 87d13db90..7549ea8ca 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -33,11 +33,11 @@ if ($priority > 1) {
'is_action' => true
));
- $links .= elgg_view('output/url', array(
+ $links .= "<li>" . elgg_view('output/url', array(
'href' => $top_url,
'text' => elgg_echo('top'),
'is_action' => true
- ));
+ )) . "</li>";
$up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
'plugin_guid' => $plugin->guid,
@@ -45,11 +45,11 @@ if ($priority > 1) {
'is_action' => true
));
- $links .= elgg_view('output/url', array(
+ $links .= "<li>" . elgg_view('output/url', array(
'href' => $up_url,
'text' => elgg_echo('up'),
'is_action' => true
- ));
+ )) . "</li>";
}
// down and bottom links only if not at bottom
@@ -60,11 +60,11 @@ if ($priority < $max_priority) {
'is_action' => true
));
- $links .= elgg_view('output/url', array(
+ $links .= "<li>" . elgg_view('output/url', array(
'href' => $down_url,
'text' => elgg_echo('down'),
'is_action' => true
- ));
+ )) . "</li>";
$bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
'plugin_guid' => $plugin->guid,
@@ -72,11 +72,11 @@ if ($priority < $max_priority) {
'is_action' => true
));
- $links .= elgg_view('output/url', array(
+ $links .= "<li>" . elgg_view('output/url', array(
'href' => $bottom_url,
'text' => elgg_echo('bottom'),
'is_action' => true
- ));
+ )) . "</li>";
}
// activate / deactivate links
@@ -153,12 +153,16 @@ $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicen
?>
<div id="elgg-plugin-<?php echo $plugin->guid; ?>" class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>">
- <div class="admin_plugin_reorder">
- <?php echo "$links"; ?>
- </div><div class="clearfloat"></div>
-
- <div class="admin_plugin_enable_disable"><?php echo $action_button; ?></div>
-
+ <div class="elgg-image-block">
+ <div class="elgg-image-alt">
+ <div class="elgg-list-metadata">
+ <?php echo "$links"; ?>
+ </div>
+ <div class="clearfloat right mtm">
+ <?php echo $action_button; ?>
+ </div>
+ </div>
+ <div class="elgg-body">
<?php
$settings_view = 'settings/' . $plugin->getID() . '/edit';
if (elgg_view_exists($settings_view)) {
@@ -166,28 +170,29 @@ if (elgg_view_exists($settings_view)) {
$settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
}
?>
- <h3 class="elgg-head"><?php echo $plugin->manifest->getName() . " $version $settings_link"; ?></h3>
- <?php
- if ($plugin->manifest->getApiVersion() < 1.8) {
- $reqs = $plugin->manifest->getRequires();
- if (!$reqs) {
- $message = elgg_echo('admin:plugins:warning:elgg_version_unknown');
+ <h3 class="elgg-head"><?php echo $plugin->manifest->getName() . " $version $settings_link"; ?></h3>
+ <?php
+ if ($plugin->manifest->getApiVersion() < 1.8) {
+ $reqs = $plugin->manifest->getRequires();
+ if (!$reqs) {
+ $message = elgg_echo('admin:plugins:warning:elgg_version_unknown');
+ echo "<p class=\"elgg-state-error\">$message</p>";
+ }
+ }
+
+ if (!$can_activate) {
+ $message = elgg_echo('admin:plugins:warning:unmet_dependencies');
echo "<p class=\"elgg-state-error\">$message</p>";
}
- }
-
- if (!$can_activate) {
- $message = elgg_echo('admin:plugins:warning:unmet_dependencies');
- echo "<p class=\"elgg-state-error\">$message</p>";
- }
- ?>
-
- <div class="plugin_description"><?php echo $description; ?></div>
- <p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
-
- <div class="pts"><a class="manifest_details small link"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></div>
-
- <div class="manifest_file hidden">
+ ?>
+
+ <div class="plugin_description"><?php echo $description; ?></div>
+ <p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
+
+ <div class="pts"><a class="elgg-toggle" id="elgg-toggler-plugin-manifest-<?php echo $plugin->getID(); ?>"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></div>
+ </div>
+ </div>
+ <div class="hidden manifest_file" id="elgg-togglee-plugin-manifest-<?php echo $plugin->getID(); ?>">
<?php
if ($screenshots_html) {
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index a90b97a5b..77858816e 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -351,6 +351,11 @@ table.mceLayout {
float: left;
margin-right: 5px;
}
+.elgg-image-block .elgg-image-alt {
+ float: right;
+ margin-left: 5px;
+}
+
.elgg-list-item {
margin: 3px;
}
@@ -980,7 +985,6 @@ ul.admin_plugins {
padding:0;
}
.elgg-plugin h3 {
- margin-top:-13px;
color:black;
padding-bottom: 10px;
}
@@ -1222,6 +1226,20 @@ p.elgg-dependency-suggests {
height: 21px;
}
+.elgg-list-metadata {
+ list-style-type: none;
+ float: right;
+ margin-left: 15px;
+ font-size: 90%;
+}
+.elgg-list-metadata > li {
+ float: left;
+ margin-left: 15px;
+}
+
+.right {float:right}
+.elgg-toggle {cursor:pointer}
+
/* ***************************************
FOOTER
*************************************** */
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index 5ed1ca7ca..7ae62b98a 100644
--- a/views/default/page/shells/default.php
+++ b/views/default/page/shells/default.php
@@ -30,13 +30,29 @@ header("Content-type: text/html; charset=UTF-8");
<?php echo elgg_view('page/elements/head', $vars); ?>
<body>
<div class="elgg-page elgg-classic">
-<?php
- echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
- echo elgg_view('page/elements/topbar', $vars);
- echo elgg_view('page/elements/header', $vars);
- echo elgg_view('page/elements/body', $vars);
- echo elgg_view('page/elements/footer', $vars);
-?>
+ <div class="elgg-page-messages">
+ <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
+ </div>
+ <div class="elgg-page-topbar">
+ <div class="elgg-inner">
+ <?php echo elgg_view('page/elements/topbar', $vars); ?>
+ </div>
+ </div>
+ <div class="elgg-page-header">
+ <div class="elgg-inner">
+ <?php echo elgg_view('page/elements/header', $vars); ?>
+ </div>
+ </div>
+ <div class="elgg-page-body">
+ <div class="elgg-inner">
+ <?php echo elgg_view('page/elements/body', $vars); ?>
+ </div>
+ </div>
+ <div class="elgg-page-footer">
+ <div class="elgg-inner">
+ <?php echo elgg_view('page/elements/footer', $vars); ?>
+ </div>
+ </div>
</div>
</body>
</html> \ No newline at end of file