You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/07/14 15:22:23 UTC
svn commit: r1146692 - in
/incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb:
./ discoscripts/ discoscripts/mozile/ discoscripts/mozile/images/
discoscripts/mozile/lib/ discoscripts/mozil...
Author: reto
Date: Thu Jul 14 13:22:22 2011
New Revision: 1146692
URL: http://svn.apache.org/viewvc?rev=1146692&view=rev
Log:
CLEREZZA-608: removed mozile, changed source-edit are to a fixed position, new save icon taken from: http://www.eggheadcafe.com/free-commercial-icons-graphics/list.aspx?id=8
Added:
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/save.png (with props)
Removed:
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/mozile/README
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/mozile/images/
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/mozile/lib/
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/mozile/mozile.js
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/mozile/src/
Modified:
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/disco.xhtml
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/widget-factory.js
incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/style/discostyle.css
Modified: incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/disco.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/disco.xhtml?rev=1146692&r1=1146691&r2=1146692&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/disco.xhtml (original)
+++ incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/disco.xhtml Thu Jul 14 13:22:22 2011
@@ -4,7 +4,6 @@
<title>Discobits Editor</title>
<link type="text/css" href="style/discostyle.css" rel="stylesheet" />
<link type="text/css" href="/style/style.css" rel="stylesheet" />
- <script type="text/javascript" src="discoscripts/mozile/mozile.js"></script>
<script src="discoscripts/util.js" type="text/javascript"></script>
<script src="discoscripts/uri.js" type="text/javascript"></script>
<script src="discoscripts/term.js" type="text/javascript"></script>
Added: incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/save.png
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/save.png?rev=1146692&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/save.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/widget-factory.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/widget-factory.js?rev=1146692&r1=1146691&r2=1146692&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/widget-factory.js (original)
+++ incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/discoscripts/widget-factory.js Thu Jul 14 13:22:22 2011
@@ -116,7 +116,7 @@ WidgetFactory.create = function(terminat
var RDFControl = new Object();
RDFControl.label = "RDF"
RDFControl.perform = function() {
- mozile.edit.disable();
+ //mozile.edit.disable();
var div = document.createElementNS(xhtmlNS, "div");
var textarea = document.createElementNS(xhtmlNS, "textarea");
div.appendChild(textarea);
@@ -146,12 +146,12 @@ WidgetFactory.create = function(terminat
widgetHolder.widget.remove();
WidgetFactory.create(function() {
body.removeChild(div);
- mozile.edit.enable();
+ //mozile.edit.enable();
}, rdfSymbol, xhtmlContainer, providedFunctions, editedStore, widgetHolder, widgetHolder.widget.lastSavedContent);
}
discardButton.onclick = function() {
body.removeChild(div);
- mozile.edit.enable();
+ //mozile.edit.enable();
}
}
controlFunctions[controlFunctions.length] = RDFControl;
@@ -204,8 +204,7 @@ WidgetFactory.create = function(terminat
//saveLink.appendChild(document.createTextNode("Save"));
var saveIcon = document.createElementNS("http://www.w3.org/1999/xhtml", "img");
saveLink.appendChild(saveIcon);
- saveIcon.src = WidgetFactory.root+"mozile/images/silk/page_save.png";
- ;
+ saveIcon.src = WidgetFactory.root+"save.png";
saveLink.onclick = function() {
widgetHolder.widget.save();
}
@@ -377,7 +376,7 @@ TypeSelectionWidget = function(rdfSymbol
//mozile.debug.logLevel = "debug";
-{
+/*{
var found = false;
for(var i=0; i < mozile.edit.commands._commands.length; i++) {
if(mozile.edit.commands._commands[i] == mozile.edit.save);
@@ -388,16 +387,16 @@ TypeSelectionWidget = function(rdfSymbol
}
}
mozile.edit.commands._commands.pop();
-}
+} */
function XHTMLInfoDiscoBitWidget(store, rdfSymbol, xhtmlContainer, controller, terminationListener) {
// Configure Mozile Basics
- if (!XHTMLInfoDiscoBitWidget.mozileInitialized) {
+ /*if (!XHTMLInfoDiscoBitWidget.mozileInitialized) {
mozile.root = WidgetFactory.root+"mozile/";
mozile.useSchema("lib/xhtml.rng");
XHTMLInfoDiscoBitWidget.mozileInitialized = true;
- }
+ }*/
this.rdfSymbol = rdfSymbol;
this.controller = controller;
this.xhtmlContainer = xhtmlContainer;
@@ -417,7 +416,7 @@ XHTMLInfoDiscoBitWidget.prototype.getWid
RDFControl.label = "XHTML"
var widget = this;
RDFControl.perform = function() {
- mozile.edit.disable();
+ //mozile.edit.disable();
var div = document.createElementNS(xhtmlNS, "div");
var textarea = document.createElementNS(xhtmlNS, "textarea");
div.appendChild(textarea);
@@ -452,11 +451,11 @@ XHTMLInfoDiscoBitWidget.prototype.getWid
}
widget.controller.modifiedStateChanged(true, widget);
body.removeChild(div);
- mozile.edit.enable();
+ //mozile.edit.enable();
}
discardButton.onclick = function() {
body.removeChild(div);
- mozile.edit.enable();
+ //mozile.edit.enable();
}
}
controlFunctions[controlFunctions.length] = RDFControl;
@@ -475,7 +474,7 @@ XHTMLInfoDiscoBitWidget.prototype.loadDa
//xhtmlContainer.appendChild(editableParagraph);
WidgetFactory.appendChildrenInDiv(objectElement, this.xhtmlContainer);
this.editableArea = this.xhtmlContainer.childNodes[0];
- mozile.editElement(this.editableArea);
+ //mozile.editElement(this.editableArea);
var controller = this.controller;
var widget = this;
var modifiedTrue = function() {
Modified: incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/style/discostyle.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/style/discostyle.css?rev=1146692&r1=1146691&r2=1146692&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/style/discostyle.css (original)
+++ incubator/clerezza/trunk/parent/platform.content/src/main/resources/org/apache/clerezza/platform/content/staticweb/style/discostyle.css Thu Jul 14 13:22:22 2011
@@ -63,7 +63,11 @@ ol {
.sourceEdit {
background-color: grey;
- position: absolute; top: 10%; right: 10%; left: 10%; bottom: 10%
+ position: fixed;
+ top: 10%;
+ right: 10%;
+ left: 10%;
+ bottom: 10%
}
.sourceEdit textarea {