We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit d3215adf authored by Evan Prodromou's avatar Evan Prodromou

Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

parents 36b34ea8 47ae0e31

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -117,9 +117,9 @@ class AddpeopletagAction extends Action
$omb01 = Remote_profile::staticGet('id', $tagged_id);
if (!empty($omb01)) {
// TRANS: Client error displayed trying to tag an OMB 0.1 remote profile.
$this->clientError(_('You cannot tag an OMB 0.1'.
' remote profile with this action.'));
// TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
$this->clientError(_('You cannot list an OMB 0.1 '.
'remote profile with this action.'));
return false;
}
......@@ -145,24 +145,24 @@ class AddpeopletagAction extends Action
$user = User::staticGet('id', $id);
if ($user) {
$this->clientError(
// TRANS: Client error displayed when an unknown error occurs while tagging a user.
// TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
// TRANS: %s is a username.
sprintf(_('There was an unexpected error while tagging %s.'),
sprintf(_('There was an unexpected error while listing %s.'),
$user->nickname));
} else {
// TRANS: Client error displayed when an unknown error occurs while tagging a user.
// TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
// TRANS: %s is a profile URL.
$this->clientError(sprintf(_('There was a problem tagging %s. ' .
'The remote server is probably not responding correctly, ' .
'please try retrying later.'), $this->profile->profileurl));
$this->clientError(sprintf(_('There was a problem listing %s. ' .
'The remote server is probably not responding correctly. ' .
'Please try retrying later.'), $this->profile->profileurl));
}
return false;
}
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title after subscribing to a list.
$this->element('title', null, _('Subscribed'));
// TRANS: Title after adding a user to a list.
$this->element('title', null, _m('TITLE','Listed'));
$this->elementEnd('head');
$this->elementStart('body');
$unsubscribe = new UntagButton($this, $this->tagged, $this->peopletag);
......
......@@ -118,9 +118,9 @@ class RemovepeopletagAction extends Action
$omb01 = Remote_profile::staticGet('id', $tagged_id);
if (!empty($omb01)) {
// TRANS: Client error displayed when trying to (un)tag an OMB 0.1 remote profile.
$this->clientError(_('You cannot tag or untag an OMB 0.1'.
' remote profile with this action.'));
// TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
$this->clientError(_('You cannot (un)list an OMB 0.1 '.
'remote profile with this action.'));
return false;
}
......@@ -164,7 +164,7 @@ class RemovepeopletagAction extends Action
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title after removing a user from a list.
$this->element('title', null, _('Untagged'));
$this->element('title', null, _('Unlisted'));
$this->elementEnd('head');
$this->elementStart('body');
$unsubscribe = new TagButton($this, $this->tagged, $this->peopletag);
......
/**
* @license In-Field Label jQuery Plugin
* http://fuelyourcoding.com/scripts/infield.html
*
* Copyright (c) 2009-2010 Doug Neiner
* Dual licensed under the MIT and GPL licenses.
* Uses the same license as jQuery, see:
* http://docs.jquery.com/License
*
* @version 0.1.2
*/
(function ($) {
$.InFieldLabels = function (label, field, options) {
// To avoid scope issues, use 'base' instead of 'this'
// to reference this class from internal events and functions.
var base = this;
// Access to jQuery and DOM versions of each element
base.$label = $(label);
base.label = label;
base.$field = $(field);
base.field = field;
base.$label.data("InFieldLabels", base);
base.showing = true;
base.init = function () {
// Merge supplied options with default options
base.options = $.extend({}, $.InFieldLabels.defaultOptions, options);
// Check if the field is already filled in
if (base.$field.val() !== "") {
base.$label.hide();
base.showing = false;
}
base.$field.focus(function () {
base.fadeOnFocus();
}).blur(function () {
base.checkForEmpty(true);
}).bind('keydown.infieldlabel', function (e) {
// Use of a namespace (.infieldlabel) allows us to
// unbind just this method later
base.hideOnChange(e);
}).bind('paste', function (e) {
// Since you can not paste an empty string we can assume
// that the fieldis not empty and the label can be cleared.
base.setOpacity(0.0);
}).change(function (e) {
base.checkForEmpty();
}).bind('onPropertyChange', function () {
base.checkForEmpty();
});
};
// If the label is currently showing
// then fade it down to the amount
// specified in the settings
base.fadeOnFocus = function () {
if (base.showing) {
base.setOpacity(base.options.fadeOpacity);
}
};
base.setOpacity = function (opacity) {
base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration);
base.showing = (opacity > 0.0);
};
// Checks for empty as a fail safe
// set blur to true when passing from
// the blur event
base.checkForEmpty = function (blur) {
if (base.$field.val() === "") {
base.prepForShow();
base.setOpacity(blur ? 1.0 : base.options.fadeOpacity);
} else {
base.setOpacity(0.0);
}
};
base.prepForShow = function (e) {
if (!base.showing) {
// Prepare for a animate in...
base.$label.css({opacity: 0.0}).show();
// Reattach the keydown event
base.$field.bind('keydown.infieldlabel', function (e) {
base.hideOnChange(e);
});
}
};
base.hideOnChange = function (e) {
if (
(e.keyCode === 16) || // Skip Shift
(e.keyCode === 9) // Skip Tab
) {
return;
}
if (base.showing) {
base.$label.hide();
base.showing = false;