Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 8 Sep 2008 15:15:59 -0000 1.22 +++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml 24 Nov 2008 14:03:51 -0000 1.23 @@ -3,17 +3,13 @@ 12-Hour 24-Hour - Add - Add Column - add item Add the selected file Add the selected image Anyone on the Internet Anyone on this system ascending order Please choose a file to attach. - Link to an existing file - Click to save view + Choose File Choose Image CSV data @@ -52,10 +48,9 @@ Vertical Spacing URL Image URL - Insert File Insert Image - Insert Link Insert/Modify Link + Insert Wiki Link No alternate text specified. Please add one to increase accessability. No URL for Image specified. Open Folder @@ -69,7 +64,7 @@ Select Image or Upload File Upload Image Upload - Specify a File for Upload or select an image. + Specify a File for Upload Invalid choice Invalid currency Invalid decimal number @@ -80,24 +75,12 @@ Invalid natural number Invalid url Link Title - Link Url - Link to this url - View Deleted Check/uncheck all rows Check/uncheck this row, and select an action to perform below Dates must be formatted as: %format% The day must be between 1 and %maxdays% for the month of %month_pretty% - A filter applies a condition to a column. The data set is modified to only include the rows that satisfy the filter condition. Multiple filters can be applied to a data set. Applying a filter to a column and hiding that column in the data view will still limit the data set to the rows that satisfy the condition of the hidden column. -<br/><br/> -For example, consider a data set of the planets in the solar system. The columns are planet name, mass, diameter, orbit radius, distance from the sun, and number of moons. The mass, diameter and number of moons columns have filters so that you can apply conditions to the data set. You can add a filter to the diameter column to limit the planets to those with diameters greater than or equal to 7000 km. You can then add a filter to the number of moons column to further limit the planets to those with two or more moons. If you modify the view after applying the filters so that the planet name, mass and diameter columns display, the number of moons filter still applies so that data is also limited to the planets with two or more moons. No value supplied for %field_pretty% The %field_pretty% must be a non-negative integer - A view is a customized display of a data set. You can configure the display to include or hide columns, order the columns, sort the rows, and apply conditions (filters) to the columns. You can save new views and modify existing views. - -<br /> -<br /> - -For example, consider a data set of the planets in the solar system. The columns are planet name, mass, diameter, orbit radius, distance from the sun, and number of moons. You can create a view that displays only the planet name, mass and diameter by hiding the orbit radius, distance from the sun and number of moons columns. You can also sort the rows alphabetically by planet name and then reorder the columns so that the mass of the planet is displayed in the first column. You can also apply filters to the diameter and number of moons columns so that only the planets with diameter greater than or equal to 7000 km and two or more moons display. When specifying a non-zero page_size, you must also provide either page_query or page_query_name Meridian Minutes @@ -110,16 +93,12 @@ No %row_pretty_plural%. not ordered Only myself - Other Page Page Size Plain Text << Previous - x required Reverse the sort order of %label% - Save View - save view Seconds seconds Seconds must be between 0 and 59 @@ -129,14 +108,12 @@ Table Invalid number of arguments to tag handler. Error in parameter list - There was a problem with your submission. Please correct the highlighted portions below. This file can be reused by - This allows your file to be used in other contexts + This allows the file to be used in other contexts This group This image can be reused by This allows your image to be used in other contexts - Title - Upload a file to link to + Upload a New File Upload a New Image Year year Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v diff -u -r1.44 -r1.45 --- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 1 Oct 2008 22:23:52 -0000 1.44 +++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 24 Nov 2008 14:03:51 -0000 1.45 @@ -472,7 +472,7 @@ set ::acs_blank_master(xinha.plugins) [join $quoted ", "] set xinha_options "" - foreach e {width height folder_id fs_package_id script_dir file_types attach_parent_id} { + foreach e {width height folder_id fs_package_id script_dir file_types attach_parent_id wiki_p} { if {[info exists options($e)]} { append xinha_options "xinha_config.$e = '$options($e)';\n" } Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/Attic/oacs-fs.js,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.js 1 Oct 2008 22:25:33 -0000 1.4 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/oacs-fs.js 24 Nov 2008 14:03:51 -0000 1.5 @@ -14,11 +14,11 @@ OacsFs._pluginInfo = { name : "OacsFs", - version : "0.2", - developer : "Guenter Ernst", + version : "0.4", + developer : "Guenter Ernst, Gustaf Neumann", developer_url : "http://learn.wu-wien.ac.at", c_owner : "Guenter Ernst", - sponsor : "Wirtschaftsuniversit�t Wien", + sponsor : "Wirtschaftsuniversitaet Wien", sponsor_url : "http://www.wu-wien.ac.at", license : "htmlArea" }; @@ -29,16 +29,23 @@ var ArgsString = args[1].toString(); var additionalArgs = ArgsString.split(","); OacsFs.fs_package_id = this.editor.config.fs_package_id; + OacsFs.package_id = this.editor.config.package_id; OacsFs.folder_id = this.editor.config.folder_id; OacsFs.file_types = this.editor.config.file_types; OacsFs.script_dir = this.editor.config.script_dir; + OacsFs.wiki_p = this.editor.config.wiki_p; OacsFs.fullscreen_mode = additionalArgs[1]; if (typeof OacsFs.script_dir == "undefined") { - // if nothing is specified, use xowiki as a fallback + // if no script dir is specified, use xowiki as a fallback OacsFs.script_dir = "/xowiki"; } + if (OacsFs.wiki_p) { + // if wiki_p is specified, add inser-wlink to the list of icon buttons + OacsFs.btnList.push(["insert-wlink", "Insert Wiki Link"]); + } + var cfg = editor.config; var tt = OacsFs.I18N; var bl = OacsFs.btnList; @@ -65,6 +72,9 @@ case "LW-insert-image": cfg.addToolbarElement(id, "insertimage", +1); break; + case "LW-insert-wlink": + cfg.addToolbarElement(id, "createlink", +1); + break; } } @@ -87,6 +97,9 @@ case "LW-insert-image": this.insertImage(); break; + case "LW-insert-wlink": + this.insertWlink(); + break; case "LW-close": window.close(); break; @@ -304,3 +317,33 @@ } }, outparam); }; + +// Called when the user clicks on "InserWikiLink" button. +OacsFs.prototype.insertWlink = function(link) { + var editor = OacsFs.editor; // for nested functions + var PopupUrl = OacsFs.script_dir + "/xinha/insert-wlink?"; + + // Check, if we have a package_id. Without a package_id, we do not + // know from which directory we should list the wiki links. + + if (typeof OacsFs.package_id == "undefined" || !OacsFs.wiki_p) { + alert("One can only insert Wiki links from inside a Wiki"); + } else { + PopupUrl = PopupUrl + "&package_id=" + OacsFs.package_id; + Dialog(PopupUrl, function(page) { + if (!page) { // user must have pressed Cancel + return false; + } + + // If there is a selection, use the selection as label, + // otherwise use the title of the wiki page. + var selection = editor._getSelection(); + var label = selection != "" ? selection : page.label; + + // Insert the page name and the label in wiki syntax + editor.insertHTML("[[" + page.name + + ((label != "") ? ("|" + label) : "") + + "]]"); + },null); + } +} Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-wlink.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/img/insert-wlink.gif,v diff -u Binary files differ