From 7c52743cc264e258d55c42dccde021b1032f2358 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 29 Sep 2011 20:56:34 -0400 Subject: Fixes #3666, #3748 distinct CSS for inline vs popup date picker and fixed position bug for prev/next links in header --- views/default/css/elements/forms.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'views') diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 1fced0196..bf5518b09 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -253,18 +253,26 @@ input[type="radio"] { **************************************** */ .ui-datepicker { margin-top: 3px; + width: 208px; background-color: white; border: 1px solid #0054A7; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; + overflow: hidden; + -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5); -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5); box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5); - overflow: hidden; +} +.ui-datepicker-inline { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .ui-datepicker-header { + position: relative; background: #4690D6; color: white; padding: 2px 0; -- cgit v1.2.3 From 150452e26d589bddcd74fa65a1b320f16574613c Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 29 Sep 2011 22:31:11 -0400 Subject: Fixes #3894 ui-datepicker should start out hidden --- views/default/css/elements/forms.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'views') diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index bf5518b09..83ec2f602 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -252,6 +252,8 @@ input[type="radio"] { DATE PICKER **************************************** */ .ui-datepicker { + display: none; + margin-top: 3px; width: 208px; background-color: white; -- cgit v1.2.3 From d50ec282fa3da9947968e959affd48825b2a7bbb Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 30 Sep 2011 17:03:51 -0400 Subject: Fixes #3904 action word should come first for encode_text parameter --- engine/lib/navigation.php | 2 +- mod/groups/start.php | 4 ++-- mod/likes/views/default/annotation/likes.php | 2 +- mod/messageboard/start.php | 2 +- mod/messages/views/default/object/messages.php | 2 +- views/default/core/friends/collection.php | 2 +- views/default/output/confirmlink.php | 12 ++++++------ 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'views') diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php index 27af26be2..778da94e9 100644 --- a/engine/lib/navigation.php +++ b/engine/lib/navigation.php @@ -393,7 +393,7 @@ function elgg_annotation_menu_setup($hook, $type, $return, $params) { 'href' => $url, 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false + 'encode_text' => false ); $return[] = ElggMenuItem::factory($options); } diff --git a/mod/groups/start.php b/mod/groups/start.php index 9e4694457..0425bdea6 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -435,7 +435,7 @@ function groups_annotation_menu_setup($hook, $type, $return, $params) { 'href' => $url, 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false + 'encode_text' => false ); $return[] = ElggMenuItem::factory($options); @@ -447,7 +447,7 @@ function groups_annotation_menu_setup($hook, $type, $return, $params) { 'name' => 'edit', 'href' => "#edit-annotation-$annotation->id", 'text' => elgg_echo('edit'), - 'text_encode' => false, + 'encode_text' => false, 'rel' => 'toggle', ); $return[] = ElggMenuItem::factory($options); diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php index e1ae20818..2dd01b6cd 100644 --- a/mod/likes/views/default/annotation/likes.php +++ b/mod/likes/views/default/annotation/likes.php @@ -31,7 +31,7 @@ if ($like->canEdit()) { 'href' => "action/likes/delete?annotation_id={$like->id}", 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false, + 'encode_text' => false, )); } diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php index 8a7f00958..0b0155069 100644 --- a/mod/messageboard/start.php +++ b/mod/messageboard/start.php @@ -150,7 +150,7 @@ function messageboard_annotation_menu_setup($hook, $type, $return, $params) { 'href' => $url, 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false + 'encode_text' => false ); $return[] = ElggMenuItem::factory($options); } diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index b2d127d85..b6f9ed6d5 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -69,7 +69,7 @@ $delete_link = elgg_view("output/confirmlink", array( 'href' => "action/messages/delete?guid=" . $message->getGUID(), 'text' => "", 'confirm' => elgg_echo('deleteconfirm'), - 'text_encode' => false, + 'encode_text' => false, )); $body = <<owner_guid == elgg_get_logged_in_user_guid()) { 'href' => 'action/friends/collections/delete?collection=' . $coll->id, 'class' => 'delete_collection', 'text' => elgg_view_icon('delete'), - 'text_encode' => false, + 'encode_text' => false, )); echo ""; } diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 31a34ae63..953c15f1b 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -6,16 +6,16 @@ * @package Elgg * @subpackage Core * - * @uses $vars['text'] The text of the link - * @uses $vars['href'] The address - * @uses $vars['title'] The title text (defaults to confirm text) - * @uses $vars['confirm'] The dialog text - * @uses $vars['text_encode'] Encode special characters? (false) + * @uses $vars['text'] The text of the link + * @uses $vars['href'] The address + * @uses $vars['title'] The title text (defaults to confirm text) + * @uses $vars['confirm'] The dialog text + * @uses $vars['encode_text'] Run $vars['text'] through htmlspecialchars() (false) */ $vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure')); $vars['rel'] = addslashes($vars['rel']); -$encode = elgg_extract('text_encode', $vars, false); +$encode = elgg_extract('encode_text', $vars, false); // always generate missing action tokens $vars['href'] = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href']), true); -- cgit v1.2.3 From d44a060c8b9dbd94919bcf0edcb4f794da63d094 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 30 Sep 2011 17:22:49 -0400 Subject: Fixes #3890 removed admin check in useradd form since it is only used by admins --- views/default/forms/useradd.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'views') diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php index 66f8846e2..4f337e4e4 100644 --- a/views/default/forms/useradd.php +++ b/views/default/forms/useradd.php @@ -17,10 +17,6 @@ if (elgg_is_sticky_form('useradd')) { } } -$admin_option = false; -if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) { - $admin_option = true; -} ?>

@@ -67,18 +63,15 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) { )); ?>
- +
"; echo elgg_view('input/checkboxes', array( 'name' => "admin", 'options' => array(elgg_echo('admin_option') => 1), 'value' => $admin, )); - echo "
"; -} ?> +
elgg_echo('register'))); ?> -- cgit v1.2.3 From a186ad16e258c6335e1757a20845c64056b87f15 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 1 Oct 2011 20:09:16 -0400 Subject: Fixes #3913 registering jquery.imgareaselect --- engine/lib/elgglib.php | 3 +++ views/default/forms/avatar/crop.php | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 7bdc5972a..c62175629 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2031,7 +2031,10 @@ function elgg_init() { elgg_register_js('elgg.userpicker', 'js/lib/userpicker.js'); elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js'); elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js'); + elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js'); + elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css'); + // Trigger the shutdown:system event upon PHP shutdown. register_shutdown_function('_elgg_shutdown_hook'); diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 9fcae25c4..b97db939c 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -5,6 +5,9 @@ * @uses $vars['entity'] */ +elgg_load_js('jquery.imgareaselect'); +elgg_load_css('jquery.imgareaselect'); + $master_image = $vars['entity']->getIconUrl('master'); ?> @@ -25,8 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create'))); ?>
- - -- cgit v1.2.3