From 0179e8c68b0827d77c61a31c8c0d6bf4a277c785 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Sat, 27 Aug 2011 10:41:35 -0700 Subject: Fixes #3434. Manifests are checked more carefully on anything that checks deps. Disabling plugins with invalid manifests from admin page. --- views/default/admin/plugins.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'views/default') diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index 1aa899fcc..cd0b83c00 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -20,6 +20,11 @@ $categories = array(); foreach ($installed_plugins as $id => $plugin) { if (!$plugin->isValid()) { + if ($plugin->isActive()) { + // force disable and warn + register_error(elgg_echo('ElggPlugin:InvalidAndDeactivated', array($plugin->getId()))); + $plugin->deactivate(); + } continue; } -- cgit v1.2.3 From e32bfa450e9a07f6f6575b84d18eb63bd72969f4 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Mon, 29 Aug 2011 18:38:04 -0700 Subject: Fixes #3461: Using absolute URLs for lightbox CSS. --- engine/lib/views.php | 2 +- views/default/css/lightbox.php | 371 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 views/default/css/lightbox.php (limited to 'views/default') diff --git a/engine/lib/views.php b/engine/lib/views.php index 68c1badbc..16aa147e4 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1560,7 +1560,7 @@ function elgg_views_boot() { elgg_register_simplecache_view('js/lightbox'); $lightbox_js_url = elgg_get_simplecache_url('js', 'lightbox'); elgg_register_js('lightbox', $lightbox_js_url); - $lightbox_css_url = 'vendors/jquery/fancybox/jquery.fancybox-1.3.4.css'; + $lightbox_css_url = elgg_get_simplecache_url('css', 'lightbox'); elgg_register_css('lightbox', $lightbox_css_url); $elgg_css_url = elgg_get_simplecache_url('css', 'elgg'); diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php new file mode 100644 index 000000000..55e6ec604 --- /dev/null +++ b/views/default/css/lightbox.php @@ -0,0 +1,371 @@ + + +/* + * FancyBox - jQuery Plugin + * Simple and fancy lightbox alternative + * + * Examples and documentation at: http://fancybox.net + * + * Copyright (c) 2008 - 2010 Janis Skarnelis + * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. + * + * Version: 1.3.4 (11/11/2010) + * Requires: jQuery v1.3+ + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ + +#fancybox-loading { + position: fixed; + top: 50%; + left: 50%; + width: 40px; + height: 40px; + margin-top: -20px; + margin-left: -20px; + cursor: pointer; + overflow: hidden; + z-index: 1104; + display: none; +} + +#fancybox-loading div { + position: absolute; + top: 0; + left: 0; + width: 40px; + height: 480px; + background-image: url('fancybox/fancybox.png'); +} + +#fancybox-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + z-index: 1100; + display: none; +} + +#fancybox-tmp { + padding: 0; + margin: 0; + border: 0; + overflow: auto; + display: none; +} + +#fancybox-wrap { + position: absolute; + top: 0; + left: 0; + padding: 20px; + z-index: 1101; + outline: none; + display: none; +} + +#fancybox-outer { + position: relative; + width: 100%; + height: 100%; + background: #fff; +} + +#fancybox-content { + width: 0; + height: 0; + padding: 0; + outline: none; + position: relative; + overflow: hidden; + z-index: 1102; + border: 0px solid #fff; +} + +#fancybox-hide-sel-frame { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: transparent; + z-index: 1101; +} + +#fancybox-close { + position: absolute; + top: -15px; + right: -15px; + width: 30px; + height: 30px; + background: transparent url('fancybox/fancybox.png') -40px 0px; + cursor: pointer; + z-index: 1103; + display: none; +} + +#fancybox-error { + color: #444; + font: normal 12px/20px Arial; + padding: 14px; + margin: 0; +} + +#fancybox-img { + width: 100%; + height: 100%; + padding: 0; + margin: 0; + border: none; + outline: none; + line-height: 0; + vertical-align: top; +} + +#fancybox-frame { + width: 100%; + height: 100%; + border: none; + display: block; +} + +#fancybox-left, #fancybox-right { + position: absolute; + bottom: 0px; + height: 100%; + width: 35%; + cursor: pointer; + outline: none; + background: transparent url('fancybox/blank.gif'); + z-index: 1102; + display: none; +} + +#fancybox-left { + left: 0px; +} + +#fancybox-right { + right: 0px; +} + +#fancybox-left-ico, #fancybox-right-ico { + position: absolute; + top: 50%; + left: -9999px; + width: 30px; + height: 30px; + margin-top: -15px; + cursor: pointer; + z-index: 1102; + display: block; +} + +#fancybox-left-ico { + background-image: url('fancybox/fancybox.png'); + background-position: -40px -30px; +} + +#fancybox-right-ico { + background-image: url('fancybox/fancybox.png'); + background-position: -40px -60px; +} + +#fancybox-left:hover, #fancybox-right:hover { + visibility: visible; /* IE6 */ +} + +#fancybox-left:hover span { + left: 20px; +} + +#fancybox-right:hover span { + left: auto; + right: 20px; +} + +.fancybox-bg { + position: absolute; + padding: 0; + margin: 0; + border: 0; + width: 20px; + height: 20px; + z-index: 1001; +} + +#fancybox-bg-n { + top: -20px; + left: 0; + width: 100%; + background-image: url('fancybox/fancybox-x.png'); +} + +#fancybox-bg-ne { + top: -20px; + right: -20px; + background-image: url('fancybox/fancybox.png'); + background-position: -40px -162px; +} + +#fancybox-bg-e { + top: 0; + right: -20px; + height: 100%; + background-image: url('fancybox/fancybox-y.png'); + background-position: -20px 0px; +} + +#fancybox-bg-se { + bottom: -20px; + right: -20px; + background-image: url('fancybox/fancybox.png'); + background-position: -40px -182px; +} + +#fancybox-bg-s { + bottom: -20px; + left: 0; + width: 100%; + background-image: url('fancybox/fancybox-x.png'); + background-position: 0px -20px; +} + +#fancybox-bg-sw { + bottom: -20px; + left: -20px; + background-image: url('fancybox/fancybox.png'); + background-position: -40px -142px; +} + +#fancybox-bg-w { + top: 0; + left: -20px; + height: 100%; + background-image: url('fancybox/fancybox-y.png'); +} + +#fancybox-bg-nw { + top: -20px; + left: -20px; + background-image: url('fancybox/fancybox.png'); + background-position: -40px -122px; +} + +#fancybox-title { + font-family: Helvetica; + font-size: 12px; + z-index: 1102; +} + +.fancybox-title-inside { + padding-bottom: 10px; + text-align: center; + color: #333; + background: #fff; + position: relative; +} + +.fancybox-title-outside { + padding-top: 10px; + color: #fff; +} + +.fancybox-title-over { + position: absolute; + bottom: 0; + left: 0; + color: #FFF; + text-align: left; +} + +#fancybox-title-over { + padding: 10px; + background-image: url('fancybox/fancy_title_over.png'); + display: block; +} + +.fancybox-title-float { + position: absolute; + left: 0; + bottom: -20px; + height: 32px; +} + +#fancybox-title-float-wrap { + border: none; + border-collapse: collapse; + width: auto; +} + +#fancybox-title-float-wrap td { + border: none; + white-space: nowrap; +} + +#fancybox-title-float-left { + padding: 0 0 0 15px; + background: url('fancybox/fancybox.png') -40px -90px no-repeat; +} + +#fancybox-title-float-main { + color: #FFF; + line-height: 29px; + font-weight: bold; + padding: 0 0 3px 0; + background: url('fancybox/fancybox-x.png') 0px -40px; +} + +#fancybox-title-float-right { + padding: 0 0 0 15px; + background: url('fancybox/fancybox.png') -55px -90px no-repeat; +} + +/* IE6 */ + +.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_close.png', sizingMethod='scale'); } + +.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_left.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_right.png', sizingMethod='scale'); } + +.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } +.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_left.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_main.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_right.png', sizingMethod='scale'); } + +.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame { + height: expression(this.parentNode.clientHeight + "px"); +} + +#fancybox-loading.fancybox-ie6 { + position: absolute; margin-top: 0; + top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'); +} + +#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_loading.png', sizingMethod='scale'); } + +/* IE6, IE7, IE8 */ +.fancybox-ie .fancybox-bg { background: transparent !important; } + +.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_n.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_e.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_se.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_s.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_w.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } \ No newline at end of file -- cgit v1.2.3 From 68331b3ca029009a468373e64a689c1b32928877 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Mon, 5 Sep 2011 13:34:10 -0700 Subject: Refs #3449. Some IE7 CSS fixes. I need to shower now. --- views/default/css/ie.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'views/default') diff --git a/views/default/css/ie.php b/views/default/css/ie.php index 6760d3886..279ddfdbf 100644 --- a/views/default/css/ie.php +++ b/views/default/css/ie.php @@ -71,4 +71,44 @@ } *:first-child+html #login-dropdown #signin-button a.signin.menu-open span { background-position:-150px -74px; +} + +/* Gallery */ +.elgg-gallery-fluid > li { + float: left; + margin: 2px; +} + + +/* navigation */ +.elgg-breadcrumbs > li { + display: inline; +} + +.elgg-breadcrumbs > li > a { + display: inline; + padding-right: 4px; + margin-right: 4px; + border-right: 1px solid #bababa; +} + +.elgg-menu-title > li { + display: block; +} + +.elgg-menu-title > li > a { + display: block; +} + +.elgg-menu-footer > li > a { + display: inline; +} + +.elgg-menu-river > li { + display: inline; +} + +/* admin */ +.elgg-menu-footer li { + display: inline; } \ No newline at end of file -- cgit v1.2.3 From 826310d08ba1ed468ab01b8a5c87b5396fed3a3c Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Mon, 5 Sep 2011 18:46:36 -0700 Subject: Refs #3449, #3770. Using JS to fix submenu dropdown in IE7. --- js/lib/ui.js | 34 ++++++++++++++++++++++++++++++++++ views/default/css/ie.php | 4 ++++ 2 files changed, 38 insertions(+) (limited to 'views/default') diff --git a/js/lib/ui.js b/js/lib/ui.js index 4426917ed..46e418e8b 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -22,6 +22,13 @@ elgg.ui.init = function () { if ($('.elgg-input-date').length) { elgg.ui.initDatePicker(); } + + // fix for ie7 CSS issue on menu dropdown + // open the menu when you hover over it, close when you click off of it. + // @todo This should be possible with CSS. Anyone want to tame the beast, go for it. + if ($.browser.msie && $.browser.version <= 7) { + $('.elgg-menu-site > .elgg-more').live('mouseenter', elgg.ui.ie7MenuFixMouseEnter) + } } /** @@ -275,5 +282,32 @@ elgg.ui.initDatePicker = function() { }); } +/** + * IE 7 doesn't like our site menu system CSS, so open it with JS. + */ +elgg.ui.ie7MenuFixMouseEnter = function() { + $('.elgg-menu-site .elgg-menu-site-more').css('display', 'block'); + $('.elgg-menu-site .elgg-more > a') + .css('background-color', 'white') + .css('color', '#555') + + $body = $('body'); + if (!$body.data('hasIe7Clear')) { + $body.live('click', elgg.ui.ie7MenuClear); + $body.data('hasIe7Clear', true); + } + +} + +/** + * Close the menu when clicking on the body + */ +elgg.ui.ie7MenuClear = function() { + $('.elgg-menu-site .elgg-menu-site-more').css('display', 'none'); + $('.elgg-menu-site .elgg-more > a') + .css('background-color', 'transparent') + .css('color', 'white') +} + elgg.register_hook_handler('init', 'system', elgg.ui.init); elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.LoginHandler); \ No newline at end of file diff --git a/views/default/css/ie.php b/views/default/css/ie.php index 279ddfdbf..cb4ede0ae 100644 --- a/views/default/css/ie.php +++ b/views/default/css/ie.php @@ -108,6 +108,10 @@ display: inline; } +li:hover > .elgg-menu-site-more { + display: none; +} + /* admin */ .elgg-menu-footer li { display: inline; -- cgit v1.2.3 From d9392db5ecd670a46f25dfd1a9dd11bb3142af10 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 12 Sep 2011 21:47:11 -0400 Subject: Refs #3800 including jeditable on more admin pages --- engine/lib/admin.php | 10 ++++------ views/default/js/admin.php | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'views/default') diff --git a/engine/lib/admin.php b/engine/lib/admin.php index c16da9295..93ee43008 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -239,6 +239,9 @@ function admin_init() { elgg_register_action('profile/fields/reorder', '', 'admin'); elgg_register_simplecache_view('js/admin'); + $url = elgg_get_simplecache_url('js', 'admin'); + elgg_register_js('elgg.admin', $url); + elgg_register_js('jquery.jeditable', 'vendors/jquery/jquery.jeditable.mini.js'); // administer // dashboard @@ -434,11 +437,7 @@ function admin_settings_page_handler($page) { elgg_set_context('admin'); elgg_unregister_css('elgg'); - $url = elgg_get_simplecache_url('js', 'admin'); - elgg_register_js('elgg.admin', $url); elgg_load_js('elgg.admin'); - - elgg_register_js('jquery.jeditable', 'vendors/jquery/jquery.jeditable.mini.js'); elgg_load_js('jquery.jeditable'); // default to dashboard @@ -548,9 +547,8 @@ function admin_markdown_page_handler($pages) { elgg_set_context('admin'); elgg_unregister_css('elgg'); - $url = elgg_get_simplecache_url('js', 'admin'); - elgg_register_js('elgg.admin', $url); elgg_load_js('elgg.admin'); + elgg_load_js('jquery.jeditable'); elgg_load_library('elgg:markdown'); $plugin_id = elgg_extract(0, $pages); diff --git a/views/default/js/admin.php b/views/default/js/admin.php index 2f2f59287..253a73887 100644 --- a/views/default/js/admin.php +++ b/views/default/js/admin.php @@ -32,6 +32,7 @@ elgg.admin.init = function () { }); // in-line editing for custom profile fields. + // @note this requires jquery.jeditable plugin $(".elgg-state-editable").editable(elgg.admin.editProfileField, { type: 'text', onblur: 'submit', -- cgit v1.2.3 From 3161a7b0b27508066f26b8cd920b1817f23beeef Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 13 Sep 2011 21:14:11 -0400 Subject: Fixes #3623 added non-bundled filter option for plugins --- languages/en.php | 1 + views/default/admin/plugins.php | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'views/default') diff --git a/languages/en.php b/languages/en.php index ab3c523de..6e07b256b 100644 --- a/languages/en.php +++ b/languages/en.php @@ -601,6 +601,7 @@ $english = array( 'admin:plugins:category:inactive' => 'Inactive plugins', 'admin:plugins:category:admin' => 'Admin', 'admin:plugins:category:bundled' => 'Bundled', + 'admin:plugins:category:nonbundled' => 'Non-bundled', 'admin:plugins:category:content' => 'Content', 'admin:plugins:category:development' => 'Development', 'admin:plugins:category:enhancement' => 'Enhancements', diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index cd0b83c00..62e6f556a 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -45,6 +45,11 @@ foreach ($installed_plugins as $id => $plugin) { unset($installed_plugins[$id]); } break; + case 'nonbundled': + if (in_array('bundled', $plugin_categories)) { + unset($installed_plugins[$id]); + } + break; default: if (!in_array($show_category, $plugin_categories)) { unset($installed_plugins[$id]); @@ -96,10 +101,16 @@ switch ($sort) { asort($categories); +// we want bundled/nonbundled pulled to be at the top of the list +unset($categories['bundled']); +unset($categories['nonbundled']); + $common_categories = array( 'all' => elgg_echo('admin:plugins:category:all'), 'active' => elgg_echo('admin:plugins:category:active'), 'inactive' => elgg_echo('admin:plugins:category:inactive'), + 'bundled' => elgg_echo('admin:plugins:category:bundled'), + 'nonbundled' => elgg_echo('admin:plugins:category:nonbundled'), ); $categories = array_merge($common_categories, $categories); -- cgit v1.2.3 From 61337b126e0ee3a316f5cb9faf8982b0803793a4 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 13 Sep 2011 21:22:28 -0400 Subject: Fixes #3811 defaulting title to confirm text if passed to output/confirmlink --- views/default/output/confirmlink.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views/default') diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 5059a656e..31a34ae63 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -25,8 +25,8 @@ if ($encode) { $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8', false); } -if (!isset($vars['title'])) { - $vars['title'] = addslashes($confirm); +if (!isset($vars['title']) && isset($vars['confirm'])) { + $vars['title'] = $vars['rel']; } if (isset($vars['class'])) { -- cgit v1.2.3 From 8a2611e5002982cbfd2843240c181c0796b043b2 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 13 Sep 2011 22:21:12 -0400 Subject: Fixes #3539 two conditions for triggering init,system now - dom is ready and languages loaded --- js/lib/elgglib.js | 17 ++++++++++++++++- js/lib/languages.js | 2 ++ views/default/js/elgg.php | 6 ++++-- 3 files changed, 22 insertions(+), 3 deletions(-) (limited to 'views/default') diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index f2545fb6c..9a372738d 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -379,4 +379,19 @@ elgg.getSelectorFromUrlFragment = function(url) { } } return ''; -}; \ No newline at end of file +}; + +/** + * Triggers the init hook when the library is ready + * + * Current requirements: + * - DOM is ready + * - languages loaded + * + */ +elgg.initWhenReady = function() { + if (elgg.config.languageReady && elgg.config.domReady) { + elgg.trigger_hook('init', 'system'); + elgg.trigger_hook('ready', 'system'); + } +} \ No newline at end of file diff --git a/js/lib/languages.js b/js/lib/languages.js index 4cfe84968..ae7ba63e2 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -32,6 +32,8 @@ elgg.reload_all_translations = function(language) { }, success: function(json) { elgg.add_translation(lang, json); + elgg.config.languageReady = true; + elgg.initWhenReady(); } }); }; diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index 76388f80c..133e128a4 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -56,11 +56,13 @@ elgg.version = ''; elgg.release = ''; elgg.config.wwwroot = ''; elgg.security.interval = 5 * 60 * 1000; +elgg.config.domReady = false; +elgg.config.languageReady = false; //After the DOM is ready $(function() { - elgg.trigger_hook('init', 'system'); - elgg.trigger_hook('ready', 'system'); + elgg.config.domReady = true; + elgg.initWhenReady(); }); Date: Wed, 14 Sep 2011 20:50:39 -0400 Subject: Fixes #3783 using an associative array for advanced settings checkboxes --- views/default/forms/admin/site/update_advanced.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'views/default') diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php index fa253967c..e12764092 100644 --- a/views/default/forms/admin/site/update_advanced.php +++ b/views/default/forms/admin/site/update_advanced.php @@ -17,26 +17,26 @@ foreach (array('wwwroot', 'path', 'dataroot') as $field) { } $form_body .= "
" . elgg_echo('admin:site:access:warning') . "
"; -$form_body .= elgg_echo('installation:sitepermissions'); +$form_body .= ""; $form_body .= elgg_view('input/access', array( 'name' => 'default_access', 'value' => elgg_get_config('default_access'), )) . "
"; $form_body .= "
" . elgg_echo('installation:allow_user_default_access:description') . "
"; $form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:allow_user_default_access:label')), + 'options' => array(elgg_echo('installation:allow_user_default_access:label') => elgg_echo('installation:allow_user_default_access:label')), 'name' => 'allow_user_default_access', 'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""), )) . "
"; $form_body .= "
" . elgg_echo('installation:simplecache:description') . "
"; $form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:simplecache:label')), + 'options' => array(elgg_echo('installation:simplecache:label') => elgg_echo('installation:simplecache:label')), 'name' => 'simplecache_enabled', 'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""), )) . "
"; $form_body .= "
" . elgg_echo('installation:viewpathcache:description') . "
"; $form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:viewpathcache:label')), + 'options' => array(elgg_echo('installation:viewpathcache:label') => elgg_echo('installation:viewpathcache:label')), 'name' => 'viewpath_cache_enabled', 'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""), )) . "
"; @@ -52,7 +52,7 @@ $form_body .= ''; // control new user registration $options = array( - 'options' => array(elgg_echo('installation:registration:label')), + 'options' => array(elgg_echo('installation:registration:label') => elgg_echo('installation:registration:label')), 'name' => 'allow_registration', 'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '', ); @@ -62,7 +62,7 @@ $form_body .= '
' .elgg_view('input/checkboxes', $options) . ''; // control walled garden $walled_garden = elgg_get_config(walled_garden); $options = array( - 'options' => array(elgg_echo('installation:walled_garden:label')), + 'options' => array(elgg_echo('installation:walled_garden:label') => elgg_echo('installation:walled_garden:label')), 'name' => 'walled_garden', 'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '', ); @@ -71,7 +71,7 @@ $form_body .= '
' . elgg_view('input/checkboxes', $options) . ''; $form_body .= "
" . elgg_echo('installation:httpslogin') . "
"; $form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:httpslogin:label')), + 'options' => array(elgg_echo('installation:httpslogin:label') => elgg_echo('installation:httpslogin:label')), 'name' => 'https_login', 'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "") )) . "
"; @@ -83,7 +83,7 @@ if ($disable_api) { $on = (disable_api ? "" : elgg_echo('installation:disableapi:label')); } $form_body .= elgg_view("input/checkboxes", array( - 'options' => array(elgg_echo('installation:disableapi:label')), + 'options' => array(elgg_echo('installation:disableapi:label') => elgg_echo('installation:disableapi:label')), 'name' => 'api', 'value' => $on, )); -- cgit v1.2.3 From faf35b951aa039c328e5b5ffb653067e06238c2c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 14 Sep 2011 22:06:06 -0400 Subject: Fixes #3742 not including the hover menu on the personal notifications page --- .../views/default/notifications/subscriptions/forminternals.php | 2 +- views/default/icon/user/default.php | 4 ++++ views/default/input/friendspicker.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'views/default') diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index 106eadc54..a7fbec2fd 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -234,7 +234,7 @@ END; true)); + echo elgg_view_entity_icon($friend, 'tiny', array('hover' => false)); ?>

diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php index 6f5c6e2da..2970f1858 100644 --- a/views/default/icon/user/default.php +++ b/views/default/icon/user/default.php @@ -37,6 +37,10 @@ if (!$icontime) { $js = elgg_extract('js', $vars, ''); $hover = elgg_extract('hover', $vars, true); +if (isset($vars['override'])) { + elgg_deprecated_notice("Use 'hover' rather than 'override' with user avatars", 1.8); + $hover = false; +} $spacer_url = elgg_get_site_url() . '_graphics/spacer.gif'; diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php index 1a60e0d88..ecf468da3 100644 --- a/views/default/input/friendspicker.php +++ b/views/default/input/friendspicker.php @@ -187,7 +187,7 @@ if (!isset($vars['replacement'])) { } //echo "

" . $user->name . "

"; - $label = elgg_view_entity_icon($friend, 'tiny', array('override' => true)); + $label = elgg_view_entity_icon($friend, 'tiny', array('hover' => false)); $options[$label] = $friend->getGUID(); if ($vars['highlight'] == 'all' -- cgit v1.2.3 From eec8cdb6d3443e827ab9d426dcbc77cade3ef140 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 15 Sep 2011 08:01:44 -0400 Subject: Fixes #3818 fixed short tag and extra slash in URL for lightbox --- views/default/css/lightbox.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views/default') diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php index 55e6ec604..7d5917cc3 100644 --- a/views/default/css/lightbox.php +++ b/views/default/css/lightbox.php @@ -1,4 +1,4 @@ - /* -- cgit v1.2.3 From d3d5ef824e3dafaf7165ba88712c74a4140c171c Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 15 Sep 2011 21:08:17 -0400 Subject: Fixes #3400, #3820 added additional icons to Elgg's sprite --- _graphics/elgg_sprites.png | Bin 16680 -> 19302 bytes mod/search/views/default/search/css.php | 4 +- views/default/css/elements/icons.php | 181 +++++++++++++++++++------------- 3 files changed, 112 insertions(+), 73 deletions(-) (limited to 'views/default') diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png index 703ff0c81..02b452d94 100644 Binary files a/_graphics/elgg_sprites.png and b/_graphics/elgg_sprites.png differ diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php index 601536c81..0b8f34b60 100644 --- a/mod/search/views/default/search/css.php +++ b/mod/search/views/default/search/css.php @@ -30,11 +30,11 @@ Search plugin font-size: 12px; font-weight: bold; padding: 2px 4px 2px 26px; - background: transparent url(_graphics/elgg_sprites.png) no-repeat 2px -718px; + background: transparent url(_graphics/elgg_sprites.png) no-repeat 2px -934px; } .elgg-search input[type=text]:focus, .elgg-search input[type=text]:active { background-color: white; - background-position: 2px -700px; + background-position: 2px -916px; border: 1px solid white; color: #0054A7; } diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index 1bc056072..ee166b5be 100644 --- a/views/default/css/elements/icons.php +++ b/views/default/css/elements/icons.php @@ -27,215 +27,254 @@ .elgg-icon-arrow-two-head { background-position: 0 -36px; } -.elgg-icon-calendar { +.elgg-icon-attention:hover { background-position: 0 -54px; } -.elgg-icon-checkmark:hover { +.elgg-icon-attention { background-position: 0 -72px; } -.elgg-icon-checkmark { +.elgg-icon-calendar { background-position: 0 -90px; } -.elgg-icon-clip:hover { +.elgg-icon-cell-phone { background-position: 0 -108px; } -.elgg-icon-clip { +.elgg-icon-checkmark:hover { background-position: 0 -126px; } -.elgg-icon-cursor-drag-arrow { +.elgg-icon-checkmark { background-position: 0 -144px; } -.elgg-icon-delete-alt:hover { +.elgg-icon-clip:hover { background-position: 0 -162px; } -.elgg-icon-delete-alt { +.elgg-icon-clip { background-position: 0 -180px; } -.elgg-icon-delete:hover { +.elgg-icon-cursor-drag-arrow { background-position: 0 -198px; } -.elgg-icon-delete { +.elgg-icon-delete-alt:hover { background-position: 0 -216px; } -.elgg-icon-download:hover { +.elgg-icon-delete-alt { background-position: 0 -234px; } -.elgg-icon-download { +.elgg-icon-delete:hover { background-position: 0 -252px; } -.elgg-icon-facebook { +.elgg-icon-delete { background-position: 0 -270px; } -.elgg-icon-home:hover { +.elgg-icon-download:hover { background-position: 0 -288px; } -.elgg-icon-home { +.elgg-icon-download { background-position: 0 -306px; } -.elgg-icon-hover-menu:hover { +.elgg-icon-eye { background-position: 0 -324px; } -.elgg-icon-hover-menu { +.elgg-icon-facebook { background-position: 0 -342px; } -.elgg-icon-link:hover { +.elgg-icon-grid:hover { background-position: 0 -360px; } -.elgg-icon-link { +.elgg-icon-grid { background-position: 0 -378px; } -.elgg-icon-mail-alt:hover { +.elgg-icon-home:hover { background-position: 0 -396px; } -.elgg-icon-mail-alt { +.elgg-icon-home { background-position: 0 -414px; } -.elgg-icon-mail:hover { +.elgg-icon-hover-menu:hover { background-position: 0 -432px; } -.elgg-icon-mail { +.elgg-icon-hover-menu { background-position: 0 -450px; } -.elgg-icon-print-alt { +.elgg-icon-info:hover { background-position: 0 -468px; } -.elgg-icon-print { +.elgg-icon-info { background-position: 0 -486px; } -.elgg-icon-push-pin-alt { +.elgg-icon-link:hover { background-position: 0 -504px; } -.elgg-icon-push-pin { +.elgg-icon-link { background-position: 0 -522px; } -.elgg-icon-redo { +.elgg-icon-list { background-position: 0 -540px; } -.elgg-icon-refresh:hover { +.elgg-icon-lock-closed { background-position: 0 -558px; } -.elgg-icon-refresh { +.elgg-icon-lock-open { background-position: 0 -576px; } -.elgg-icon-round-arrow-left { +.elgg-icon-mail-alt:hover { background-position: 0 -594px; } -.elgg-icon-round-arrow-right { +.elgg-icon-mail-alt { background-position: 0 -612px; } -.elgg-icon-round-checkmark { +.elgg-icon-mail:hover { background-position: 0 -630px; } -.elgg-icon-round-minus { +.elgg-icon-mail { background-position: 0 -648px; } -.elgg-icon-round-plus { +.elgg-icon-photo { background-position: 0 -666px; } -.elgg-icon-rss { +.elgg-icon-print-alt { background-position: 0 -684px; } -.elgg-icon-search-focus { +.elgg-icon-print { background-position: 0 -702px; } -.elgg-icon-search { +.elgg-icon-push-pin-alt { background-position: 0 -720px; } -.elgg-icon-settings-alt:hover { +.elgg-icon-push-pin { background-position: 0 -738px; } -.elgg-icon-settings-alt { +.elgg-icon-redo { background-position: 0 -756px; } -.elgg-icon-settings { +.elgg-icon-refresh:hover { background-position: 0 -774px; } -.elgg-icon-share:hover { +.elgg-icon-refresh { background-position: 0 -792px; } -.elgg-icon-share { +.elgg-icon-round-arrow-left { background-position: 0 -810px; } -.elgg-icon-shop-cart:hover { +.elgg-icon-round-arrow-right { background-position: 0 -828px; } -.elgg-icon-shop-cart { +.elgg-icon-round-checkmark { background-position: 0 -846px; } -.elgg-icon-speech-bubble-alt:hover { +.elgg-icon-round-minus { background-position: 0 -864px; } -.elgg-icon-speech-bubble-alt { +.elgg-icon-round-plus { background-position: 0 -882px; } -.elgg-icon-speech-bubble:hover { +.elgg-icon-rss { background-position: 0 -900px; } -.elgg-icon-speech-bubble { +.elgg-icon-search-focus { background-position: 0 -918px; } -.elgg-icon-star-alt { +.elgg-icon-search { background-position: 0 -936px; } -.elgg-icon-star-empty:hover { +.elgg-icon-settings-alt:hover { background-position: 0 -954px; } -.elgg-icon-star-empty { +.elgg-icon-settings-alt { background-position: 0 -972px; } -.elgg-icon-star:hover { +.elgg-icon-settings { background-position: 0 -990px; } -.elgg-icon-star { +.elgg-icon-share:hover { background-position: 0 -1008px; } -.elgg-icon-tag:hover { +.elgg-icon-share { background-position: 0 -1026px; } -.elgg-icon-tag { +.elgg-icon-shop-cart:hover { background-position: 0 -1044px; } -.elgg-icon-thumbs-down-alt:hover { +.elgg-icon-shop-cart { background-position: 0 -1062px; } -.elgg-icon-thumbs-down:hover, -.elgg-icon-thumbs-down-alt { +.elgg-icon-speech-bubble-alt:hover { background-position: 0 -1080px; } -.elgg-icon-thumbs-down { +.elgg-icon-speech-bubble-alt { background-position: 0 -1098px; } -.elgg-icon-thumbs-up-alt:hover { +.elgg-icon-speech-bubble:hover { background-position: 0 -1116px; } -.elgg-icon-thumbs-up:hover, -.elgg-icon-thumbs-up-alt { +.elgg-icon-speech-bubble { background-position: 0 -1134px; } -.elgg-icon-thumbs-up { +.elgg-icon-star-alt { background-position: 0 -1152px; } -.elgg-icon-trash { +.elgg-icon-star-empty:hover { background-position: 0 -1170px; } -.elgg-icon-twitter { +.elgg-icon-star-empty { background-position: 0 -1188px; } -.elgg-icon-undo { +.elgg-icon-star:hover { background-position: 0 -1206px; } -.elgg-icon-user { +.elgg-icon-star { background-position: 0 -1224px; } -.elgg-icon-user:hover { +.elgg-icon-tag:hover { background-position: 0 -1242px; } -.elgg-icon-users:hover { +.elgg-icon-tag { background-position: 0 -1260px; } -.elgg-icon-users { +.elgg-icon-thumbs-down-alt:hover { background-position: 0 -1278px; } +.elgg-icon-thumbs-down:hover, +.elgg-icon-thumbs-down-alt { + background-position: 0 -1296px; +} +.elgg-icon-thumbs-down { + background-position: 0 -1314px; +} +.elgg-icon-thumbs-up-alt:hover { + background-position: 0 -1332px; +} +.elgg-icon-thumbs-up:hover, +.elgg-icon-thumbs-up-alt { + background-position: 0 -1350px; +} +.elgg-icon-thumbs-up { + background-position: 0 -1368px; +} +.elgg-icon-trash { + background-position: 0 -1386px; +} +.elgg-icon-twitter { + background-position: 0 -1404px; +} +.elgg-icon-undo { + background-position: 0 -1422px; +} +.elgg-icon-user:hover { + background-position: 0 -1440px; +} +.elgg-icon-user { + background-position: 0 -1458px; +} +.elgg-icon-users:hover { + background-position: 0 -1476px; +} +.elgg-icon-users { + background-position: 0 -1494px; +} +.elgg-icon-video { + background-position: 0 -1512px; +} .elgg-avatar > .elgg-icon-hover-menu { -- cgit v1.2.3 From f35af8ff5df99baf4beece44fb92cc3dcdc3cd15 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 17 Sep 2011 09:58:01 -0400 Subject: Fixes #3236 finishes admin theme - open new tickets for new issues --- .../views/default/settings/twitter_api/edit.php | 6 +- views/default/css/admin.php | 295 +++++++++------------ views/default/object/plugin/advanced.php | 8 +- .../object/plugin/elements/dependencies.php | 2 +- views/default/object/plugin/invalid.php | 2 +- views/default/object/plugin/simple.php | 2 +- views/default/page/admin.php | 2 +- 7 files changed, 135 insertions(+), 182 deletions(-) (limited to 'views/default') diff --git a/mod/twitter_api/views/default/settings/twitter_api/edit.php b/mod/twitter_api/views/default/settings/twitter_api/edit.php index 4e52a5c9d..0b9afd4cf 100644 --- a/mod/twitter_api/views/default/settings/twitter_api/edit.php +++ b/mod/twitter_api/views/default/settings/twitter_api/edit.php @@ -9,14 +9,14 @@ $consumer_key_string = elgg_echo('twitter_api:consumer_key'); $consumer_key_view = elgg_view('input/text', array( 'name' => 'params[consumer_key]', 'value' => $vars['entity']->consumer_key, - 'class' => 'text_input', + 'class' => 'elgg-input-thin', )); $consumer_secret_string = elgg_echo('twitter_api:consumer_secret'); $consumer_secret_view = elgg_view('input/text', array( 'name' => 'params[consumer_secret]', 'value' => $vars['entity']->consumer_secret, - 'class' => 'text_input twitter-secret', + 'class' => 'elgg-input-thin', )); $sign_on_with_twitter_string = elgg_echo('twitter_api:login'); @@ -40,7 +40,7 @@ $new_users_with_twitter_view = elgg_view('input/dropdown', array( )); $settings = <<<__HTML -

$instructions

+

$instructions


$consumer_key_view

$consumer_secret_view
$sign_on_with_twitter_string $sign_on_with_twitter_view
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 8993ec66d..eda6bc193 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -38,26 +38,26 @@ html, body { margin-bottom: 1px; } img { - border-width:0; - border-color:transparent; + border-width: 0; + border-color: transparent; } :focus { - outline:0 none; + outline: 0 none; } ol, ul { list-style: none; } em, i { - font-style:italic; + font-style: italic; } ins { - text-decoration:none; + text-decoration: none; } del { text-decoration:line-through; } strong, b { - font-weight:bold; + font-weight: bold; } table { border-collapse: collapse; @@ -79,7 +79,6 @@ blockquote, q { /* *************************************** BASICS *************************************** */ - body { background-color: #eee; font-size: 80%; @@ -116,15 +115,8 @@ p { margin-bottom: 15px; } -.elgg-output dt { font-weight: bold } -.elgg-output dd { margin: 0 0 1em 2em } - -table.mceLayout { - width:100% !important; -} - .clearfloat { - clear:both; + clear: both; } /* Clearfix! */ @@ -150,10 +142,10 @@ table.mceLayout { content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x "; } .hidden { - display:none; + display: none; } .centered { - margin:0 auto; + margin: 0 auto; } .center { text-align: center; @@ -164,6 +156,9 @@ table.mceLayout { .float-alt { float: right; } +.elgg-toggle { + cursor: pointer; +} /* *************************************** PAGE WRAPPER @@ -211,7 +206,7 @@ table.mceLayout { .elgg-menu-user li { display: inline; } -.elgg-menu-user li:after{ +.elgg-menu-user li:after { content: "|"; display: inline-block; font-weight: normal; @@ -222,6 +217,9 @@ table.mceLayout { content: ""; } +/* *************************************** + MESSAGES +*************************************** */ .elgg-page-messages { padding: 20px 0 0; width: 500px; @@ -248,13 +246,35 @@ table.mceLayout { border-color: #c6d880; } +.elgg-admin-notices { + padding-bottom: 15px; +} +.elgg-admin-notices p { + background-color: #BDE5F8; + color: black; + border: 1px solid blue; + font-weight: bold; + padding: 3px 0px 3px 10px; + + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.elgg-admin-notices a { + float: right; +} + /* *************************************** BODY *************************************** */ .elgg-page-body { padding: 20px 0; } -.elgg-main { +.elgg-main { background-color: #fff; border: 1px solid #ccc; padding: 20px; @@ -384,31 +404,19 @@ table.mceLayout { float: right; margin-left: 5px; } - .elgg-item { margin: 3px; } -.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: #aaa; -} .elgg-simple-list li { margin-bottom: 5px; } + /* *************************************** FORMS AND INPUT *************************************** */ label { font-weight: bold; - color:#333333; + color: #333333; font-size: 110%; } fieldset > div { @@ -421,7 +429,7 @@ input { font: 120% Arial, Helvetica, sans-serif; padding: 5px; border: 1px solid #ccc; - color:#666; + color: #666; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -432,11 +440,14 @@ input { .elgg-input-tags, .elgg-input-url, .elgg-input-plaintext { - width:98%; + width: 98%; } textarea { height: 100px; } +.elgg-input-thin { + width: 400px; +} input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel { font-size: 14px; font-weight: bold; @@ -476,6 +487,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover .elgg-button-action.elgg-state-disabled { background-color: #aaa; } + /* ************************************** DATE PICKER *************************************** */ @@ -546,6 +558,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover color: #333; background: #ddd; } + /* *************************************** PAGINATION *************************************** */ @@ -571,7 +584,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover color: white; text-decoration: none; } - .elgg-pagination .elgg-state-disabled { color: #CCC; border-color: #CCC; @@ -636,7 +648,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover -moz-border-radius: 5px; border-radius: 5px; } - .elgg-admin-sidebar-menu a:hover { text-decoration: none; background: black; @@ -646,12 +657,10 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover .elgg-admin-sidebar-menu li.elgg-state-selected > a { background-color: #BBB; } - .elgg-admin-sidebar-menu .elgg-menu-closed:before { content: "\25B8"; padding-right: 4px; } - .elgg-admin-sidebar-menu .elgg-menu-opened:before { content: "\25BE"; padding-right: 4px; @@ -676,7 +685,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover .elgg-menu-title { float: right; } - .elgg-menu-title > li { display: inline-block; margin-left: 4px; @@ -685,12 +693,13 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover /* *************************************** FOOTER MENU *************************************** */ -.elgg-menu-footer {color:gray} - +.elgg-menu-footer { + color: gray; +} .elgg-menu-footer li { float: left; } -.elgg-menu-footer li:after{ +.elgg-menu-footer li:after { content: "\007C"; display: inline-block; padding: 0 4px 0 4px; @@ -750,8 +759,8 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover .elgg-menu-hz > li, .elgg-menu-hz > li:after, .elgg-menu-hz > li > a { - display:inline-block; - vertical-align:middle; + display: inline-block; + vertical-align: middle; } /* Allow inline image blocks in horizontal menus */ .elgg-menu-hz .elgg-body:after { @@ -766,6 +775,19 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover .elgg-menu-longtext { float: right; } +.elgg-menu-metadata { + list-style-type: none; + 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: #aaa; +} /* *************************************** WIDGETS @@ -926,23 +948,8 @@ a.elgg-widget-collapsed:before { width: 83.33%; } - -.elgg-subtext { - color: #666; - font-size: 85%; - line-height: 1.2em; - font-style: italic; - margin-bottom: 5px; -} - -.elgg-longtext-control { - margin-left: 14px; - font-size: 80%; - cursor: pointer; -} - /* *************************************** - Spacing (from OOCSS) + SPACING (from OOCSS) *************************************** */ .pan{padding:0} .pas{padding:5px} @@ -1156,94 +1163,32 @@ a.elgg-widget-collapsed:before { height: 200px; } - -.elgg-menu-metadata { - list-style-type: none; - float: right; - margin-left: 15px; - font-size: 90%; -} -.elgg-menu-metadata > li { - float: left; - margin-left: 15px; -} - -.right {float:right} -.elgg-toggle {cursor:pointer} - - -.elgg-state-draggable .elgg-head { - cursor: move; -} - /* *************************************** - ADMIN MISC -*************************************** */ - -.elgg-instructs { - max-width: 600px; -} - -.manifest_file { - background-color:#eee; - - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - - padding:5px 10px; - margin:4px 0; -} - - -.plugin_controls { - padding: 3px 3px 3px 0; - font-weight: bold; - float: left; - width: 150px; -} -form.admin_plugins_simpleview .elgg-button-submit { - margin-right:20px; -} -.plugin_info { - margin: 3px; - padding-left: 150px; - display: block; -} -.plugin_metadata { - display:block; - color:#999; -} -.plugin_name input[type="checkbox"] { - margin-right: 10px; -} -ul.admin_plugins { - margin-bottom: 0; - padding-left: 0; - list-style: none; -} + PLUGINS +**************************************** */ .elgg-plugin { - border:1px solid #999; - margin:0 0 5px; - padding:0 7px 4px 10px; + border: 1px solid #999; + margin: 0 0 5px; + padding: 0 7px 4px 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; } - +.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head { + cursor: move; +} .elgg-plugin p { - margin:0; - padding:0; + margin: 0; } .elgg-plugin h3 { - color:black; + color: black; padding-bottom: 10px; } -.plugin_settings { +.elgg-plugin-settings { font-weight: normal; + font-size: 0.9em; } - .elgg-plugin-screenshot { display: inline; } @@ -1263,64 +1208,43 @@ ul.admin_plugins { border-radius: 8px; } .elgg-plugin-screenshot-lightbox h2 { - color:black; + color: black; } - .elgg-plugin.elgg-state-active { background: white; } .elgg-plugin.elgg-state-inactive { background: #dedede; } - -.elgg-state-error { +.elgg-plugin .elgg-state-error { background: #fbe3e4; color: #8a1f11; border-color: #fbc2c4; font-weight: bold; } -.elgg-state-warning { +.elgg-plugin .elgg-state-warning { background: #fbedb5; color: #000000; border-color: #fbe58b; font-weight: bold; } +.elgg-plugin-more { + background-color: #eee; -.admin_notices { - padding-bottom: 15px; -} -.admin_notices p { - background-color:#BDE5F8; - color: black; - border: 1px solid blue; - font-weight: bold; - padding: 3px 0px 3px 10px; - - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.admin_notices a { - float: right; -} + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; -.add-user form { - width:300px; + padding: 5px 10px; + margin: 4px 0; } /**************************************** - Markdown Text + MARKDOWN ****************************************/ - .elgg-markdown { margin: 15px; } - .elgg-markdown h1, .elgg-markdown h2, .elgg-markdown h3, @@ -1330,17 +1254,46 @@ ul.admin_plugins { margin: 1em 0 1em -15px; color: #333; } - .elgg-markdown ol { list-style: decimal; padding-left: 2em; } - .elgg-markdown ul { list-style: disc; padding-left: 2em; } - .elgg-markdown p { margin: 15px 0; -} \ No newline at end of file +} + +/* *************************************** + MISC +*************************************** */ +.elgg-content-thin { + max-width: 600px; +} + +.elgg-subtext { + color: #666; + font-size: 85%; + line-height: 1.2em; + font-style: italic; + margin-bottom: 5px; +} + +.elgg-longtext-control { + margin-left: 14px; + font-size: 80%; + cursor: pointer; +} + +table.mceLayout { + width:100% !important; +} + +.elgg-output dt { + font-weight: bold; +} +.elgg-output dd { + margin: 0 0 1em 2em; +} diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index 08da89c01..5f54dd614 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -207,7 +207,7 @@ $settings_view_old = 'settings/' . $plugin->getID() . '/edit'; $settings_view_new = 'plugins/' . $plugin->getID() . '/settings'; if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)) { $link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID(); - $settings_link = "[" . elgg_echo('settings') . "]"; + $settings_link = "[" . elgg_echo('settings') . "]"; } ?>
@@ -233,8 +233,8 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new) } ?> -
-

+
+

@@ -248,7 +248,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
-