[kupu-checkins] r43895 - in kupu/trunk/kupu: common default plone/kupu_plone_layer
duncan at codespeak.net
duncan at codespeak.net
Wed May 30 15:42:41 CEST 2007
Author: duncan
Date: Wed May 30 15:42:40 2007
New Revision: 43895
Modified:
kupu/trunk/kupu/common/kupudrawers.js
kupu/trunk/kupu/common/kupudrawerstyles.css
kupu/trunk/kupu/default/drawers.kupu
kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Added a preview watermark to external link drawer.
Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js (original)
+++ kupu/trunk/kupu/common/kupudrawers.js Wed May 30 15:42:40 2007
@@ -115,7 +115,7 @@
};
proto.initMask = function(el) {
- var e = this.maskframe = document.getElementById('kupu-maskframe');
+ var e = (this.maskframe = document.getElementById('kupu-maskframe'));
if (!this.maskframe) {
e = this.maskframe = newElement('iframe',
{'id':'kupu-maskframe','src':"javascript:false;", 'frameBorder':"0", 'scrolling':"no" });
@@ -317,6 +317,7 @@
var input = getBaseTagClass(this.element, 'input', 'kupu-linkdrawer-input');
var embed = getBaseTagClass(this.element, 'textarea', 'kupu-embed-input');
var preview = getBaseTagClass(this.element, 'iframe', 'kupu-linkdrawer-preview');
+ var watermark = getBaseTagClass(this.element, 'div', 'watermark');
this.anchorframe = preview;
this.anchorui = getBaseTagClass(this.element, 'tr', 'kupu-linkdrawer-anchors');
this.target = '';
@@ -406,17 +407,32 @@
};
this.preview = function() {
if (this.getMode()) {
- preview.src = input.value;
- this.showAnchors(currentAnchor());
- if (this.editor.getBrowserName() == 'IE') {
- preview.width = "800";
- preview.height = "365";
- preview.style.zoom = "60%";
- };
+ var ok = false;
+ watermark.style.display='';
+ if (/^http(s?):\x2f\x2f./.test(input.value)) {
+ try {
+ preview.src = input.value;
+ ok = true;
+ } catch(e) { alert('Preview blew up"'+input.value+'"');};
+ } else {
+ preview.src = '';
+ if (input.value.strip()) {
+ alert(_('Can only preview web urls'));
+ }
+ }
+ if (ok) {
+ this.showAnchors(currentAnchor());
+ if (this.editor.getBrowserName() == 'IE') {
+ preview.width = "800";
+ preview.height = "365";
+ preview.style.zoom = "60%";
+ };
+ }
};
};
this.preview_loaded = function() {
+ watermark.style.display = (/^http(s?):\x2f\x2f./.test(input.value))?'none':'';
var here = input.value;
try {
var there = preview.contentWindow.location.href;
@@ -1700,14 +1716,14 @@
/* Function to suppress enter key in drawers */
function HandleDrawerEnter(event, clickid) {
- var key;
event = event || window.event;
- key = event.which || event.keyCode;
-
+ var key = event.which || event.keyCode;
+ var target = event.currentTarget || event.srcElement;
+ var button;
if (key==13) {
if (clickid) {
- var button = document.getElementById(clickid);
- if (button) {
+ button = document.getElementById(clickid);
+ if (button && !button.disabled) {
button.click();
}
}
@@ -1718,3 +1734,5 @@
}
return true;
}
+
+
Modified: kupu/trunk/kupu/common/kupudrawerstyles.css
==============================================================================
--- kupu/trunk/kupu/common/kupudrawerstyles.css (original)
+++ kupu/trunk/kupu/common/kupudrawerstyles.css Wed May 30 15:42:40 2007
@@ -285,7 +285,17 @@
.kupu-linkdrawer-addlink .kupu-embed,
.kupu-linkdrawer-embed .kupu-addlink { display: none; }
-
+.kupu-linkdrawer-addlink .watermark {
+ position: relative;
+ text-align:center;
+ top: 98px;
+ font-size: 20pt;
+}
+.kupu-linkdrawer-addlink .watermark span {
+ background-color: white;
+ opacity:0.5;
+ filter:alpha(opacity=50);
+}
.kupu-ins-bm #kupu-bm-sel2, .kupu-ins-bm .kupu-bm-heading,
.kupu-ins-bm .kupu-bm-helptoc,.kupu-toc .kupu-bm-helpanchor,
.image-dimensions {
Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu (original)
+++ kupu/trunk/kupu/default/drawers.kupu Wed May 30 15:42:40 2007
@@ -62,7 +62,7 @@
</span>
</div>
<input class="kupu-toolbox-st kupu-linkdrawer-input" type="text"
- onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" />
+ onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
</td>
<td class="kupu-preview-button">
<button class="kupu-dialog-button"
@@ -78,6 +78,7 @@
</td>
</tr>
<tr><td colspan="2" align="center">
+ <div class="watermark"><span i18n:translate="">Preview</span></div>
<iframe frameborder="1" scrolling="auto" width="440" height="198"
class="kupu-linkdrawer-preview" src="javascript:''">
</iframe>
Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html (original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html Wed May 30 15:42:40 2007
@@ -16,7 +16,7 @@
<!--$Id: toolboxes.kupu 37754 2007-02-01 17:24:29Z yuppie $-->
<!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
<!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
- <!--$Id: drawers.kupu 43612 2007-05-25 09:16:10Z duncan $-->
+ <!--$Id: drawers.kupu 43634 2007-05-25 13:45:36Z duncan $-->
<!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
<!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
<!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
@@ -241,7 +241,7 @@
Link the highlighted text to this URL:
</span>
</div>
- <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
+ <input class="kupu-toolbox-st kupu-linkdrawer-input" type="text" onkeypress="return HandleDrawerEnter(event, 'linkdrawer-preview');" onchange="return HandleDrawerEnter(event, 'linkdrawer-preview');"/>
</td>
<td class="kupu-preview-button">
<button class="kupu-dialog-button" type="button" id="linkdrawer-preview" onclick="drawertool.current_drawer.preview()" i18n:translate="">Preview</button>
@@ -254,6 +254,7 @@
</td>
</tr>
<tr><td colspan="2" align="center">
+ <div class="watermark"><span i18n:translate="">Preview</span></div>
<iframe frameborder="1" scrolling="auto" width="440" height="198" class="kupu-linkdrawer-preview" src="javascript:''">
</iframe>
</td>
More information about the kupu-checkins
mailing list