Commit 9ebb3207 authored by Mikolaï Krol's avatar Mikolaï Krol Committed by Mikolaï Krol

erp5_jexcel_editor: handle multiple tabs (formula bar not working)

erp5_jexcel_editor: fix tabs and formula bar

erp5_jexcel_editor: remove and rename tabs

erp5_jexcel_editor: fixed delete and rename tabs

erp5_jexcel_editor: add formula from toolbar and real cell value in formula bar

erp5_jexcel_editor: more formulas

erp5_jexcel_editor: fixed merge issue, added warning before merge, fixed formula dropdown, parse formulas and hide js code i the cell, added cell selection input

erp5_jexcel_editor: new  columns types : images, html, color, text, calendar, checkbox

erp5_jexcel_editor: fixed select width

erp5_jexcel_editor: stable version

erp5_jexcel_editor: fixed merge save conflict

erp5_jexcel_editor: fixed formula dropdown, different cursors
parent 9c29b517
......@@ -3,12 +3,14 @@ url_list = [
"rsvp.js",
"jexcel.gadget.html",
"jexcel.gadget.js",
"gadget.utils.template.html",
"gadget.utils.template.js",
"complements.css",
"fx.png",
"fonts.ttf",
"icons.css",
"jexcel/jexcel.js",
"jexcel/jexcel.css",
"jexcel/jexcel.theme.css",
"jexcel/jexcel.webcomponent.js",
"jsuites/jsuites.js",
"jsuites/jsuites.css",
]
......
......@@ -8,9 +8,30 @@ div.jexcel_formula img{
input.jexcel_formula {
margin-left: 2px;
width: 97%;
width: 92.8%;
position:sticky;
top:0px;
z-index:21;
z-index:0;
display: inline-block;
}
input.cell_input {
display: inline-block;
width: 4%;
}
input.jexcel_search {
width: 40px;
}
.jexcel_toolbar select.minimize {
width: 90px;
}
td {
cursor: cell;
}
input.readonly {
cursor: not-allowed;
}
......@@ -11,9 +11,9 @@
<script src="jexcel/jexcel.js"></script>
<script src="jsuites/jsuites.js"></script>
<link rel="stylesheet" href="jexcel/jexcel_perso.css" type="text/css" />
<link rel="stylesheet" href="jexcel/jexcel.css" type="text/css" />
<link rel="stylesheet" href="jsuites/jsuites.css" type="text/css" />
<!--<link rel="stylesheet" href="complements.css" type="text/css" />-->
<link rel="stylesheet" href="complements.css" type="text/css" />
<link rel="stylesheet" href="icons.css" type="text/css" />
......
......@@ -7,11 +7,12 @@
padding-right:2px;
box-sizing: border-box;
overscroll-behavior: contain;
padding-bottom: 40px;
}
.jexcel_container.fullscreen {
position:fixed;
top:0px;
top:38px;
left:0px;
width:100%;
height:100%;
......@@ -21,14 +22,10 @@
.jexcel_container.fullscreen .jexcel_content {
overflow:auto;
width:100%;
height:100%;
height:96.5%;
background-color:#ffffff;
}
.jexcel_container.with-toolbar .jexcel > thead > tr > td {
top: 0;
}
.jexcel_container.fullscreen.with-toolbar {
height: calc(100% - 46px);
}
......@@ -94,7 +91,7 @@
.with-toolbar .jexcel > thead > tr > td
{
top:42px;
/**top:42px;**/
}
.jexcel > thead > tr > td.dragging
......@@ -126,7 +123,8 @@
.jexcel > tbody > tr > td:first-child
{
position:relative;
position:sticky;
left:0;
background-color:#f3f3f3;
text-align:center;
}
......@@ -556,12 +554,12 @@
{
display:flex;
justify-content:space-between;
margin-bottom:4px;
/**margin-bottom:4px;**/
}
.jexcel_filter > div
{
padding:8px;
padding:4px;
align-items:center;
}
......@@ -613,7 +611,7 @@
background-color:#f3f3f3;
border:1px solid #ccc;
padding:4px;
margin:0px 2px 4px 1px;
margin:0px 2px 1px 1px;
position:sticky;
top:0px;
z-index:21;
......@@ -670,11 +668,9 @@
.jexcel_tabs .jexcel_tab_link
{
display:inline-block;
padding:10px;
padding-left:20px;
padding-right:20px;
margin-right:5px;
margin-bottom:5px;
padding:5px;
margin-right:2px;
margin-bottom:2px;
background-color:#f3f3f3;
cursor:pointer;
}
......
......@@ -12,7 +12,7 @@
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>application/x-javascript</string> </value>
<value> <string>application/javascript</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="File" module="OFS.Image"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string>jexcel_perso.css</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/css</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
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