aboutsummaryrefslogtreecommitdiff
path: root/views/default/js
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
commit4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch)
tree969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default/js
parent57a217fd6b708844407486046a1faa23b46cac08 (diff)
downloadelgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz
elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/js')
-rw-r--r--views/default/js/initialise_elgg.php34
-rw-r--r--views/default/js/upload_js.php2
2 files changed, 30 insertions, 6 deletions
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 76937fe18..50aa8f5fd 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -1,9 +1,11 @@
$(document).ready(function () {
- // COLLAPSABLE WIDGETS (on Dashboard & Profile pages)
+ // COLLAPSABLE WIDGETS (on Dashboard? & Profile pages)
// toggle widget box contents
$('a.toggle_box_contents').bind('click', toggleContent);
+/* // replaced with elgg_slide_toggle
+ @todo - PH update new admin area and widget canvas with the new toggle function
// toggle widget box edit panel
$('a.toggle_box_edit_panel').click(function () {
$(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");
@@ -16,20 +18,23 @@ $(document).ready(function () {
return false;
});
- // toggle plugin's settings nad more info on admin tools admin
+ // toggle plugin's settings and more info on admin tools admin
$('a.pluginsettings_link').click(function () {
$(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");
return false;
});
+
$('a.manifest_details').click(function () {
$(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");
return false;
});
- // reusable generic hidden panel
+
+
$('a.collapsibleboxlink').click(function () {
$(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");
return false;
});
+*/
// WIDGET GALLERY EDIT PANEL
// Sortable widgets
@@ -42,6 +47,7 @@ $(document).ready(function () {
forcePlaceholderSize: true,
placeholder: 'ui-state-highlight',
cursor: 'move',
+ revert: true,
opacity: 0.9,
appendTo: 'body',
connectWith: els,
@@ -81,6 +87,24 @@ $(document).ready(function () {
}); /* end document ready function */
+// display & hide elgg system messages
+function elgg_system_message() {
+ $("#elgg_system_message").animate({opacity: 0.9}, 1000);
+ $("#elgg_system_message").animate({opacity: 0.9}, 5000);
+ $("#elgg_system_message").fadeOut('slow');
+
+ $("#elgg_system_message").click(function () {
+ $("#elgg_system_message").stop();
+ $("#elgg_system_message").fadeOut('slow');
+ return false;
+ });
+}
+
+// reusable slide in/out toggle function
+function elgg_slide_toggle(activateLink,parentElement,toggleElement) {
+ $(activateLink).closest(parentElement).find(toggleElement).animate({"height": "toggle"}, { duration: 400 });
+ return false;
+}
// List active widgets for each page column
function outputWidgetList(forElement) {
@@ -219,8 +243,8 @@ jQuery.cookie = function(name, value, options) {
}
};
-// ELGG TOOLBAR MENU
-$.fn.elgg_topbardropdownmenu = function(options) {
+// ELGG DROP DOWN MENU
+$.fn.elgg_dropdownmenu = function(options) {
options = $.extend({speed: 350}, options || {});
diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php
index cdd011729..83530d67a 100644
--- a/views/default/js/upload_js.php
+++ b/views/default/js/upload_js.php
@@ -45,7 +45,7 @@ function file_addtoform() {
var o,el;
o = document.getElementById('option_container');
title_label = "<?php echo elgg_echo("title"); ?>";
- bit = file_generate_bit(title_label,'title_','input-text','text',0);
+ bit = file_generate_bit(title_label,'title_','input_text','text',0);
o.appendChild(bit);
file_label = "<?php echo elgg_echo("file:file"); ?>";
bit = file_generate_bit(file_label,'upload_','input-file','file',30);