Permalink
Browse files

feature(plugins): Improved plugin listing

Fixes #8412
Fixes #4158
Fixes #4301
Fixes #6778

BREAKING CHANGE:
The plugin views are redesigned to display in a lightbox. This completely
removes the views forms/admin/plugins/filter and forms/admin/plugins/sort.
  • Loading branch information...
jdalsem authored and mrclay committed Jun 19, 2015
1 parent 13afe2e commit bde2c39490ff0c5a5f322eeceb36e0fc6c657d81
View
@@ -78,9 +78,9 @@ function _elgg_generate_plugin_entities() {
/**
* Cache a reference to this plugin by its ID
- *
+ *
* @param \ElggPlugin $plugin
- *
+ *
* @access private
*/
function _elgg_cache_plugin_by_id(\ElggPlugin $plugin) {
@@ -221,7 +221,7 @@ function _elgg_get_plugins_provides($type = null, $name = null) {
/**
* Deletes all cached data on plugins being provided.
- *
+ *
* @return boolean
* @since 1.9.0
* @access private
@@ -490,6 +490,7 @@ function _elgg_plugins_init() {
if (elgg_is_admin_logged_in()) {
elgg_register_ajax_view('object/plugin/full');
+ elgg_register_ajax_view('object/plugin/details');
}
elgg_register_plugin_hook_handler('unit_test', 'system', '_elgg_plugins_test');
View
@@ -605,11 +605,17 @@
'admin:plugins:description' => "This admin panel allows you to control and configure tools installed on your site.",
'admin:plugins:opt:linktext' => "Configure tools...",
'admin:plugins:opt:description' => "Configure the tools installed on the site. ",
+ 'admin:plugins:label:id' => "ID",
+ 'admin:plugins:label:name' => "Name",
'admin:plugins:label:author' => "Author",
'admin:plugins:label:copyright' => "Copyright",
'admin:plugins:label:categories' => 'Categories',
'admin:plugins:label:licence' => "License",
'admin:plugins:label:website' => "URL",
+ 'admin:plugins:label:info' => "Info",
+ 'admin:plugins:label:files' => "Files",
+ 'admin:plugins:label:resources' => "Resources",
+ 'admin:plugins:label:screenshots' => "Screenshots",
'admin:plugins:label:repository' => "Code",
'admin:plugins:label:bugtracker' => "Report issue",
'admin:plugins:label:donate' => "Donate",
View
@@ -195,7 +195,7 @@
margin: 8px 8px 0 0;
}
.elgg-menu-user,
-.elgg-menu-admin-header,
+.elgg-menu-admin-header,
.elgg-menu-user a,
.elgg-menu-admin-header a {
color: #999999;
@@ -350,7 +350,7 @@
}
.elgg-module-popup {
background-color: white;
- border: 1px solid #ccc;
+ border: 1px solid #ccc;
z-index: 9999;
margin-bottom: 0;
padding: 5px;
@@ -507,7 +507,7 @@
select {
max-width: 100%;
- padding: 4px;
+ padding: 4px;
}
.elgg-fieldset {
@@ -1426,43 +1426,84 @@
/* ***************************************
PLUGINS
**************************************** */
+
+.elgg-admin-plugins-categories li {
+ padding-right: 5px;
+}
.elgg-plugin {
- border: 1px solid #999;
- margin: 0 0 5px;
- padding: 0 7px 4px 10px;
+ border: 1px solid #CCC;
+ padding: 0 5px;
border-radius: 5px;
}
+.elgg-plugin:hover {
+ border-color: #999;
+}
+.elgg-plugin .elgg-head {
+ white-space: nowrap;
+}
.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head {
cursor: move;
}
+.elgg-plugin > .elgg-image-block > .elgg-image {
+ margin-right: 10px;
+ min-width: 120px;
+ text-align: center;
+}
+.elgg-plugin > .elgg-image-block > .elgg-image .elgg-button {
+ display: block;
+ margin: 0;
+ padding: 0;
+}
.elgg-plugin p {
margin: 0;
}
.elgg-plugin h3 {
color: black;
padding-bottom: 10px;
}
-.elgg-plugin-settings {
- font-weight: normal;
- font-size: 0.9em;
+
+.elgg-plugin-list-description {
+ display: inline-block;
+ color: #999;
}
-.elgg-plugin-screenshot {
- display: inline;
+
+.elgg-state-active .elgg-plugin-list-reordering {
+ background: white;
}
-.elgg-plugin-screenshot img {
- border: 1px solid #999;
+
+.elgg-state-inactive .elgg-plugin-list-reordering {
+ background: #EEE;
+}
+
+.elgg-plugin.elgg-state-active {
+ background: white;
+}
+.elgg-plugin.elgg-state-inactive {
+ background: #EEE;
+}
+
+.elgg-plugin.elgg-state-cannot-activate,
+.elgg-plugin.elgg-state-cannot-activate .elgg-plugin-list-reordering {
+ background: #FBEDB5;
}
-.elgg-plugin-screenshot-lightbox {
+
+.elgg-plugin-list-reordering {
+ float: right;
+ display: none;
+ position: relative;
+}
+.elgg-plugin:hover .elgg-plugin-list-reordering {
display: block;
- position: absolute;
- width: 99%;
- text-align: center;
- background-color: white;
- border: 1px solid #999;
- border-radius: 8px;
}
-.elgg-plugin-screenshot-lightbox h2 {
- color: black;
+
+.elgg-plugin-list-reordering li {
+ float:left;
+ margin-left: 5px;
+}
+
+.elgg-plugin-settings {
+ font-weight: normal;
+ font-size: 0.9em;
}
.elgg-plugin-contributors {
list-style-position: inside;
@@ -1488,12 +1529,6 @@
.elgg-plugin-contributors dd.elgg-plugin-contributor-description:after {
content: '';
}
-.elgg-plugin.elgg-state-active {
- background: white;
-}
-.elgg-plugin.elgg-state-inactive {
- background: #dedede;
-}
.elgg-plugin .elgg-state-error {
background: #fbe3e4;
color: #8a1f11;
@@ -1516,15 +1551,54 @@
ul.elgg-plugin-resources, ul.elgg-plugin-resources > li {
display: inline;
}
-.elgg-plugin-category-bundled {
- border-width: 2px;
- border-color: #0054A7;
-}
+
.elgg-plugin .elgg-menu-hz > li:after {
content: ",";
padding-right: 10px;
}
+.elgg-module-plugin-details .elgg-plugin {
+ border: none;
+ margin: 0;
+ padding: 0;
+}
+
+.elgg-module-plugin-details {
+ width: 600px;
+ min-height: 500px;
+}
+
+.elgg-module-plugin-details .elgg-tabs a {
+ cursor: pointer;
+}
+
+.elgg-plugin-details-screenshots > ul {
+ text-align: center;
+}
+
+.elgg-plugin-details-screenshots > div {
+ text-align: center;
+}
+
+.elgg-plugin-details-screenshots > div > img {
+ max-height: 380px;
+ max-width: 480px;
+}
+
+.elgg-plugin-details-screenshots > div > img.elgg-state-selected {
+ display: inline-block;
+}
+.elgg-plugin-details-screenshots > ul .elgg-plugin-screenshot {
+ display: inline;
+}
+.elgg-plugin-details-screenshots > ul .elgg-plugin-screenshot img {
+ height: 50px;
+ border: 1px solid #ccc;
+}
+.elgg-plugin-details-screenshots > ul .elgg-plugin-screenshot.elgg-state-selected img {
+ border: 1px solid #999;
+}
+
/****************************************
MARKDOWN
****************************************/
@@ -1732,15 +1806,15 @@
.elgg-admin-button-nav {
display: none;
float: right;
- margin: 6px 0 0 10px;
+ margin: 6px 0 0 10px;
cursor: pointer;
}
.elgg-admin-button-nav:hover .icon-bar {
background-color: #999;
}
.elgg-admin-button-nav .icon-bar {
background-color: #F5F5F5;
- border-radius: 1px 1px 1px 1px;
+ border-radius: 1px 1px 1px 1px;
display: block;
height: 3px;
width: 26px;
@@ -1765,7 +1839,7 @@
}
}
@media (max-width: 768px) {
- .elgg-admin-button-nav {
+ .elgg-admin-button-nav {
display: block;
}
.elgg-heading-site {
Oops, something went wrong.

0 comments on commit bde2c39

Please sign in to comment.