Index: lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp =================================================================== diff -u -red376d7ba9e60ab607761599bd56dcf7eb590c47 -rb78d62af292ea811fa83f646cf521f0160950c93 --- lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp (.../fck_wikilink.jsp) (revision ed376d7ba9e60ab607761599bd56dcf7eb590c47) +++ lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp (.../fck_wikilink.jsp) (revision b78d62af292ea811fa83f646cf521f0160950c93) @@ -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 =================================================================== diff -u -red376d7ba9e60ab607761599bd56dcf7eb590c47 -rb78d62af292ea811fa83f646cf521f0160950c93 --- lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js (.../fckplugin.js) (revision ed376d7ba9e60ab607761599bd56dcf7eb590c47) +++ lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js (.../fckplugin.js) (revision b78d62af292ea811fa83f646cf521f0160950c93) @@ -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 =================================================================== diff -u -r16ee266fef50cbbb388c55bd912fba51097c9f23 -rb78d62af292ea811fa83f646cf521f0160950c93 --- lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js (.../en.js) (revision 16ee266fef50cbbb388c55bd912fba51097c9f23) +++ lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js (.../en.js) (revision b78d62af292ea811fa83f646cf521f0160950c93) @@ -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 =================================================================== diff -u -red376d7ba9e60ab607761599bd56dcf7eb590c47 -rb78d62af292ea811fa83f646cf521f0160950c93 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java (.../WikiLinkHandlerServlet.java) (revision ed376d7ba9e60ab607761599bd56dcf7eb590c47) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java (.../WikiLinkHandlerServlet.java) (revision b78d62af292ea811fa83f646cf521f0160950c93) @@ -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) {