summaryrefslogtreecommitdiffstats
path: root/redmine/public/javascripts
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2006-11-12 18:50:30 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2006-11-12 18:50:30 +0000
commit7136b85f21201b9611977ae4ff8004aeb1ba47bb (patch)
tree117bdb8bc48754c2e1a1cf82da894067144d4bb4 /redmine/public/javascripts
parent67070347686fb914f4ceb4eda298e2b4dd7495fa (diff)
downloadredmine-7136b85f21201b9611977ae4ff8004aeb1ba47bb.tar.gz
redmine-7136b85f21201b9611977ae4ff8004aeb1ba47bb.zip
* new report: project activity
* "start date" and "% done" fields added on issues * project calendar added * gantt chart added (exportable to pdf) * multiple file upload for issues attachments * user custom field displayed on account/show * default configuration improved (default roles, trackers, status, permissions and workflows) * fixed: project settings now displayed according to user's permissions git-svn-id: http://redmine.rubyforge.org/svn/trunk@44 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'redmine/public/javascripts')
-rw-r--r--redmine/public/javascripts/application.js1
-rw-r--r--redmine/public/javascripts/jstoolbar.js42
2 files changed, 21 insertions, 22 deletions
diff --git a/redmine/public/javascripts/application.js b/redmine/public/javascripts/application.js
index 3625914ab..46649130e 100644
--- a/redmine/public/javascripts/application.js
+++ b/redmine/public/javascripts/application.js
@@ -15,5 +15,6 @@ function addFileField() {
p = document.getElementById("attachments_p");
p.appendChild(document.createElement("br"));
+ p.appendChild(document.createElement("br"));
p.appendChild(f);
} \ No newline at end of file
diff --git a/redmine/public/javascripts/jstoolbar.js b/redmine/public/javascripts/jstoolbar.js
index ee7948bb6..cf9454619 100644
--- a/redmine/public/javascripts/jstoolbar.js
+++ b/redmine/public/javascripts/jstoolbar.js
@@ -20,6 +20,8 @@
* ***** END LICENSE BLOCK *****
*/
+/* Modified by JP LANG for textile formatting */
+
function jsToolBar(textarea) {
if (!document.createElement) { return; }
@@ -344,13 +346,13 @@ jsToolBar.prototype.elements.del = {
}
// quote
-jsToolBar.prototype.elements.quote = {
- type: 'button',
- title: 'Inline quote',
- fn: {
- wiki: function() { this.singleTag('{{','}}') }
- }
-}
+//jsToolBar.prototype.elements.quote = {
+// type: 'button',
+// title: 'Inline quote',
+// fn: {
+// wiki: function() { this.singleTag('{{','}}') }
+// }
+//}
// code
jsToolBar.prototype.elements.code = {
@@ -362,16 +364,16 @@ jsToolBar.prototype.elements.code = {
}
// spacer
-jsToolBar.prototype.elements.space1 = {type: 'space'}
+//jsToolBar.prototype.elements.space1 = {type: 'space'}
// br
-jsToolBar.prototype.elements.br = {
- type: 'button',
- title: 'Line break',
- fn: {
- wiki: function() { this.encloseSelection("%%%\n",'') }
- }
-}
+//jsToolBar.prototype.elements.br = {
+// type: 'button',
+// title: 'Line break',
+// fn: {
+// wiki: function() { this.encloseSelection("%%%\n",'') }
+// }
+//}
// spacer
jsToolBar.prototype.elements.space2 = {type: 'space'}
@@ -422,8 +424,7 @@ jsToolBar.prototype.elements.link = {
href = window.prompt(this.elements.link.href_prompt,href);
if (!href) { return false; }
- hreflang = window.prompt(this.elements.link.hreflang_prompt,
- hreflang);
+ hreflang = ""
return { href: this.stripBaseURL(href), hreflang: hreflang };
}
@@ -432,11 +433,8 @@ jsToolBar.prototype.elements.link = {
jsToolBar.prototype.elements.link.fn.wiki = function() {
var link = this.elements.link.prompt.call(this);
if (link) {
- var stag = '[';
- var etag = '|'+link.href;
- if (link.hreflang) { etag = etag+'|'+link.hreflang; }
- etag = etag+']';
-
+ var stag = '"';
+ var etag = '":'+link.href;
this.encloseSelection(stag,etag);
}
};