From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Mar 2010 17:53:05 +0000 Subject: Pulled in the interface changes. git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/icon/user/default/large.php | 3 + .../views/default/icon/user/default/master.php | 3 + .../views/default/icon/user/default/medium.php | 3 + .../views/default/icon/user/default/small.php | 3 + .../views/default/icon/user/default/tiny.php | 3 + .../views/default/icon/user/default/topbar.php | 3 + .../views/default/js/jquery.imgareaselect-0.8.js | 635 +++++++++++++++++++++ .../default/js/jquery.imgareaselect-0.8.min.js | 1 + mod/profile/views/default/profile/css.php | 124 ++++ mod/profile/views/default/profile/edit.php | 67 +++ .../views/default/profile/editdefaultprofile.php | 35 ++ mod/profile/views/default/profile/editicon.php | 149 +++++ mod/profile/views/default/profile/gallery.php | 47 ++ mod/profile/views/default/profile/hoverover.php | 26 + mod/profile/views/default/profile/icon.php | 92 +++ mod/profile/views/default/profile/javascript.php | 138 +++++ mod/profile/views/default/profile/listing.php | 57 ++ mod/profile/views/default/profile/menu/actions.php | 29 + .../views/default/profile/menu/adminlinks.php | 40 ++ .../views/default/profile/menu/adminwrapper.php | 11 + mod/profile/views/default/profile/menu/links.php | 36 ++ .../views/default/profile/menu/linksownpage.php | 33 ++ mod/profile/views/default/profile/metatags.php | 21 + mod/profile/views/default/profile/profilelinks.php | 50 ++ mod/profile/views/default/profile/submenu.php | 22 + mod/profile/views/default/profile/userdetails.php | 174 ++++++ .../river/user/default/profileiconupdate.php | 12 + .../default/river/user/default/profileupdate.php | 10 + 28 files changed, 1827 insertions(+) create mode 100644 mod/profile/views/default/icon/user/default/large.php create mode 100644 mod/profile/views/default/icon/user/default/master.php create mode 100644 mod/profile/views/default/icon/user/default/medium.php create mode 100644 mod/profile/views/default/icon/user/default/small.php create mode 100644 mod/profile/views/default/icon/user/default/tiny.php create mode 100644 mod/profile/views/default/icon/user/default/topbar.php create mode 100644 mod/profile/views/default/js/jquery.imgareaselect-0.8.js create mode 100644 mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js create mode 100644 mod/profile/views/default/profile/css.php create mode 100644 mod/profile/views/default/profile/edit.php create mode 100644 mod/profile/views/default/profile/editdefaultprofile.php create mode 100644 mod/profile/views/default/profile/editicon.php create mode 100644 mod/profile/views/default/profile/gallery.php create mode 100644 mod/profile/views/default/profile/hoverover.php create mode 100644 mod/profile/views/default/profile/icon.php create mode 100644 mod/profile/views/default/profile/javascript.php create mode 100644 mod/profile/views/default/profile/listing.php create mode 100644 mod/profile/views/default/profile/menu/actions.php create mode 100644 mod/profile/views/default/profile/menu/adminlinks.php create mode 100644 mod/profile/views/default/profile/menu/adminwrapper.php create mode 100644 mod/profile/views/default/profile/menu/links.php create mode 100644 mod/profile/views/default/profile/menu/linksownpage.php create mode 100644 mod/profile/views/default/profile/metatags.php create mode 100644 mod/profile/views/default/profile/profilelinks.php create mode 100644 mod/profile/views/default/profile/submenu.php create mode 100644 mod/profile/views/default/profile/userdetails.php create mode 100644 mod/profile/views/default/river/user/default/profileiconupdate.php create mode 100644 mod/profile/views/default/river/user/default/profileupdate.php (limited to 'mod/profile/views/default') diff --git a/mod/profile/views/default/icon/user/default/large.php b/mod/profile/views/default/icon/user/default/large.php new file mode 100644 index 000000000..3ce382532 --- /dev/null +++ b/mod/profile/views/default/icon/user/default/large.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/master.php b/mod/profile/views/default/icon/user/default/master.php new file mode 100644 index 000000000..7c5ea847c --- /dev/null +++ b/mod/profile/views/default/icon/user/default/master.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/medium.php b/mod/profile/views/default/icon/user/default/medium.php new file mode 100644 index 000000000..d5f6db343 --- /dev/null +++ b/mod/profile/views/default/icon/user/default/medium.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/small.php b/mod/profile/views/default/icon/user/default/small.php new file mode 100644 index 000000000..55f113c41 --- /dev/null +++ b/mod/profile/views/default/icon/user/default/small.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/tiny.php b/mod/profile/views/default/icon/user/default/tiny.php new file mode 100644 index 000000000..e47cdd3da --- /dev/null +++ b/mod/profile/views/default/icon/user/default/tiny.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/icon/user/default/topbar.php b/mod/profile/views/default/icon/user/default/topbar.php new file mode 100644 index 000000000..ad11588fa --- /dev/null +++ b/mod/profile/views/default/icon/user/default/topbar.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/mod/profile/views/default/js/jquery.imgareaselect-0.8.js b/mod/profile/views/default/js/jquery.imgareaselect-0.8.js new file mode 100644 index 000000000..456114755 --- /dev/null +++ b/mod/profile/views/default/js/jquery.imgareaselect-0.8.js @@ -0,0 +1,635 @@ +/* + * imgAreaSelect jQuery plugin + * version 0.8 + * + * Copyright (c) 2008-2009 Michal Wojciechowski (odyniec.net) + * + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://odyniec.net/projects/imgareaselect/ + * + */ + +(function($) { + +$.imgAreaSelect = { onKeyPress: null }; + +$.imgAreaSelect.init = function (img, options) { + var $img = $(img), imgLoaded, $box = $('
'), $area = $('
'), + $border1 = $('
'), $border2 = $('
'), $areaOpera, + $outLeft = $('
'), $outTop = $('
'), + $outRight = $('
'), $outBottom = $('
'), + $handles = $([]), handleWidth, handles = [ ], left, top, M = Math, + imgOfs, imgWidth, imgHeight, $parent, parOfs, + zIndex = 0, position = 'absolute', $p, startX, startY, + scaleX = 1, scaleY = 1, resizeMargin = 10, resize = [ ], V = 0, H = 1, + d, aspectRatio, x1, x2, y1, y2, x, y, adjusted, shown, i, + selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 }; + + var $o = $outLeft.add($outTop).add($outRight).add($outBottom); + + function viewX(x) + { + return x + imgOfs.left - parOfs.left; + } + + function viewY(y) + { + return y + imgOfs.top - parOfs.top; + } + + function selX(x) + { + return x - imgOfs.left + parOfs.left; + } + + function selY(y) + { + return y - imgOfs.top + parOfs.top; + } + + function evX(event) + { + return event.pageX - parOfs.left; + } + + function evY(event) + { + return event.pageY - parOfs.top; + } + + function trueSelection() + { + return { x1: M.round(selection.x1 * scaleX), + y1: M.round(selection.y1 * scaleY), + x2: M.round(selection.x2 * scaleX), + y2: M.round(selection.y2 * scaleY), + width: M.round(selection.x2 * scaleX) - M.round(selection.x1 * scaleX), + height: M.round(selection.y2 * scaleY) - M.round(selection.y1 * scaleY) }; + } + + function getZIndex() + { + $p = $img; + + while ($p.length && !$p.is('body')) { + if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex) + zIndex = $p.css('z-index'); + if ($p.css('position') == 'fixed') + position = 'fixed'; + + $p = $p.parent(); + } + + if (!isNaN(options.zIndex)) + zIndex = options.zIndex; + } + + function adjust() + { + imgOfs = { left: M.round($img.offset().left), top: M.round($img.offset().top) }; + imgWidth = $img.width(); + imgHeight = $img.height(); + + if ($().jquery == '1.3.2' && $.browser.safari && position == 'fixed') { + imgOfs.top += M.max(document.documentElement.scrollTop, $('body').scrollTop()); + imgOfs.left += M.max(document.documentElement.scrollLeft, $('body').scrollLeft()); + } + + parOfs = $.inArray($parent.css('position'), ['absolute', 'relative']) != -1 ? + { left: M.round($parent.offset().left) - $parent.scrollLeft(), + top: M.round($parent.offset().top) - $parent.scrollTop() } : + position == 'fixed' ? + { left: $(document).scrollLeft(), top: $(document).scrollTop() } : + { left: 0, top: 0 }; + + left = viewX(0); + top = viewY(0); + } + + function update(resetKeyPress) + { + if (!shown) return; + + $box.css({ + left: viewX(selection.x1) + 'px', top: viewY(selection.y1) + 'px', + width: selection.width + 'px', height: selection.height + 'px' + }); + $area.add($border1).add($border2).css({ + left: '0px', top: '0px', + width: M.max(selection.width - options.borderWidth * 2, 0) + 'px', + height: M.max(selection.height - options.borderWidth * 2, 0) + 'px' + }); + $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 }); + $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 }); + $border1.add($border2).css({ opacity: options.borderOpacity }); + $outLeft.css({ left: left + 'px', top: top + 'px', + width: selection.x1 + 'px', height: imgHeight + 'px' }); + $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px', + width: selection.width + 'px', height: selection.y1 + 'px' }); + $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px', + width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' }); + $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px', + width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' }); + + if (handles.length) { + handles[1].css({ left: selection.width - handleWidth + 'px' }); + handles[2].css({ left: selection.width - handleWidth + 'px', + top: selection.height - handleWidth + 'px' }); + handles[3].css({ top: selection.height - handleWidth + 'px' }); + + if (handles.length == 8) { + handles[4].css({ left: (selection.width - handleWidth) / 2 + 'px' }); + handles[5].css({ left: selection.width - handleWidth + 'px', + top: (selection.height - handleWidth) / 2 + 'px' }); + handles[6].css({ left: (selection.width - handleWidth) / 2 + 'px', + top: selection.height - handleWidth + 'px' }); + handles[7].css({ top: (selection.height - handleWidth) / 2 + 'px' }); + } + } + + if (resetKeyPress !== false) { + if ($.imgAreaSelect.keyPress != docKeyPress) + $(document).unbind($.imgAreaSelect.keyPress, + $.imgAreaSelect.onKeyPress); + + if (options.keys) + $(document).bind($.imgAreaSelect.keyPress, + $.imgAreaSelect.onKeyPress = docKeyPress); + } + + if ($.browser.msie && options.borderWidth == 1 && options.borderOpacity < 1) { + $border1.add($border2).css('margin', '0'); + setTimeout(function () { $border1.add($border2).css('margin', 'auto'); }, 0); + } + } + + function areaMouseMove(event) + { + if (!adjusted) { + adjust(); + adjusted = true; + + $box.one('mouseout', function () { adjusted = false; }); + } + + x = selX(evX(event)) - selection.x1; + y = selY(evY(event)) - selection.y1; + + resize = [ ]; + + if (options.resizable) { + if (y <= resizeMargin) + resize[V] = 'n'; + else if (y >= selection.height - resizeMargin) + resize[V] = 's'; + if (x <= resizeMargin) + resize[H] = 'w'; + else if (x >= selection.width - resizeMargin) + resize[H] = 'e'; + } + + $box.css('cursor', resize.length ? resize.join('') + '-resize' : + options.movable ? 'move' : ''); + if ($areaOpera) + $areaOpera.toggle(); + } + + function docMouseUp(event) + { + resize = [ ]; + + $('body').css('cursor', ''); + + if (options.autoHide || selection.width * selection.height == 0) + $box.add($o).hide(); + + options.onSelectEnd(img, trueSelection()); + + $(document).unbind('mousemove', selectingMouseMove); + $box.mousemove(areaMouseMove); + } + + function areaMouseDown(event) + { + if (event.which != 1) return false; + + adjust(); + + if (options.resizable && resize.length > 0) { + $('body').css('cursor', resize.join('') + '-resize'); + + x1 = viewX(selection[resize[H] == 'w' ? 'x2' : 'x1']); + y1 = viewY(selection[resize[V] == 'n' ? 'y2' : 'y1']); + + $(document).mousemove(selectingMouseMove) + .one('mouseup', docMouseUp); + $box.unbind('mousemove', areaMouseMove); + } + else if (options.movable) { + startX = left + selection.x1 - evX(event); + startY = top + selection.y1 - evY(event); + + $box.unbind('mousemove', areaMouseMove); + + $(document).mousemove(movingMouseMove) + .one('mouseup', function () { + options.onSelectEnd(img, trueSelection()); + + $(document).unbind('mousemove', movingMouseMove); + $box.mousemove(areaMouseMove); + }); + } + else + $img.mousedown(event); + + return false; + } + + function aspectRatioXY() + { + x2 = M.max(left, M.min(left + imgWidth, + x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1))); + y2 = M.round(M.max(top, M.min(top + imgHeight, + y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1)))); + x2 = M.round(x2); + } + + function aspectRatioYX() + { + y2 = M.max(top, M.min(top + imgHeight, + y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1))); + x2 = M.round(M.max(left, M.min(left + imgWidth, + x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1)))); + y2 = M.round(y2); + } + + function doResize() + { + if (options.minWidth && M.abs(x2 - x1) < options.minWidth) { + x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1); + + if (x2 < left) + x1 = left + options.minWidth; + else if (x2 > left + imgWidth) + x1 = left + imgWidth - options.minWidth; + } + + if (options.minHeight && M.abs(y2 - y1) < options.minHeight) { + y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1); + + if (y2 < top) + y1 = top + options.minHeight; + else if (y2 > top + imgHeight) + y1 = top + imgHeight - options.minHeight; + } + + x2 = M.max(left, M.min(x2, left + imgWidth)); + y2 = M.max(top, M.min(y2, top + imgHeight)); + + if (aspectRatio) + if (M.abs(x2 - x1) / aspectRatio > M.abs(y2 - y1)) + aspectRatioYX(); + else + aspectRatioXY(); + + if (options.maxWidth && M.abs(x2 - x1) > options.maxWidth) { + x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1); + if (aspectRatio) aspectRatioYX(); + } + + if (options.maxHeight && M.abs(y2 - y1) > options.maxHeight) { + y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1); + if (aspectRatio) aspectRatioXY(); + } + + selection = { x1: selX(M.min(x1, x2)), x2: selX(M.max(x1, x2)), + y1: selY(M.min(y1, y2)), y2: selY(M.max(y1, y2)), + width: M.abs(x2 - x1), height: M.abs(y2 - y1) }; + + update(); + + options.onSelectChange(img, trueSelection()); + } + + function selectingMouseMove(event) + { + x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2); + y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2); + + doResize(); + + return false; + } + + function doMove(newX1, newY1) + { + x2 = (x1 = newX1) + selection.width; + y2 = (y1 = newY1) + selection.height; + + selection = $.extend(selection, { x1: selX(x1), y1: selY(y1), + x2: selX(x2), y2: selY(y2) }); + + update(); + + options.onSelectChange(img, trueSelection()); + } + + function movingMouseMove(event) + { + x1 = M.max(left, M.min(startX + evX(event), left + imgWidth - selection.width)); + y1 = M.max(top, M.min(startY + evY(event), top + imgHeight - selection.height)); + + doMove(x1, y1); + + event.preventDefault(); + return false; + } + + function startSelection(event) + { + adjust(); + + x2 = x1; + y2 = y1; + doResize(); + + resize = [ ]; + + $box.add($o.is(':visible') ? null : $o).show(); + shown = true; + + $(document).unbind('mouseup', cancelSelection) + .mousemove(selectingMouseMove).one('mouseup', docMouseUp); + $box.unbind('mousemove', areaMouseMove); + + options.onSelectStart(img, trueSelection()); + } + + function cancelSelection() + { + $(document).unbind('mousemove', startSelection); + $box.add($o).hide(); + + selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 }; + + options.onSelectChange(img, selection); + options.onSelectEnd(img, selection); + } + + function imgMouseDown(event) + { + if (event.which != 1) return false; + + adjust(); + startX = x1 = evX(event); + startY = y1 = evY(event); + + $(document).one('mousemove', startSelection) + .one('mouseup', cancelSelection); + + return false; + } + + function parentScroll() + { + adjust(); + update(false); + x1 = viewX(selection.x1); y1 = viewY(selection.y1); + x2 = viewX(selection.x2); y2 = viewY(selection.y2); + } + + function imgLoad() + { + imgLoaded = true; + + if (options.show) { + shown = true; + adjust(); + update(); + $box.add($o).show(); + } + + $box.add($o).css({ visibility: '' }); + } + + var docKeyPress = function(event) { + var k = options.keys, d, t, key = event.keyCode || event.which; + + d = !isNaN(k.alt) && (event.altKey || event.originalEvent.altKey) ? k.alt : + !isNaN(k.ctrl) && event.ctrlKey ? k.ctrl : + !isNaN(k.shift) && event.shiftKey ? k.shift : + !isNaN(k.arrows) ? k.arrows : 10; + + if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) || + (k.ctrl == 'resize' && event.ctrlKey) || + (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey))) + { + switch (key) { + case 37: + d = -d; + case 39: + t = M.max(x1, x2); + x1 = M.min(x1, x2); + x2 = M.max(t + d, x1); + if (aspectRatio) aspectRatioYX(); + break; + case 38: + d = -d; + case 40: + t = M.max(y1, y2); + y1 = M.min(y1, y2); + y2 = M.max(t + d, y1); + if (aspectRatio) aspectRatioXY(); + break; + default: + return; + } + + doResize(); + } + else { + x1 = M.min(x1, x2); + y1 = M.min(y1, y2); + + switch (key) { + case 37: + doMove(M.max(x1 - d, left), y1); + break; + case 38: + doMove(x1, M.max(y1 - d, top)); + break; + case 39: + doMove(x1 + M.min(d, imgWidth - selX(x2)), y1); + break; + case 40: + doMove(x1, y1 + M.min(d, imgHeight - selY(y2))); + break; + default: + return; + } + } + + return false; + }; + + this.setOptions = function(newOptions) + { + if (newOptions.parent) + ($parent = $(newOptions.parent)).append($box.add($o)); + + adjust(); + getZIndex(); + + if (newOptions.x1 != null) { + selection = { x1: newOptions.x1, y1: newOptions.y1, + x2: newOptions.x2, y2: newOptions.y2 }; + newOptions.show = !newOptions.hide; + + x1 = viewX(selection.x1); y1 = viewY(selection.y1); + x2 = viewX(selection.x2); y2 = viewY(selection.y2); + selection.width = x2 - x1; + selection.height = y2 - y1; + } + + if (newOptions.handles != null) { + $handles.remove(); + $handles = $(handles = [ ]); + + i = newOptions.handles ? newOptions.handles == 'corners' ? 4 : 8 : 0; + + while (i--) + $handles = $handles.add(handles[i] = $('
')); + + handleWidth = 4 + options.borderWidth; + + $handles.css({ position: 'absolute', borderWidth: options.borderWidth + 'px', + borderStyle: 'solid', borderColor: options.borderColor1, + opacity: options.borderOpacity, backgroundColor: options.borderColor2, + width: handleWidth + 'px', height: handleWidth + 'px', + fontSize: '0px', zIndex: zIndex > 0 ? zIndex + 1 : '1' }) + .addClass(options.classPrefix + '-handle'); + + handleWidth += options.borderWidth * 2; + } + + update(); + + options = $.extend(options, newOptions); + + if (options.imageWidth || options.imageHeight) { + scaleX = (parseInt(options.imageWidth) || imgWidth) / imgWidth; + scaleY = (parseInt(options.imageHeight) || imgHeight) / imgHeight; + } + + if (newOptions.keys) + options.keys = $.extend({ shift: 1, ctrl: 'resize' }, + newOptions.keys === true ? { } : newOptions.keys); + + $o.addClass(options.classPrefix + '-outer'); + $area.addClass(options.classPrefix + '-selection'); + $border1.addClass(options.classPrefix + '-border1'); + $border2.addClass(options.classPrefix + '-border2'); + + $box.add($area).add($border1).add($border2).css({ borderWidth: options.borderWidth + 'px' }); + $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity }); + $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 }); + $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 }); + $border1.add($border2).css({ opacity: options.borderOpacity }); + $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor }); + + $box.append($area.add($border1).add($border2).add($handles).add($areaOpera)); + + if (newOptions.hide) + $box.add($o).hide(); + else if (newOptions.show && imgLoaded) { + shown = true; + update(); + $box.add($o).show(); + } + + aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ? + d[0] / d[1] : null; + + if (aspectRatio) + if (options.minWidth) + options.minHeight = parseInt(options.minWidth / aspectRatio); + else if (options.minHeight) + options.minWidth = parseInt(options.minHeight * aspectRatio); + + if (options.disable || options.enable === false) { + $box.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown); + $img.add($o).unbind('mousedown', imgMouseDown); + $(window).unbind('resize', parentScroll); + $img.add($img.parents()).unbind('scroll', parentScroll); + } + else if (options.enable || options.disable === false) { + if (options.resizable || options.movable) + $box.mousemove(areaMouseMove).mousedown(areaMouseDown); + + if (!options.persistent) + $img.add($o).mousedown(imgMouseDown); + $(window).resize(parentScroll); + $img.add($img.parents()).scroll(parentScroll); + } + + options.enable = options.disable = undefined; + }; + + if ($.browser.msie) + $img.attr('unselectable', 'on'); + + $.imgAreaSelect.keyPress = $.browser.msie || + $.browser.safari ? 'keydown' : 'keypress'; + + if ($.browser.opera) + ($areaOpera = $('
')) + .css({ zIndex: zIndex > 0 ? zIndex + 2 : '2' }); + + this.setOptions(options = $.extend({ + borderColor1: '#000', + borderColor2: '#fff', + borderWidth: 1, + borderOpacity: .5, + classPrefix: 'imgareaselect', + movable: true, + resizable: true, + selectionColor: '#fff', + selectionOpacity: 0, + outerColor: '#000', + outerOpacity: .4, + parent: 'body', + onSelectStart: function () {}, + onSelectChange: function () {}, + onSelectEnd: function () {} + }, options)); + + $box.add($o).css({ visibility: 'hidden', position: position, + overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' }); + $area.css({ borderStyle: 'solid' }); + $box.css({ position: position, zIndex: zIndex > 0 ? zIndex + 2 : '2' }); + $area.add($border1).add($border2).css({ position: 'absolute' }); + + img.complete || img.readyState == 'complete' || !$img.is('img') ? + imgLoad() : $img.one('load', imgLoad); +}; + +$.fn.imgAreaSelect = function (options) { + options = options || {}; + + this.each(function () { + if ($(this).data('imgAreaSelect')) + $(this).data('imgAreaSelect').setOptions(options); + else { + if (options.enable === undefined && options.disable === undefined) + options.enable = true; + + $(this).data('imgAreaSelect', new $.imgAreaSelect.init(this, options)); + } + }); + + return this; +}; + +})(jQuery); diff --git a/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js b/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js new file mode 100644 index 000000000..d9605de1d --- /dev/null +++ b/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js @@ -0,0 +1 @@ +(function($){$.imgAreaSelect={onKeyPress:null};$.imgAreaSelect.init=function(img,options){var $img=$(img),imgLoaded,$box=$('
'),$area=$('
'),$border1=$('
'),$border2=$('
'),$areaOpera,$outLeft=$('
'),$outTop=$('
'),$outRight=$('
'),$outBottom=$('
'),$handles=$([]),handleWidth,handles=[],left,top,M=Math,imgOfs,imgWidth,imgHeight,$parent,parOfs,zIndex=0,position='absolute',$p,startX,startY,scaleX=1,scaleY=1,resizeMargin=10,resize=[],V=0,H=1,d,aspectRatio,x1,x2,y1,y2,x,y,adjusted,shown,i,selection={x1:0,y1:0,x2:0,y2:0,width:0,height:0};var $o=$outLeft.add($outTop).add($outRight).add($outBottom);function viewX(x){return x+imgOfs.left-parOfs.left}function viewY(y){return y+imgOfs.top-parOfs.top}function selX(x){return x-imgOfs.left+parOfs.left}function selY(y){return y-imgOfs.top+parOfs.top}function evX(event){return event.pageX-parOfs.left}function evY(event){return event.pageY-parOfs.top}function trueSelection(){return{x1:M.round(selection.x1*scaleX),y1:M.round(selection.y1*scaleY),x2:M.round(selection.x2*scaleX),y2:M.round(selection.y2*scaleY),width:M.round(selection.x2*scaleX)-M.round(selection.x1*scaleX),height:M.round(selection.y2*scaleY)-M.round(selection.y1*scaleY)}}function getZIndex(){$p=$img;while($p.length&&!$p.is('body')){if(!isNaN($p.css('z-index'))&&$p.css('z-index')>zIndex)zIndex=$p.css('z-index');if($p.css('position')=='fixed')position='fixed';$p=$p.parent()}if(!isNaN(options.zIndex))zIndex=options.zIndex}function adjust(){imgOfs={left:M.round($img.offset().left),top:M.round($img.offset().top)};imgWidth=$img.width();imgHeight=$img.height();if($().jquery=='1.3.2'&&$.browser.safari&&position=='fixed'){imgOfs.top+=M.max(document.documentElement.scrollTop,$('body').scrollTop());imgOfs.left+=M.max(document.documentElement.scrollLeft,$('body').scrollLeft())}parOfs=$.inArray($parent.css('position'),['absolute','relative'])!=-1?{left:M.round($parent.offset().left)-$parent.scrollLeft(),top:M.round($parent.offset().top)-$parent.scrollTop()}:position=='fixed'?{left:$(document).scrollLeft(),top:$(document).scrollTop()}:{left:0,top:0};left=viewX(0);top=viewY(0)}function update(resetKeyPress){if(!shown)return;$box.css({left:viewX(selection.x1)+'px',top:viewY(selection.y1)+'px',width:selection.width+'px',height:selection.height+'px'});$area.add($border1).add($border2).css({left:'0px',top:'0px',width:M.max(selection.width-options.borderWidth*2,0)+'px',height:M.max(selection.height-options.borderWidth*2,0)+'px'});$border1.css({borderStyle:'solid',borderColor:options.borderColor1});$border2.css({borderStyle:'dashed',borderColor:options.borderColor2});$border1.add($border2).css({opacity:options.borderOpacity});$outLeft.css({left:left+'px',top:top+'px',width:selection.x1+'px',height:imgHeight+'px'});$outTop.css({left:left+selection.x1+'px',top:top+'px',width:selection.width+'px',height:selection.y1+'px'});$outRight.css({left:left+selection.x2+'px',top:top+'px',width:imgWidth-selection.x2+'px',height:imgHeight+'px'});$outBottom.css({left:left+selection.x1+'px',top:top+selection.y2+'px',width:selection.width+'px',height:imgHeight-selection.y2+'px'});if(handles.length){handles[1].css({left:selection.width-handleWidth+'px'});handles[2].css({left:selection.width-handleWidth+'px',top:selection.height-handleWidth+'px'});handles[3].css({top:selection.height-handleWidth+'px'});if(handles.length==8){handles[4].css({left:(selection.width-handleWidth)/2+'px'});handles[5].css({left:selection.width-handleWidth+'px',top:(selection.height-handleWidth)/2+'px'});handles[6].css({left:(selection.width-handleWidth)/2+'px',top:selection.height-handleWidth+'px'});handles[7].css({top:(selection.height-handleWidth)/2+'px'})}}if(resetKeyPress!==false){if($.imgAreaSelect.keyPress!=docKeyPress)$(document).unbind($.imgAreaSelect.keyPress,$.imgAreaSelect.onKeyPress);if(options.keys)$(document).bind($.imgAreaSelect.keyPress,$.imgAreaSelect.onKeyPress=docKeyPress)}if($.browser.msie&&options.borderWidth==1&&options.borderOpacity<1){$border1.add($border2).css('margin','0');setTimeout(function(){$border1.add($border2).css('margin','auto')},0)}}function areaMouseMove(event){if(!adjusted){adjust();adjusted=true;$box.one('mouseout',function(){adjusted=false})}x=selX(evX(event))-selection.x1;y=selY(evY(event))-selection.y1;resize=[];if(options.resizable){if(y<=resizeMargin)resize[V]='n';else if(y>=selection.height-resizeMargin)resize[V]='s';if(x<=resizeMargin)resize[H]='w';else if(x>=selection.width-resizeMargin)resize[H]='e'}$box.css('cursor',resize.length?resize.join('')+'-resize':options.movable?'move':'');if($areaOpera)$areaOpera.toggle()}function docMouseUp(event){resize=[];$('body').css('cursor','');if(options.autoHide||selection.width*selection.height==0)$box.add($o).hide();options.onSelectEnd(img,trueSelection());$(document).unbind('mousemove',selectingMouseMove);$box.mousemove(areaMouseMove)}function areaMouseDown(event){if(event.which!=1)return false;adjust();if(options.resizable&&resize.length>0){$('body').css('cursor',resize.join('')+'-resize');x1=viewX(selection[resize[H]=='w'?'x2':'x1']);y1=viewY(selection[resize[V]=='n'?'y2':'y1']);$(document).mousemove(selectingMouseMove).one('mouseup',docMouseUp);$box.unbind('mousemove',areaMouseMove)}else if(options.movable){startX=left+selection.x1-evX(event);startY=top+selection.y1-evY(event);$box.unbind('mousemove',areaMouseMove);$(document).mousemove(movingMouseMove).one('mouseup',function(){options.onSelectEnd(img,trueSelection());$(document).unbind('mousemove',movingMouseMove);$box.mousemove(areaMouseMove)})}else $img.mousedown(event);return false}function aspectRatioXY(){x2=M.max(left,M.min(left+imgWidth,x1+M.abs(y2-y1)*aspectRatio*(x2left+imgWidth)x1=left+imgWidth-options.minWidth}if(options.minHeight&&M.abs(y2-y1)top+imgHeight)y1=top+imgHeight-options.minHeight}x2=M.max(left,M.min(x2,left+imgWidth));y2=M.max(top,M.min(y2,top+imgHeight));if(aspectRatio)if(M.abs(x2-x1)/aspectRatio>M.abs(y2-y1))aspectRatioYX();else aspectRatioXY();if(options.maxWidth&&M.abs(x2-x1)>options.maxWidth){x2=x1-options.maxWidth*(x2options.maxHeight){y2=y1-options.maxHeight*(y2'));handleWidth=4+options.borderWidth;$handles.css({position:'absolute',borderWidth:options.borderWidth+'px',borderStyle:'solid',borderColor:options.borderColor1,opacity:options.borderOpacity,backgroundColor:options.borderColor2,width:handleWidth+'px',height:handleWidth+'px',fontSize:'0px',zIndex:zIndex>0?zIndex+1:'1'}).addClass(options.classPrefix+'-handle');handleWidth+=options.borderWidth*2}update();options=$.extend(options,newOptions);if(options.imageWidth||options.imageHeight){scaleX=(parseInt(options.imageWidth)||imgWidth)/imgWidth;scaleY=(parseInt(options.imageHeight)||imgHeight)/imgHeight}if(newOptions.keys)options.keys=$.extend({shift:1,ctrl:'resize'},newOptions.keys===true?{}:newOptions.keys);$o.addClass(options.classPrefix+'-outer');$area.addClass(options.classPrefix+'-selection');$border1.addClass(options.classPrefix+'-border1');$border2.addClass(options.classPrefix+'-border2');$box.add($area).add($border1).add($border2).css({borderWidth:options.borderWidth+'px'});$area.css({backgroundColor:options.selectionColor,opacity:options.selectionOpacity});$border1.css({borderStyle:'solid',borderColor:options.borderColor1});$border2.css({borderStyle:'dashed',borderColor:options.borderColor2});$border1.add($border2).css({opacity:options.borderOpacity});$o.css({opacity:options.outerOpacity,backgroundColor:options.outerColor});$box.append($area.add($border1).add($border2).add($handles).add($areaOpera));if(newOptions.hide)$box.add($o).hide();else if(newOptions.show&&imgLoaded){shown=true;update();$box.add($o).show()}aspectRatio=options.aspectRatio&&(d=options.aspectRatio.split(/:/))?d[0]/d[1]:null;if(aspectRatio)if(options.minWidth)options.minHeight=parseInt(options.minWidth/aspectRatio);else if(options.minHeight)options.minWidth=parseInt(options.minHeight*aspectRatio);if(options.disable||options.enable===false){$box.unbind('mousemove',areaMouseMove).unbind('mousedown',areaMouseDown);$img.add($o).unbind('mousedown',imgMouseDown);$(window).unbind('resize',parentScroll);$img.add($img.parents()).unbind('scroll',parentScroll)}else if(options.enable||options.disable===false){if(options.resizable||options.movable)$box.mousemove(areaMouseMove).mousedown(areaMouseDown);if(!options.persistent)$img.add($o).mousedown(imgMouseDown);$(window).resize(parentScroll);$img.add($img.parents()).scroll(parentScroll)}options.enable=options.disable=undefined};if($.browser.msie)$img.attr('unselectable','on');$.imgAreaSelect.keyPress=$.browser.msie||$.browser.safari?'keydown':'keypress';if($.browser.opera)($areaOpera=$('
')).css({zIndex:zIndex>0?zIndex+2:'2'});this.setOptions(options=$.extend({borderColor1:'#000',borderColor2:'#fff',borderWidth:1,borderOpacity:.5,classPrefix:'imgareaselect',movable:true,resizable:true,selectionColor:'#fff',selectionOpacity:0,outerColor:'#000',outerOpacity:.4,parent:'body',onSelectStart:function(){},onSelectChange:function(){},onSelectEnd:function(){}},options));$box.add($o).css({visibility:'hidden',position:position,overflow:'hidden',zIndex:zIndex>0?zIndex:'0'});$area.css({borderStyle:'solid'});$box.css({position:position,zIndex:zIndex>0?zIndex+2:'2'});$area.add($border1).add($border2).css({position:'absolute'});img.complete||img.readyState=='complete'||!$img.is('img')?imgLoad():$img.one('load',imgLoad)};$.fn.imgAreaSelect=function(options){options=options||{};this.each(function(){if($(this).data('imgAreaSelect'))$(this).data('imgAreaSelect').setOptions(options);else{if(options.enable===undefined&&options.disable===undefined)options.enable=true;$(this).data('imgAreaSelect',new $.imgAreaSelect.init(this,options))}});return this}})(jQuery); \ No newline at end of file diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php new file mode 100644 index 000000000..cf95d9bdb --- /dev/null +++ b/mod/profile/views/default/profile/css.php @@ -0,0 +1,124 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + +?> + +#profile_icon_wrapper { + float:left; +} + +.usericon { + position:relative; +} + +.avatar_menu_button { + width:15px; + height:15px; + position:absolute; + cursor:pointer; + display:none; + right:0; + bottom:0; +} +.avatar_menu_arrow { + background: url(_graphics/avatar_menu_arrows.gif) no-repeat left top; + width:15px; + height:15px; +} +.avatar_menu_arrow_on { + background: url(_graphics/avatar_menu_arrows.gif) no-repeat left -16px; + width:15px; + height:15px; +} +.avatar_menu_arrow_hover { + background: url(_graphics/avatar_menu_arrows.gif) no-repeat left -32px; + width:15px; + height:15px; +} +.usericon div.sub_menu { + display:none; + position:absolute; + padding:2px; + margin:0; + border-top:solid 1px #E5E5E5; + border-left:solid 1px #E5E5E5; + border-right:solid 1px #999999; + border-bottom:solid 1px #999999; + width:160px; + background:#FFFFFF; + text-align:left; +} +div.usericon a.icon img { + z-index:10; +} + +.usericon div.sub_menu a {margin:0;padding:2px;} +.usericon div.sub_menu a:link, +.usericon div.sub_menu a:visited, +.usericon div.sub_menu a:hover{ display:block;} +.usericon div.sub_menu a:hover{ background:#cccccc; text-decoration:none;} + +.usericon div.sub_menu h3 { + font-size:1.2em; + padding-bottom:3px; + border-bottom:solid 1px #dddddd; + color: #4690d6; + margin:0 !important; +} +.usericon div.sub_menu h3:hover { + +} + +.user_menu_addfriend, +.user_menu_removefriend, +.user_menu_profile, +.user_menu_friends, +.user_menu_friends_of, +.user_menu_blog, +.user_menu_file, +.user_menu_messages, +.user_menu_admin, +.user_menu_pages { + margin:0; + padding:0; +} +.user_menu_admin { + border-top:solid 1px #dddddd; +} +.user_menu_admin a { + color:red; +} +.user_menu_admin a:hover { + color:white !important; + background:red !important; +} + +.resetdefaultprofile { + padding:0 10px 0 10px; +} +.resetdefaultprofile input[type="submit"] { + background: #dedede; + border-color: #dedede; + color:#333333; +} +.resetdefaultprofile input[type="submit"]:hover { + background: red; + border-color: red; + color:white; +} + +/* Banned user */ +#profile_banned { + background-color:#FF8888; + border:3px solid #FF0000; + padding:2px; +} \ No newline at end of file diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php new file mode 100644 index 000000000..11e3c2997 --- /dev/null +++ b/mod/profile/views/default/profile/edit.php @@ -0,0 +1,67 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity + * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now + */ + +?> +
+
+ +profile) && sizeof($vars['config']->profile) > 0) + foreach($vars['config']->profile as $shortname => $valtype) { + if ($metadata = get_metadata_byname($vars['entity']->guid, $shortname)) { + if (is_array($metadata)) { + $value = ''; + foreach($metadata as $md) { + if (!empty($value)) $value .= ', '; + $value .= $md->value; + $access_id = $md->access_id; + } + } else { + $value = $metadata->value; + $access_id = $metadata->access_id; + } + } else { + $value = ''; + $access_id = ACCESS_DEFAULT; + } + +?> + +

+ + 'accesslevel['.$shortname.']', 'value' => $access_id)); ?> +

+ + + +

+ + " /> +

+ +
+
\ No newline at end of file diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php new file mode 100644 index 000000000..73f0a8783 --- /dev/null +++ b/mod/profile/views/default/profile/editdefaultprofile.php @@ -0,0 +1,35 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + + $label_text = elgg_echo('profile:label'); + $type_text = elgg_echo('profile:type'); + + $label_control = elgg_view('input/text', array('internalname' => 'label')); + $type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'options_values' => array( + 'text' => elgg_echo('text'), + 'longtext' => elgg_echo('longtext'), + 'tags' => elgg_echo('tags'), + 'url' => elgg_echo('url'), + 'email' => elgg_echo('email') + ))); + + $submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('save'), 'value' => elgg_echo('save'))); + + $formbody = <<< END +

$label_text: $label_control + $type_text: $type_control + $submit_control

+END; + echo "
"; + echo "

" . elgg_echo('profile:explainchangefields') . "

"; + echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault')); + echo "
"; +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php new file mode 100644 index 000000000..7731d9899 --- /dev/null +++ b/mod/profile/views/default/profile/editicon.php @@ -0,0 +1,149 @@ +profile, defined in profile/start.php for now + */ + + // user is passed to view and set by caller (normally the page editicon) + $currentuser = $vars['user']; + +?> + +
+ + +

+ +
+ + + getIcon('medium'); + echo "\"avatar\""; + + ?> + +
+ +
+
+ + +


+ + 'profileicon')); + ?> +
" /> +

+
+
+ +
+
+

+getIcon('master'); + +?> +

+ + +

+<?php echo elgg_echo(" /> +

+ +
+ +
+ + + + + + + " /> +
+ +
+
+ +
diff --git a/mod/profile/views/default/profile/gallery.php b/mod/profile/views/default/profile/gallery.php new file mode 100644 index 000000000..ffbabfc7d --- /dev/null +++ b/mod/profile/views/default/profile/gallery.php @@ -0,0 +1,47 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity + */ + + //grab the users status message with metadata 'state' set to current if it exists +/* if($get_status = get_entities_from_metadata("state", "current", "object", "status", $vars['entity']->guid)){ + + foreach($get_status as $s) { + $info = elgg_view("status/friends_view", array('entity' => $s)); + } + + } */ + + $icon = elgg_view( + "profile/icon", array( + 'entity' => $vars['entity'], + 'size' => 'medium', + ) + ); + + $banned = $vars['entity']->isBanned(); + + $rel = ""; + if (page_owner() == $vars['entity']->guid) + $rel = 'me'; + else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) + $rel = 'friend'; + + if (!$banned) + $info .= "

getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "

"; + else + $info .= "

" . $vars['entity']->name . "
".elgg_echo('profile:banned')."

"; + + // echo elgg_view_listing($icon, $info); + echo elgg_view('search/gallery_listing',array('icon' => $icon, 'info' => $info)); + +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/hoverover.php b/mod/profile/views/default/profile/hoverover.php new file mode 100644 index 000000000..678fbbada --- /dev/null +++ b/mod/profile/views/default/profile/hoverover.php @@ -0,0 +1,26 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + */ + +?> + +

+ name; ?> +

+ + \ No newline at end of file diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php new file mode 100644 index 000000000..3fd6ab87b --- /dev/null +++ b/mod/profile/views/default/profile/icon.php @@ -0,0 +1,92 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + * @uses $vars['size'] The size - small, medium or large. If none specified, medium is assumed. + */ + + // Get entity + if (empty($vars['entity'])) + $vars['entity'] = $vars['user']; + + if ($vars['entity'] instanceof ElggUser) { + + $name = htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); + $username = $vars['entity']->username; + + if ($icontime = $vars['entity']->icontime) { + $icontime = "{$icontime}"; + } else { + $icontime = "default"; + } + + // Get size + if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar'))) + $vars['size'] = "medium"; + + // Get any align and js + if (!empty($vars['align'])) { + $align = " align=\"{$vars['align']}\" "; + } else { + $align = ""; + } + + // Override + if (isset($vars['override']) && $vars['override'] == true) { + $override = true; + } else $override = false; + + if (!$override) { + +?> +
+
+ +
+

name; ?>

+ {$actions}
"; + + } + if ($vars['entity']->getGUID() == $vars['user']->getGUID()) { + echo elgg_view('profile/menu/linksownpage',$vars); + } else { + echo elgg_view('profile/menu/links',$vars); + } + } else { + echo elgg_view('profile/menu/links',$vars); + } + ?> +
+ isBanned())) { + ?> alt="name, ENT_QUOTES, 'UTF-8'); ?>" title="name, ENT_QUOTES, 'UTF-8'); ?>" /> +
+ + \ No newline at end of file diff --git a/mod/profile/views/default/profile/javascript.php b/mod/profile/views/default/profile/javascript.php new file mode 100644 index 000000000..f2ad4b74b --- /dev/null +++ b/mod/profile/views/default/profile/javascript.php @@ -0,0 +1,138 @@ + + +var submenuLayer = 1000; + +function setup_avatar_menu() { + + // avatar image menu link + $("div.usericon img").mouseover(function() { + // find nested avatar_menu_button and show + $(this.parentNode.parentNode).children(".avatar_menu_button").show(); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow"); + //$(this.parentNode.parentNode).css("z-index", submenuLayer); + }) + .mouseout(function() { + if($(this).parent().parent().find("div.sub_menu").css('display')!="block") { + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(this.parentNode.parentNode).children(".avatar_menu_button").hide(); + } + else { + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(this.parentNode.parentNode).children(".avatar_menu_button").show(); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow"); + } + }); + + + // avatar contextual menu + $(".avatar_menu_button img").click(function(e) { + + var submenu = $(this).parent().parent().find("div.sub_menu"); + + // close submenu if arrow is clicked & menu already open + if(submenu.css('display') == "block") { + //submenu.hide(); + } + else { + // get avatar dimensions + var avatar = $(this).parent().parent().parent().find("div.usericon"); + //alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() ); + + // move submenu position so it aligns with arrow graphic + if (e.pageX < 840) { // popup menu to left of arrow if we're at edge of page + submenu.css("top",(avatar.height()) + "px") + .css("left",(avatar.width()-15) + "px") + .fadeIn('normal'); + } + else { + submenu.css("top",(avatar.height()) + "px") + .css("left",(avatar.width()-166) + "px") + .fadeIn('normal'); + } + + // force z-index - workaround for IE z-index bug + avatar.css("z-index", submenuLayer); + avatar.find("a.icon img").css("z-index", submenuLayer); + submenu.css("z-index", submenuLayer+1); + + submenuLayer++; + + // change arrow to 'on' state + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on"); + } + + // hide any other open submenus and reset arrows + $("div.sub_menu:visible").not(submenu).hide(); + $(".avatar_menu_button").removeClass("avatar_menu_arrow"); + $(".avatar_menu_button").removeClass("avatar_menu_arrow_on"); + $(".avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(".avatar_menu_button").hide(); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").show(); + //alert("submenuLayer = " +submenu.css("z-index")); + }) + // hover arrow each time mouseover enters arrow graphic (eg. when menu is already shown) + .mouseover(function() { + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_hover"); + }) + // if menu not shown revert arrow, else show 'menu open' arrow + .mouseout(function() { + if($(this).parent().parent().find("div.sub_menu").css('display')!="block"){ + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow"); + } + else { + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow"); + $(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on"); + } + }); + + // hide avatar menu if click occurs outside of menu + // and hide arrow button + $(document).click(function(event) { + var target = $(event.target); + if (target.parents(".usericon").length == 0) { + $(".usericon div.sub_menu").fadeOut(); + $(".avatar_menu_button").removeClass("avatar_menu_arrow"); + $(".avatar_menu_button").removeClass("avatar_menu_arrow_on"); + $(".avatar_menu_button").removeClass("avatar_menu_arrow_hover"); + $(".avatar_menu_button").hide(); + } + }); + + +} + +$(document).ready(function() { + + setup_avatar_menu(); + +}); diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php new file mode 100644 index 000000000..cb65c93a6 --- /dev/null +++ b/mod/profile/views/default/profile/listing.php @@ -0,0 +1,57 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity + */ + + $icon = elgg_view( + "profile/icon", array( + 'entity' => $vars['entity'], + 'size' => 'small', + ) + ); + + $banned = $vars['entity']->isBanned(); + + // Simple XFN + $rel = ""; + if (page_owner() == $vars['entity']->guid) + $rel = 'me'; + else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) + $rel = 'friend'; + + if (!$banned) { + $info .= "

getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "

"; + //create a view that a status plugin could extend - in the default case, this is the wire + $info .= elgg_view("profile/status", array("entity" => $vars['entity'])); + + $location = $vars['entity']->location; + if (!empty($location)) { + $info .= "

" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "

"; + } + } + else + { + $info .= "

"; + if (isadminloggedin()) + $info .= "getUrl() . "\">"; + $info .= $vars['entity']->name; + if (isadminloggedin()) + $info .= ""; + $info .= "

"; + + //$info .= "

" . elgg_echo('profile:banned') . "

"; + + } + + echo elgg_view_listing($icon, $info); + +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/actions.php b/mod/profile/views/default/profile/menu/actions.php new file mode 100644 index 000000000..7ca1d84d5 --- /dev/null +++ b/mod/profile/views/default/profile/menu/actions.php @@ -0,0 +1,29 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + */ + + if (isloggedin()) { + if ($_SESSION['user']->getGUID() != $vars['entity']->getGUID()) { + + $ts = time(); + $token = generate_action_token($ts); + + if ($vars['entity']->isFriend()) { + echo "

getGUID()}&__elgg_token=$token&__elgg_ts=$ts\">" . elgg_echo("friend:remove") . "

"; + } else { + echo "

getGUID()}&__elgg_token=$token&__elgg_ts=$ts\">" . elgg_echo("friend:add") . "

"; + } + } + } + +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php new file mode 100644 index 000000000..7d0c24cb4 --- /dev/null +++ b/mod/profile/views/default/profile/menu/adminlinks.php @@ -0,0 +1,40 @@ +guid){ + + $ts = time(); + $token = generate_action_token($ts); + +?> + + isBanned()) { + echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$vars['url']}action/admin/user/ban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + } else { + echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$vars['url']}action/admin/user/unban?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + } + + echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$vars['url']}action/admin/user/delete?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + + echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$vars['url']}action/admin/user/resetpassword?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + + if (!$vars['entity']->admin) { + echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$vars['url']}action/admin/user/makeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + } else { + echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$vars['url']}action/admin/user/removeadmin?guid={$vars['entity']->guid}&__elgg_token=$token&__elgg_ts=$ts")); + } + } + } +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/adminwrapper.php b/mod/profile/views/default/profile/menu/adminwrapper.php new file mode 100644 index 000000000..2acbb35e8 --- /dev/null +++ b/mod/profile/views/default/profile/menu/adminwrapper.php @@ -0,0 +1,11 @@ +{$adminlinks}

"; + + } + +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/links.php b/mod/profile/views/default/profile/menu/links.php new file mode 100644 index 000000000..8aa5e1a1a --- /dev/null +++ b/mod/profile/views/default/profile/menu/links.php @@ -0,0 +1,36 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + */ + +?> + +

+ +

+ canEdit()) + { + ?> +

+ +

+ +

+ +

+

+ +

\ No newline at end of file diff --git a/mod/profile/views/default/profile/menu/linksownpage.php b/mod/profile/views/default/profile/menu/linksownpage.php new file mode 100644 index 000000000..08aece082 --- /dev/null +++ b/mod/profile/views/default/profile/menu/linksownpage.php @@ -0,0 +1,33 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + */ + +?> + canEdit()) + { + ?> +

+ +

+ +

+ +

+

+ +

+ \ No newline at end of file diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php new file mode 100644 index 000000000..a6981c4c9 --- /dev/null +++ b/mod/profile/views/default/profile/metatags.php @@ -0,0 +1,21 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + */ + + /* + * + */ + +?> + + + diff --git a/mod/profile/views/default/profile/profilelinks.php b/mod/profile/views/default/profile/profilelinks.php new file mode 100644 index 000000000..6f35620c6 --- /dev/null +++ b/mod/profile/views/default/profile/profilelinks.php @@ -0,0 +1,50 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. + */ + +?> + +isBanned(); + + // Allow menus if not banned or admin logged in + if ((!$banned) || (isadminloggedin())) + { + //check to see if the user is looking at their own profile + if ($_SESSION['user']->guid == page_owner()){ + + echo "
"; //start the wrapper div + echo elgg_view("profile/menu/actions",$vars);//grab action links such as make friend + echo elgg_view("profile/menu/linksownpage",$vars); // an different view for user's own profile + echo "
"; //close wrapper div + + } else { + + echo "
"; //start the wrapper div + echo elgg_view("profile/menu/actions",$vars); //grab action links such as make friend + echo elgg_view("profile/menu/links",$vars); //passive links to items such as user blog etc + echo "
"; //close wrapper div + + } + } + else + { // Some nice spacing + echo "
"; //start the wrapper div + echo "
"; //close wrapper div + } +?> \ No newline at end of file diff --git a/mod/profile/views/default/profile/submenu.php b/mod/profile/views/default/profile/submenu.php new file mode 100644 index 000000000..906200a00 --- /dev/null +++ b/mod/profile/views/default/profile/submenu.php @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php new file mode 100644 index 000000000..eb22a704a --- /dev/null +++ b/mod/profile/views/default/profile/userdetails.php @@ -0,0 +1,174 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] The user entity + */ + + if ($vars['full'] == true) { + $iconsize = "large"; + } else { + $iconsize = "medium"; + } + + // wrap all profile info + echo "
"; + +?> + + + + + + + + + + + + + + + +
+ +"; + + echo "
"; + // get the user's main profile picture + echo elgg_view( + "profile/icon", array( + 'entity' => $vars['entity'], + //'align' => "left", + 'size' => $iconsize, + 'override' => true, + ) + ); + + + echo "
"; + echo "
"; + // display relevant links + echo elgg_view("profile/profilelinks", array("entity" => $vars['entity'])); + + // close profile_info_column_left + echo ""; + +?> +		 + +
+ canEdit()) { + + ?> +

+ +

+ + + + + guid) + $rel = 'me'; + else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) + $rel = 'friend'; + + // display the users name + echo "

getUrl() . "\" rel=\"$rel\">" . $vars['entity']->name . "

"; + + //insert a view that can be extended + echo elgg_view("profile/status", array("entity" => $vars['entity'])); + + if ($vars['full'] == true) { + + ?> + profile) && sizeof($vars['config']->profile) > 0) + foreach($vars['config']->profile as $shortname => $valtype) { + if ($shortname != "description") { + $value = $vars['entity']->$shortname; + if (!empty($value)) { + + //This function controls the alternating class + $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + + ?> +

+ : + $vars['entity']->$shortname + ); + + if ($valtype == 'tags') { + $options['tag_names'] = $shortname; + } + + echo elgg_view("output/{$valtype}", $options); + + ?> + +

+ + +
+ +
+
+

+ + isBanned()) { ?> +
+ +
+ + + + $vars['entity']->description)); + //echo autop(filter_tags($vars['entity']->description)); + ?> + + + +
+ +
+ + + +
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php new file mode 100644 index 000000000..2aa0933b6 --- /dev/null +++ b/mod/profile/views/default/river/user/default/profileiconupdate.php @@ -0,0 +1,12 @@ +subject_guid); // $statement->getSubject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("profile:river:iconupdate"),$url); + $string .= "
"; + $string .= elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small', 'override' => 'true')); + $string .= "
"; +?> + + \ No newline at end of file diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php new file mode 100644 index 000000000..9b87d829f --- /dev/null +++ b/mod/profile/views/default/river/user/default/profileupdate.php @@ -0,0 +1,10 @@ +subject_guid); // $statement->getSubject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("profile:river:update"),$url); + +?> + + \ No newline at end of file -- cgit v1.2.3