Skip to content

O
officejs
Commit ba8bed00 authored by François Billioud's avatar François Billioud
Browse files
Options

modify function getDocumentAddress 

Conflicts:
	UNGProject/js/theme.js
parents c2b972be 0977160f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 612 additions and 461 deletions
UNGProject/css/ung.css
View file @ ba8bed00
......@@ -215,7 +215,7 @@ div.header-right div.input a {
border: 1px solid #D1D1D1;
display: none;
}
.action_menu ul li ul hover {
.action_menu ul li ul:hover {
display: block;
}
.action_menu ul li ul li:hover {
......@@ -330,7 +330,7 @@ div.gadget-action input#upload {
border: 1px solid #BBBBBB;
border-radius: 4px 4px 4px 4px;
color: #333333;
left: 1em;
left: 0.5em;
position: relative;
top: 0.1em;
}
......@@ -409,12 +409,46 @@ button.delete {
margin-left: 6px;
margin-top: 6px;
}
/* navigation buttons */
div.listbox-navigation {
float: right;
font-size: 13px;
margin-right: 5px;
margin-top: 6px;
margin-top: 0;
min-width: 10%;
display: none;
}
div.listbox-navigation input {
margin-top: 0.3em;
height: 18px;
width: 20px;
}
div.listbox-navigation button.listbox_first_page {
background-image: url("../images/ung/first_page.png");
}
div.listbox-navigation button.listbox_previous_page {
background-image: url("../images/ung/previous_page.png");
}
div.listbox-navigation button.listbox_next_page {
background-image: url("../images/ung/next_page.png");
}
div.listbox-navigation button.listbox_last_page {
background-image: url("../images/ung/last_page.png");
}
div.listbox-navigation button.listbox_previous_page, div.listbox-navigation button.listbox_next_page {
margin: 0;
width: 12px;
}
div.listbox-navigation button {
position: relative;
top: -0.2em;
background-repeat: no-repeat;
border: 0 none;
height: 20px;
display: none;
}
div.listbox-navigation button:hover {
cursor: pointer;
}
/* header */
......@@ -558,6 +592,10 @@ div#advertisement img{
height: 10em;
}
/* login table */
span#id_provider_details {
font-size: 8px;
float: left;
}
table#field_table, table#new-account-table, table#create-new-user {
border: 1px solid #C3D9FF;
width: 78%;
......@@ -606,6 +644,23 @@ div.footer a {
margin-right: 0.5em;
}
/**********************************************************
******************** tooltip area *********************/
span.tooltipElement {
cursor: pointer;
color: #0099CC;
}
div.toolLocation{
visibility: hidden;
position: absolute;
border-radius: 10px 10px 10px 10px;
border: 1px solid Black;
padding: 10px;
font-family: Verdana, Arial;
font-size: 10px;
background-color: #FFFFCC;
}
/**********************************************************
******************* dialog box ************************/
div.ui-dialog {
......@@ -624,9 +679,6 @@ div.ui-dialog-titlebar {
border-radius: 1px 1px 1px 1px;
height: 15px;
}
div.ui-dialog-titlebar {
height: 15px;
}
span#ui-dialog-title-edit_document, span#ui-dialog-title-upload_document, span#ui-dialog-title-gadget-listbox {
color: #222222 !important;
font: bold 12pt Arial,Sans-serif;
......@@ -658,4 +710,4 @@ div#edit_document {
}
span.ui-button-text {
font-size: 12px;
}
\ No newline at end of file
}
UNGProject/js/jio.org deleted 100644 → 0
View file @ c2b972be
* Decision of JS pattern used for Prototypical Inheritance
* Desicion: Why meta-data should be inside the data of the file
** I had two choices about meta data:
*** Let the meta-data stay inside the data itself i.e. your data on file will contain the meta data too.
**** Advantage is that the ability to store meta-data is not needed or is dependednt on the type of storage
**** We have more control over the meta data and how it is interfaced.
**** Thus, currently meta-data in DAV is stored along with data, this way the hash returns the sum of both meta-data and data
**** This might be desirable or undesirable but good thing is that decision is in our hand
**** Other software must know how JIO stores the meta-data
*** Let the meta-data be separate from the data so that the server can take care of meta-data in meaningful way
**** This way, meta-data interface has to be written for every backend separately
**** We just work on the data, the hash is returned for only the data part. encryption (or other transformations) are done for only the data part
**** Many backend like ObjStore won't have meta-data handling in an intutive way
**** server will handle the meta-data
**** This facilitates JIO interaction with other services (eg: in Google Doc, if you use its API to do the meta-data, even Google Doc can use that information)
*** Decision
Meta-data with file data for now. Since JIO is open standard, we will publish our meta-data storing syntax. This way JIO can be used uniformally on All backends
The consequence of this is that we don't see meta-data as a different data, it is part of the document
* Object based Storage
** The basic idea is to let a object represent the entire tree of the
virtual file system
** The such objects can be nested inside each other. Hence to create
an entire filesystem is possible.
** Each object can be either a document (as are files in Unix) or a
collection (as are directory in Unix)
** We can then encapsulate the entire filesystem tree in as a single
object.
** The good part is that we can run JSON stringify on this object to
convert it into pure string and thus serialize it.
** The design should be such that these objects must be pluggable
inside other objects.
** Should be able to store Metadata
** Design
*** Each Object contain two basic information : doc_id, content
*** doc_id is basically the name of the resource (resource is a general term used for a collection or a document)
*** In a given collection, all the containing collections and document should have unique doc_id (i.e. you can't have a collection and a document named `foo' inside on collection)
*** Identification of if the resource is a collection or document is done by noting the type of the content, if it is an array, then the given resource is a collection, document otherwise
*** Any resource is identified by it's doc_id and parent object (or parent's doc_id, which itself is identified by using its parents doc_id)
***
** If the loadDocument requests a directory, (aka collection), return the hash is the sum of all the content inside that collection and let the data be an array with the docid of all the child documents.
** Implementing
** Current implmentation doesn't enjoy much of code-reuse, I think I can use more inheritance core-reuse, will have to refactor the code. But the basic design of JIO will facilitate that
UNGProject/js/theme.js
View file @ ba8bed00
This diff is collapsed.
UNGProject/js/tools.js
View file @ ba8bed00
......@@ -92,7 +92,7 @@ List.prototype.load({
return this.tail().get(i-1);
},
set: function(i,element) {
if(i>=this.size()) {error("set out of bounds, "+i+" : "+this.size(),this);return}
if(i>=this.size()) {errorMessage("set out of bounds, "+i+" : "+this.size(),this);return}
if(i==0) {
this.headElement=element;
} else {
......@@ -100,7 +100,7 @@ List.prototype.load({
}
},
remove: function(i) {
if(i>=this.size()) {error("remove out of bounds, "+i+" : "+this.size(),this);return}//particular case
if(i>=this.size()) {errorMessage("remove out of bounds, "+i+" : "+this.size(),this);return}//particular case
if(i==0) {this.pop();return}//particular case
if(i==1) {//init
this.previous = this.tail().tail();
......@@ -110,7 +110,7 @@ List.prototype.load({
this.length--;
},
pop: function() {
if(this.isEmpty()) {error("pop on empty list",this);return null;}
if(this.isEmpty()) {errorMessage("pop on empty list",this);return null;}
var h = this.head();
this.load(this.tail())
return h;
......@@ -128,7 +128,7 @@ List.prototype.load({
},
contains: function(object) {if(this.isEmpty()) {return false} else {return object===this.head() ? true : this.tail().contains(object)}},
insert: function(element,i) {
if(i>this.size()) {error("insert out of bounds, "+i+" : "+this.size(),this);return}//particular case
if(i>this.size()) {errorMessage("insert out of bounds, "+i+" : "+this.size(),this);return}//particular case
if(i==0) {//init
this.add(element);
} else {//recursion
......@@ -137,7 +137,7 @@ List.prototype.load({
}
},
replace: function(oldElement,newElement) {
if(this.isEmpty()) {error("<<element not found>> when trying to replace",this);return}//init-false
if(this.isEmpty()) {errorMessage("<<element not found>> when trying to replace",this);return}//init-false
if(oldElement===this.head()) {
this.set(0,newElement);//init-true
} else {
......@@ -155,34 +155,6 @@ List.prototype.load({
}
});
error: function(message,object) {
errorObject = object;
console.log(message);
}
/**
* returns the current date
*/
currentTime = function() {return (new Date()).toUTCString();}
// save
saveXHR = function(address) {
$.ajax({
url: address,
type: "PUT",
headers: {
Authorization: "Basic "+btoa("smik:asdf")},
fields: {
withCredentials: "true"
},
data: JSON.stringify(getCurrentDocument()),
success: function(){alert("saved");},
error: function(xhr) { alert("error while saving");}
});
};
/**
* load a public file with a basic ajax request
* @param address : the address of the document
......@@ -202,55 +174,6 @@ loadFile = function(address, type, instruction) {
});
}
// save
saveFile = function(address, content, instruction) {
$.ajax({
url: address,
type: "PUT",
dataType: "json",
data: JSON.stringify(content),
headers: { Authorization: "Basic "+btoa("smik:asdf")},
fields: { withCredentials: "true" },
success: instruction,
error: function(type) {
if(type.status==201 || type.status==204) {instruction();}//ajax thinks that 201 is an error...
}
});
}
deleteFile = function(address, instruction) {
$.ajax({
url: address,
type: "DELETE",
headers: { Authorization: "Basic "+btoa("smik:asdf")},
fields: { withCredentials: "true" },
success: instruction,
error: function(type) {
alert(type.status);//ajax thinks that 201 is an error...
}
});
}
// load
loadXHR = function(address) {
$.ajax({
url: address,
type: "GET",
dataType: "json",
cache:false,
headers: {
Authorization: "Basic "+btoa("smik:asdf")},
fields: {
withCredentials: "true"
},
success: function(data){
var cDoc = getCurrentDocument();
cDoc.load(data);
cDoc.setAsCurrentDocument();
}
});
}
/*
* wait an event before execute an action
* @param required : function we are waiting for a result
......@@ -276,7 +199,7 @@ tryUntilSucceed = function(func) {
var nb = 2;//avoid to test too much times
var execute = function() {
try {func.call();}
catch(e) {if(nb<100) {setTimeout(execute,nb*200);} console.log(e);}
catch(e) {if(nb<100) {setTimeout(execute,nb*200);}console.log(e);}
nb*=nb;
}
execute();
......@@ -290,4 +213,43 @@ var resize = function() {
$("div.main-right").width($(window).width()-$("div.main-left").width());
}
/**
* Used to debug
*/
errorMessage = function(message,object) {
errorObject = object;
console.log(message);
}
/**
* returns the current date
*/
currentTime = function() {return (new Date()).toUTCString();}
/**
* Paste a toolkit at the mouse position
*/
Tooltip = function() {
this.visible=false; // La variable i nous dit si la bulle est visible ou non
}
Tooltip.prototype = {
isVisible: function() {return this.visible;},
move: function(e) {$("div.toolLocation").css("left",e.pageX+5+"px").css("top",e.pageY + 10+"px");},
show: function(text) {
if(!this.isVisible()) {
$("div.toolLocation")
.css("display","inline")
.css("visibility","visible")
.html(text);
this.visible = true;
}
},
hide: function() {
if(this.isVisible()) {
$("div.toolLocation")
.css("display","none")
.css("visibility","hidden");
this.visible = false;
}
}
}
UNGProject/js/ung.js
View file @ ba8bed00
This diff is collapsed.
UNGProject/ung.html
View file @ ba8bed00
This diff is collapsed.
UNGProject/xml/login.xml deleted 100644 → 0
View file @ c2b972be
This diff is collapsed.
UNGProject/xml/xmlElements.xml
View file @ ba8bed00
......@@ -5,7 +5,7 @@
<fieldset id="edit_document">
<label for="name">Insert a new name:</label>
<input type="text" class="title" id="name" name="name" value=""/><br/>
<div id="more_property">
<div id="more_property" style="display:none">
<label for="version">Version:</label>
<input type="text" class="version" id="version" name="version" value=""/><br/>
<label for="language">Language:</label>
......@@ -19,7 +19,7 @@
</div>
<p class="more_properties" id="more_properties">Edit More Properties</p>
<p class="hide_properties" id="hide_properties">Hide Properties</p>
<p class="hide_properties" id="hide_properties" style="display:none">Hide Properties</p>
</fieldset>
</form>
</rename>
......@@ -40,6 +40,37 @@
</fieldset>
</form>
</upload>
<settings>
<form id="erp5_preference">
<fieldset class="center editable">
<div class="field" title="The text editor used by default">
<label> Text Editor </label>
<div class="input">
<input type="radio" value="fck_editor" name="field_my_preferred_text_editor" checked="checked"/>
Xinha Editor&nbsp;&nbsp;
<input type="radio" value="text_area" name="field_my_preferred_text_editor"/>
Plain Text&nbsp;&nbsp;
<input type="hidden" value="" name="default_field_my_preferred_text_editor"/>
</div>
</div>
<div class="field" title="The text format used by default">
<label> Text Format </label>
<div class="input">
<input type="radio" value="text/html" name="field_my_preferred_text_format"/>
HTML&nbsp;&nbsp;
<input type="radio" value="text/plain" name="field_my_preferred_text_format" checked="checked"/>
Plain Text&nbsp;&nbsp;
<input type="radio" value="text/x-rst" name="field_my_preferred_text_format"/>
reStructuredText&nbsp;&nbsp;
<input type="hidden" value="" name="default_field_my_preferred_text_format"/>
</div>
</div>
</fieldset>
</form>
</settings>
<line>
<table>
<tbody>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7