r1569 - in xwiki/trunk/web/standard/src/main/webapp: templates tiny_mce_2/langs tiny_mce_2/themes/wikieditor tiny_mce_2/themes/wikieditor/css tiny_mce_2/themes/wikieditor/jscripts
Phung Hai Nam
namphunghai at users.forge.objectweb.org
Wed Nov 15 12:10:23 CET 2006
Author: namphunghai
Date: 2006-11-15 12:10:21 +0100 (Wed, 15 Nov 2006)
New Revision: 1569
Modified:
xwiki/trunk/web/standard/src/main/webapp/templates/listattachwysiwyg.vm
xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/langs/en.js
xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/css/editor_popup.css
xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts/link.js
xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/link.htm
Log:
Fixed XWiki-413 and Xwiki-416 for Wysiwyg editor 2.
Modified: xwiki/trunk/web/standard/src/main/webapp/templates/listattachwysiwyg.vm
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/templates/listattachwysiwyg.vm 2006-11-15 10:06:22 UTC (rev 1568)
+++ xwiki/trunk/web/standard/src/main/webapp/templates/listattachwysiwyg.vm 2006-11-15 11:10:21 UTC (rev 1569)
@@ -18,9 +18,4 @@
#set( $counter = $counter + 1)
#end
</table>
- </div>
- <div class="xwikidatafooter2">
- <div class="xwikidatafooter1"> </div>
- <div class="xwikidatafooter"> </div>
- </div>
</div>
\ No newline at end of file
Modified: xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/langs/en.js
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/langs/en.js 2006-11-15 10:06:22 UTC (rev 1568)
+++ xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/langs/en.js 2006-11-15 11:10:21 UTC (rev 1569)
@@ -22,9 +22,10 @@
focus_alert : 'A editor instance must be focused before using this command.',
edit_confirm : 'Do you want to use the WYSIWYG mode for this textarea?',
insert_link_title : 'Insert/edit link',
-link_wiki_tab : 'Wiki',
-link_web_tab : 'Web',
-link_attachments_tab : 'Attachment',
+link_wiki_tab : 'Wiki Page',
+link_web_tab : 'Web Link',
+link_attachments_tab : 'File Attachment',
+link_file_tab : 'File Link',
link_email_tab : 'Email',
link_text_title : 'Text',
link_space_title : 'Space',
@@ -35,6 +36,8 @@
link_wiki_recent_modified_tab : 'Recently Modified',
link_attach_title : 'Attachment title',
link_attachment_title : 'Attachment name',
+link_file_title : 'Link to',
+link_file_warning_title : 'You can select a file on a shared drive on your computer. Make sure that the file is accessible <br/> to other user from the same path (drive letter or windows shared drive)<br/>',
link_email_title : 'Email Address',
insert : 'Insert',
update : 'Update',
Modified: xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/css/editor_popup.css
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/css/editor_popup.css 2006-11-15 10:06:22 UTC (rev 1568)
+++ xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/css/editor_popup.css 2006-11-15 11:10:21 UTC (rev 1569)
@@ -15,40 +15,63 @@
td {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
+ font-size: 10px;
}
-input {
- background: #FFFFFF;
+select, textarea {
border: 1px solid #cccccc;
}
-td, input, select, textarea {
+input, select, textarea {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
}
-input, select, textarea {
- border: 1px solid #808080;
+.input_noborder {
+ border: 0px;
}
-.input_noborder {
- border: 0px solid #808080;
+input.radio {
+ border: 1px none #000000;
+ background-color: transparent;
+ vertical-align: middle;
}
+input.checkbox {
+ border: 1px none #000000;
+ background-color: transparent;
+ vertical-align: middle;
+}
+
#insert {
+ background: #FFFFFF;
+ border: 1px solid #cccccc;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
font-weight: bold;
}
#cancel {
- font-weight: bold;
+ background: #FFFFFF;
+ border: 1px solid #cccccc;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
}
#search {
- font-weight: bold;
+ background: #FFFFFF;
+ border: 1px solid #cccccc;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: bold;
}
#attachment {
+ background: #FFFFFF;
+ border: 1px solid #cccccc;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
font-weight: bold;
}
@@ -57,6 +80,12 @@
font-weight: bold;
}
+.message {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #FF0000;
+}
+
table.charmap {
border-style: solid;
border-width: 1px;
@@ -88,18 +117,6 @@
background-color: transparent;
}
-input.radio {
- border: 1px none #000000;
- background-color: transparent;
- vertical-align: middle;
-}
-
-input.checkbox {
- border: 1px none #000000;
- background-color: transparent;
- vertical-align: middle;
-}
-
.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
margin-left: 1px;
}
@@ -162,7 +179,7 @@
.tabs {
float: left;
width: 100%;
- line-height: normal;
+ line-height: normal;
font: bold 11px Verdana, sans-serif;
}
Modified: xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts/link.js
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts/link.js 2006-11-15 10:06:22 UTC (rev 1568)
+++ xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts/link.js 2006-11-15 11:10:21 UTC (rev 1569)
@@ -3,6 +3,7 @@
var href = tinyMCE.getWindowArg('href').toString();
document.forms[0].wiki_text.value = text;
document.forms[0].web_text.value = text;
+ document.forms[0].file_text.value = text;
document.forms[0].attach_text.value = text;
document.forms[0].email_text.value = text;
@@ -16,6 +17,13 @@
} else if (href.search(/mailto:(.*?)/gi) > -1) {
mcTabs.displayTab('email_tab','email_panel')
document.forms[0].email.value = href.replace(/mailto:/gi, "");
+ } else if (href.search(/file:(\/\/\/\/\/)(.*?)/gi) > -1) {
+ mcTabs.displayTab('file_tab','file_panel');
+ document.forms[0].filepath.value = href.replace(/file:(\/\/\/\/\/)/gi, "");
+ } else if (href.search(/file:(\/\/)(.*?)/gi) > -1) {
+ mcTabs.displayTab('file_tab','file_panel');
+ alert(href.replace(/file:(\/\/)/gi, ""));
+ document.forms[0].filepath.value = href.replace(/file:(\/\/)/gi, "");
} else {
mcTabs.displayTab('wiki_tab','wiki_panel');
var space = "", whref = href;
@@ -37,6 +45,7 @@
function insertLink() {
var wikiTabElm = document.getElementById("wiki_tab");
var webTabElm = document.getElementById("web_tab");
+ var fileTabElm = document.getElementById("file_tab");
var attachTabElm = document.getElementById("attachments_tab");
var emailTabElm = document.getElementById("email_tab");
var dummy;
@@ -57,7 +66,15 @@
var href = document.forms[0].attach.value;
var text = document.forms[0].attach_text.value;
tinyMCE.themes['wikieditor'].insertLink("wikiattachment:-:" + href, "", text, "", "", dummy, "");
-
+ } else if (fileTabElm.className == "current") {
+ var text = document.forms[0].file_text.value;
+ var href = document.forms[0].filepath.value;
+ var filepath="";
+ if (":" == href.charAt(href.indexOf("\\") - 1))
+ filepath = "file://" + href.replace(/\\/gi, "/");
+ else if (href.substring(0, 2) == "\\\\")
+ filepath = "file://///" + href.replace(/\\/gi, "/");
+ tinyMCE.themes['wikieditor'].insertLink(filepath, "", text, "", "", dummy, "");
} else if (emailTabElm.className == "current") {
var text = document.forms[0].email_text.value;
var email = document.forms[0].email.value;
Modified: xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/link.htm
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/link.htm 2006-11-15 10:06:22 UTC (rev 1568)
+++ xwiki/trunk/web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/link.htm 2006-11-15 11:10:21 UTC (rev 1569)
@@ -5,6 +5,7 @@
<script language="javascript" type="text/javascript" src="../../utils/form_utils.js"></script>
<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
<script language="javascript" type="text/javascript" src="jscripts/link.js"></script>
+ <link href="css/editor_popup.css" rel="stylesheet" type="text/css" />
<base target="_self" />
<script language="javascript">
var baseurl = tinyMCE.getParam("wiki_attach_path").toString();
@@ -142,15 +143,17 @@
</script>
</head>
<body id="link" onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">
- <p>
- <span class="title">{$lang_insert_link_title}</span>
- </p>
<form onsubmit="insertLink();return false;" action="#">
+ <div class="title">
+ {$lang_insert_link_title}
+ </div>
+ <br />
<div class="tabs">
<ul>
<li id="wiki_tab" class="current"><span><a href="javascript:mcTabs.displayTab('wiki_tab','wiki_panel');" onmousedown="return false;">{$lang_link_wiki_tab}</a></span></li>
+ <li id="attachments_tab"><span><a href="javascript:mcTabs.displayTab('attachments_tab','attachments_panel');" onmousedown="return false;">{$lang_link_attachments_tab}</a></span></li>
<li id="web_tab"><span><a href="javascript:mcTabs.displayTab('web_tab','web_panel');" onmousedown="return false;">{$lang_link_web_tab}</a></span></li>
- <li id="attachments_tab"><span><a href="javascript:mcTabs.displayTab('attachments_tab','attachments_panel');" onmousedown="return false;">{$lang_link_attachments_tab}</a></span></li>
+ <li id="file_tab"><span><a href="javascript:mcTabs.displayTab('file_tab','file_panel');" onmousedown="return false;">{$lang_link_file_tab}</a></span></li>
<li id="email_tab"><span><a href="javascript:mcTabs.displayTab('email_tab','email_panel');" onmousedown="return false;">{$lang_link_email_tab}</a></span></li>
</ul>
</div>
@@ -312,6 +315,32 @@
</table>
</div>
+ <div id="file_panel" class="panel">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td align="left" valign="middle">
+ <table border="0" cellpadding="4" cellspacing="0" width="200">
+ <tr>
+ <td nowrap="nowrap">{$lang_link_text_title} :</td>
+ <td align="left">
+ <input type="text" id="file_text" name="file_text" value="" style="width: 200px" />
+ </td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap">{$lang_link_file_title} :</td>
+ <td>
+ <input type="file" id="filepath" name="filepath" value="dfadsfasdf" size="32" />
+ </td>
+ </tr>
+ <tr>
+ <td nowrap="nowrap" colspan="2"><span class="message">{$lang_link_file_warning_title}</span></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
+
<div id="attachments_panel" class="panel">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
More information about the Xwiki-notifications
mailing list