Index: lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/wikilink/Attic/fck_wikilink.jsp,v diff -u -r1.1 -r1.2 --- lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp 15 May 2008 04:31:57 -0000 1.1 +++ lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp 21 May 2008 04:59:50 -0000 1.2 @@ -1,52 +1,52 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ page language="java" pageEncoding="UTF-8" + contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> - - - - - - - - - -
- + + + +
+ + + +
+ - + + + + + + + + + + +
- - - - - - - - - - - - - - - -
- - - -
- - - - - -
- - - - - -
-
+
- - +
+ + Index: lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/wikilink/Attic/fckplugin.js,v diff -u -r1.2 -r1.3 --- lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js 15 May 2008 04:31:57 -0000 1.2 +++ lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js 21 May 2008 04:59:50 -0000 1.3 @@ -1,5 +1,5 @@ // Register the related command. -FCKCommands.RegisterCommand( 'WikiLink', new FCKDialogCommand( 'WikiLink', FCKLang.WikiLinkDlgTitle, FCKPlugins.Items['wikilink'].Path + 'fck_wikilink.jsp', 300, 220 ) ) ; +FCKCommands.RegisterCommand( 'WikiLink', new FCKDialogCommand( 'WikiLink', FCKLang.WikiLinkDlgTitle, FCKPlugins.Items['wikilink'].Path + 'fck_wikilink.jsp', 1000, 720 ) ) ; // Create the "WikiLink" toolbar button. var oWikiLinkItem = new FCKToolbarButton( 'WikiLink', FCKLang.WikiLinkBtn ) ; Index: lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/wikilink/lang/Attic/en.js,v diff -u -r1.1 -r1.2 --- lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js 29 Apr 2008 02:06:03 -0000 1.1 +++ lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js 21 May 2008 04:59:50 -0000 1.2 @@ -1,8 +1,8 @@ FCKLang.WikiLinkBtn = 'Insert/Edit WikiLink' ; FCKLang.WikiLinkDlgTitle = 'WikiLink Properties' ; -FCKLang.WikiLinkText = 'Displayed Text:' ; +FCKLang.WikiLinkText = 'Link Alias:' ; FCKLang.WikiLinkExisting = 'Existing Wiki:' ; FCKLang.WikiLinkNew = 'New Wiki:' ; -FCKLang.WikiLinkErrNoName = 'Please enter the Displayed Text' ; +FCKLang.WikiLinkErrNoName = 'Please enter the Link Alias' ; FCKLang.WikiLinkErrNoWiki = 'Please specify which Wiki you would like to link to' ; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java,v diff -u -r1.1 -r1.2 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java 15 May 2008 04:31:56 -0000 1.1 +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java 21 May 2008 05:01:09 -0000 1.2 @@ -230,14 +230,16 @@ wikiUser = new WikiUser(user,null); } - message.setCreatedBy(wikiUser); - message.setModifiedBy(wikiUser); - + Message createdWiki; - Message createdWiki = wikiService.createRootTopic(wikiID, toolSessionID, message); - - return createURL(sessionMap.getSessionID(), createdWiki.getUid().toString(), createdWiki.getCreated().getTime()); + if(message != null){ + message.setCreatedBy(wikiUser); + message.setModifiedBy(wikiUser); + createdWiki = wikiService.createRootTopic(wikiID, toolSessionID, message); + return createURL(sessionMap.getSessionID(), createdWiki.getUid().toString(), createdWiki.getCreated().getTime()); + } + return null; // TODO: Handle null return value } public String createURL(String sessionID, String wikiID, long time) {