tdraier 2005/08/26 15:30:22 CEST
Modified files:
src/java/jahiatemplates Corporate_portal_templates.properties
Corporate_portal_templates_fr.properties
src/view/jsp actions.js
src/view/jsp/include admin_menu.inc
Log:
added clipboard actions and resources
Revision Changes Path
1.48 +4 -1
corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties.diff?r1=1.47&r2=1.48&f=h
1.47 +3 -0
corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties.diff?r1=1.46&r2=1.47&f=h
1.6 +49 -0 corporate_portal_templates/src/view/jsp/actions.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/actions.js.diff?r1=1.5&r2=1.6&f=h
1.6 +3 -2
corporate_portal_templates/src/view/jsp/include/admin_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/admin_menu.inc.diff?r1=1.5&r2=1.6&f=h
Index: Corporate_portal_templates.properties
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates.properties,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Corporate_portal_templates.properties 22 Aug 2005 11:18:17 -0000
1.47
+++ Corporate_portal_templates.properties 26 Aug 2005 13:30:21 -0000
1.48
@@ -264,6 +264,9 @@
blog.wrote = wrote
rss.title = Subscribe via RSS to this blog
rss.titleALL = Combined RSS feed for all blogs
+cut = Cut
+copy = Copy
+paste = Paste
singleLine = Single line
smallTextarea = Small textarea
largeTextarea = Large textarea
@@ -284,4 +287,4 @@
form.defaultValue = Default value(s) separated by semi-column ':'
form.addSender = Add sender, recipient, ...
form.fieldIsMandatory = Error: Fields with (*) are mandatory
-form.defaultValueRequired = Default value is required for this type
\ No newline at end of file
+form.defaultValueRequired = Default value is required for this type
Index: Corporate_portal_templates_fr.properties
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/java/jahiatemplates/Corporate_portal_templates_fr.properties,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Corporate_portal_templates_fr.properties 22 Aug 2005 11:18:17 -0000
1.46
+++ Corporate_portal_templates_fr.properties 26 Aug 2005 13:30:21 -0000
1.47
@@ -262,6 +262,9 @@
blog.wrote = a écrit
rss.title = Souscrire à ce blog via RSS
rss.titleALL = Souscrire à tous les blogs via RSS
+cut = Couper
+copy = Copier
+paste = Coller
singleLine = Ligne simple
smallTextarea = Zone de texte courte
largeTextarea = Zone de texte longue
Index: actions.js
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/actions.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- actions.js 9 Aug 2005 13:14:19 -0000 1.5
+++ actions.js 26 Aug 2005 13:30:22 -0000 1.6
@@ -639,3 +639,52 @@
function printMethod (methodName) {
return methodName + "\n </a>\n";
}
+
+function clipboard (context, objectKey, op, pageID) {
+ document.body.style.cursor = "wait";
+ try {
+ // correct values are "POST" or "GET" (HTTP methods).
+ var method = "GET" ;
+ var data = "key=" + objectKey + "&op=" + op;
+ var url = context + "/Jahia/engineName/clipboard/pid/" + pageID ;
+
+ if (method == "GET") {
+ url += "?" + data;
+ data = null;
+ }
+
+ // Create new XMLHttpRequest request
+ if (window.XMLHttpRequest) {
+ req = new XMLHttpRequest ();
+
+ } else if (window.ActiveXObject) {
+ req = new ActiveXObject ("Microsoft.XMLHTTP");
+
+ } else {
+ alert ("Error: Your Browser does not support
XMLHTTPRequests, please upgrade...");
+ return;
+ }
+
+ req.open (method, url, true);
+
+ if (op == "paste") {
+ req.onreadystatechange = function () {
+ window.location.reload();
+ document.body.style.cursor = "default";
+ }
+ } else {
+ req.onreadystatechange = function () {
+
document.getElementById('clipboard').innerHTML=objectKey;
+ document.body.style.cursor = "default";
+ }
+ }
+
+ if (method == "POST") {
+ req.setRequestHeader ("Content-type",
"application/x-www-form-urlencoded");
+ }
+ req.send (data);
+
+ } catch (e) {
+ alert ("Exception sending the Request: " + e);
+ }
+}
Index: admin_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/admin_menu.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin_menu.inc 16 Aug 2005 09:14:22 -0000 1.5
+++ admin_menu.inc 26 Aug 2005 13:30:22 -0000 1.6
@@ -96,7 +96,7 @@
%>
<tr>
- <td class="adminmenu">
+ <td class="adminmenu" nobreak>
<jahia:displayIcon src="org.jahia.pix.image" height="20" width="15"/>
<%=getResourceBundle("user","user",jData)%> : <jahia:userName
maxchar="20"/> |
<a
href="<%=jData.gui().html().drawMySettingsLauncher()%>"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettings" defaultValue="My Settings"/></a> |
@@ -212,7 +212,8 @@
}
}
}
- %>
+ %><% if (jData.gui().isEditMode()) {
+%> | Clipboard : <div id="clipboard"><% if
(request.getSession().getAttribute("clipboard_key")!=null){%> <%=
request.getSession().getAttribute("clipboard_key") %><% } %></div><% } %>
</td>
</tr>
<tr>
