Skip to content

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

change link management

parent 240c60da
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 38 deletions
.gitignore
View file @ e7de2e06
......@@ -5,6 +5,7 @@
/UNGProject/css/images/
/UNGProject/svg-edit/
/UNGProject/dav
/UNGProject/Aloha
# buildout
/bin/
......
UNGProject/css/ung.css
View file @ e7de2e06
......@@ -261,8 +261,8 @@ div.gadget-column {
margin-left: -4px;
margin-right: -8px;
}
/* "create new" menu */
.menu_create_object {
/* listbox menus */
.option_menu {
font-family: arial,sans-serif;
font-size: 14px;
list-style: none outside none;
......@@ -272,34 +272,34 @@ div.gadget-column {
margin-left: 5px;
float:left;
}
.menu_create_object li {
.option_menu li {
padding-top: 0.5em;
position: relative;
text-decoration: none;
}
.menu_create_object li a {
.option_menu li div {
display: block;
text-decoration: none;
}
.menu_create_object li a#current {
.option_menu li div.fix {
height: 19px;
padding-left: 2px;
padding-right: 14px;
text-align: justify;
width: 78px;
}
.menu_create_object li a#current img {
.option_menu li div.fix img {
margin-left: 3px;
position: relative;
top: 2px;
}
.menu_create_object img {
.option_menu img {
border: 0 none;
}
.menu_create_object li:hover ul {
.option_menu li:hover ul {
display: block;
}
.menu_create_object li ul {
.option_menu li ul {
display: none;
height: auto;
position: absolute;
......@@ -307,16 +307,17 @@ div.gadget-column {
background-color: #FFFFFF;
border: 1px solid #D1D1D1;
}
.menu_create_object ul {
.option_menu ul {
list-style: none outside none;
margin: 0;
padding: 0;
}
.menu_create_object li a:hover {
.option_menu li div:hover {
color: #000000;
text-decoration: none;
cursor: pointer;
}
.menu_create_object li ul a {
.option_menu li ul div {
color: #002E3F;
display: block;
font-size: 14px;
......@@ -337,7 +338,7 @@ div.gadget-action input#upload {
/* action list */
div.gadget-column div.file-selection {
background-color: #FFFFFF;
margin: 15px -4px -4px;
margin: 0.5em -4px -4px;
}
div.gadget-column div.file-selection div.file-quick-browser,
div.gadget-column div.file-selection div.file-quick-search {
......@@ -359,6 +360,7 @@ div.listbox-domain-tree-container select {
background: none repeat scroll 0 0 #FFFFFF;
border: medium none;
cursor: pointer;
margin-left: 1em;
}
/* gadgets */
......
UNGProject/js/theme.js
View file @ e7de2e06
......@@ -191,7 +191,7 @@ getCurrentUser = function() {
/**
* Class Storage
* this class provides usual API to save/load/delete documents
* this class provides usual API to save/load/delete elements
* @param type : "local" to save in localStorage, or "JIO" for remote storage
* @param userName : the name of the user concerned by this storage
*/
......@@ -212,10 +212,7 @@ Storage.prototype.load({
getUser: function() {return this.user;},
loadUser: function(userName) {},
setUser: function(user) {this.user = user},
getDocument: function(address, instruction) {},
saveDocument: function(doc, address, instruction) {},
deleteDocument: function(address, instruction) {}
setUser: function(user) {this.user = user}
});
/**
......@@ -601,6 +598,7 @@ var startDocumentEdition = function(doc) {
var stopDocumentEdition = function() {
saveCurrentDocument();
window.location = "ung.html";
return false;
}
/**
......@@ -618,6 +616,7 @@ var signOut = function() {
delete localStorage.currentStorage;
delete localStorage.currentDocumentID;
window.location = "login.html";
return false
}
cancel_sharing = function() {alert("cancel");}
......
UNGProject/js/tools.js
View file @ e7de2e06
......@@ -44,6 +44,15 @@ UngObject.prototype.equals = function(object) {
return true;
}
/* return a copy of the current object */
UngObject.prototype.copy = function() {
var copied = new Object();
for (var property in this) {
copied[property] = this[property]!==null&&typeof(this[property])=="object" ? UngObject.prototype.copy.call(this[property]) : this[property];
}
return copied;
}
/**
* Class List
......@@ -152,6 +161,13 @@ List.prototype.load({
} else {
if(element===this.head()) {this.pop();}//with usual comparator
}
},
concat: function(list) {
if(list.size()==0) {return this}
var l1 = this.copy();
var l2 = list.copy();
l1.add(l2.get(l2.size()-1));
return l2;
}
});
......
UNGProject/theme.html
View file @ e7de2e06
......@@ -66,7 +66,7 @@
<div class="input"><div >
<a class="email" href="ung/mail.html" lang="en">Email</a>
<a class="document" href="#" onclick="stopDocumentEdition()" lang="en">Documents</a>
<a class="document" href="ung.html" onclick="stopDocumentEdition()" lang="en">Documents</a>
<a class="calendar" href="ung/calendar.html" lang="en">Calendar</a>
</div></div>
......@@ -111,7 +111,7 @@
| <a id="settings" href="#" lang="en">Parametres</a>
| <a id="help" href="#" lang="en">Help</a>
| <a href="WebSite_logout" id="log" lang="en">Sign out</a>
| <a id="sign_out" href="login.html" onclick="signOut()">Sign out</a>
</div></div>
......@@ -138,12 +138,12 @@
<label>search_bar</label>
<div class="input"><div >
<a class="ung_docs" href="#" onclick="stopDocumentEdition()">
<a class="ung_docs" href="ung.html" onclick="stopDocumentEdition()">
<img src="images/ung/ung-logo.gif" alt="logo"/>
</a>
<a id="loading_message" lang="en">Loading...</a>
<a id="document_title" name="document_title" onclick="javascript:editDocumentSettings()">Untitled</a>
<a id="document_title" name="document_title" onclick="editDocumentSettings()">Untitled</a>
<a id="document_state" name="document_state">...</a>
</div></div>
......@@ -166,7 +166,7 @@
<a id="last_update">Updated ... by</a>
<a id="author">Unknown</a>
<button type="button" onclick="javascript:saveCurrentDocument()">Save</button>
<button type="button" onclick="saveCurrentDocument()">Save</button>
<div class="action_menu">
......
UNGProject/ung.html
View file @ e7de2e06
......@@ -72,7 +72,7 @@
<div class="input"><div >
<a class="email" href="/ung/mail">Email</a>
<a class="document" href="#" onclick="window.location.reload()">Documents</a>
<a class="document" href="ung.html">Documents</a>
<a class="calendar" href="/ung/calendar">Calendar</a>
</div></div>
</div>
......@@ -121,9 +121,9 @@
<a id="right_message">Not Implemented yet</a>
<div id="preference_dialog" title="UNG Preferences"></div>
<a id="userName">Unknown</a>
| <a id="settings" href="">Settings</a>
| <a id="help" href="">Help</a>
| <a id="sign_out" href="" onclick="signOut()">Sign out</a>
| <a id="settings" href="#">Settings</a>
| <a id="help" href="#">Help</a>
| <a id="sign_out" href="login.html" onclick="signOut()">Sign out</a>
</div></div>
......@@ -150,7 +150,7 @@
<div class="input"><div >
<a class="ung_docs" href="#" onclick="window.location.reload()">
<a class="ung_docs" href="ung.html">
<img src="images/ung/ung-logo.gif"/>
</a>
<a id="loading_message">Loading...</a>
......@@ -187,30 +187,30 @@
<div class="gadget-column">
<div class="gadget-action">
<div class="menu_create_object">
<div class="create_object option_menu">
<ul><li>
<a id="current" class="ung_button">
<div class="fix ung_button">
<span>Create New</span>
<img src="images/ung/arrow.png"/>
</a>
</div>
<ul>
<li>
<a href="#" onclick="createNewDocument('illustration')">
<div onclick="createNewDocument('illustration')">
<img src="images/icons/svg.png" alt=""/>
<span>Web Illustration</span>
</a>
</div>
</li>
<li>
<a href="#" onclick="createNewDocument('table')">
<div onclick="createNewDocument('table')">
<img src="images/icons/table.png" alt=""/>
<span>Web Table</span>
</a>
</div>
</li>
<li>
<a href="#" onclick="createNewDocument('text')">
<div onclick="createNewDocument('text')">
<img src="images/icons/document.png"/>
<span>Web Page</span>
</a>
</div>
</li>
</ul>
</li></ul>
......@@ -446,7 +446,7 @@
<div class="favorite">
<a class="domain_selected"></a>
<a href="#" onclick="javascript:window.location.reload()">Refresh</a>
<a href="ung.html">Refresh</a>
</div>
</div></div>
......
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