projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill ugly symlinks from banana sources to include/banana.
[platal.git]
/
htdocs
/
javascript
/
xorg.js
diff --git
a/htdocs/javascript/xorg.js
b/htdocs/javascript/xorg.js
index
89c35b2
..
3e6779a
100644
(file)
--- a/
htdocs/javascript/xorg.js
+++ b/
htdocs/javascript/xorg.js
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-167,11
+167,7
@@
var __goodies_rss = {
{'url_prefix': 'http://add.my.yahoo.com/content?.intl=fr&url=',
'img': 'images/goodies/add-yahoo.gif',
'alt': 'Add to My Yahoo!',
{'url_prefix': 'http://add.my.yahoo.com/content?.intl=fr&url=',
'img': 'images/goodies/add-yahoo.gif',
'alt': 'Add to My Yahoo!',
- 'title': 'Ajouter à My Yahoo!'},
- {'url_prefix': 'http://www.newsgator.com/ngs/subscriber/subext.aspx?url=',
- 'img': 'images/goodies/add-newsgator.gif',
- 'alt': 'Subscribe in NewsGator Online',
- 'title': 'Ajouter à Newsgator'}
+ 'title': 'Ajouter à My Yahoo!'}
]
};
]
};
@@
-212,6
+208,7
@@
function auto_links() {
url = document.URL;
fqdn = url.replace(/^https?:\/\/([^\/]*)\/.*$/,'$1');
light = (url.indexOf('display=light') > url.indexOf('?'));
url = document.URL;
fqdn = url.replace(/^https?:\/\/([^\/]*)\/.*$/,'$1');
light = (url.indexOf('display=light') > url.indexOf('?'));
+ resource_page = (url.indexOf('rss') > -1 || url.indexOf('ical') > -1);
$("a,link").each(
function(i) {
$("a,link").each(
function(i) {
@@
-235,7
+232,7
@@
function auto_links() {
href = 'http://' + fqdn + '/' + href;
}
}
href = 'http://' + fqdn + '/' + href;
}
}
- if (this.nodeName.toLowerCase() == 'a') {
+ if (this.nodeName.toLowerCase() == 'a'
&& !resource_page
) {
if (rss && href.indexOf('prefs/rss') < 0 && (href.indexOf('xml') > -1 || href.indexOf('hash'))) {
goodiesPopup(this, __goodies_rss);
} else if (ical) {
if (rss && href.indexOf('prefs/rss') < 0 && (href.indexOf('xml') > -1 || href.indexOf('hash'))) {
goodiesPopup(this, __goodies_rss);
} else if (ical) {
@@
-262,12
+259,12
@@
function auto_links() {
// {{{ function checkPassword
// {{{ function checkPassword
-function getType(c
har
) {
- if (c
har >= 'a' && char
<= 'z') {
+function getType(c) {
+ if (c
>= 'a' && c
<= 'z') {
return 1;
return 1;
- } else if (c
har >= 'A' && char
<= 'Z') {
+ } else if (c
>= 'A' && c
<= 'Z') {
return 2;
return 2;
- } else if (c
har >= '0' && char
<= '9') {
+ } else if (c
>= '0' && c
<= '9') {
return 3;
} else {
return 4;
return 3;
} else {
return 4;
@@
-322,7
+319,7
@@
function checkPassword(box, okLabel) {
}, 750)
.parent().stop()
.animate({ backgroundColor: bgcolor }, 750);
}, 750)
.parent().stop()
.animate({ backgroundColor: bgcolor }, 750);
- var submitButton = $(":submit[
@
name='" + passwordprompt_submit + "']");
+ var submitButton = $(":submit[name='" + passwordprompt_submit + "']");
if (ok && pass.length >= 6) {
submitButton.attr("value", okLabel);
submitButton.removeAttr("disabled");
if (ok && pass.length >= 6) {
submitButton.attr("value", okLabel);
submitButton.removeAttr("disabled");