RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr16S09RFComportamentoGraficoPlanificadorItEr15S12: Zoom level buttons moved when scrolling

Browse source
This commit is contained in:
Lorenzo Tilve 2009-07-10 21:08:23 +02:00 • committed by Javier Moran Rua
parent 39274ef37c
commit b999d1e577
7 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-gantt-zk/src/main/resources/web/js/ganttz/tasklist.js
View file

@ -22,7 +22,8 @@ FOOTER_HEIGHT = 40; // Design-relative footer height
SCROLLBAR_WIDTH = 15; // Scrollbars default width
zkTasklist.init = function(cmp) {
zkTasklist.adjust_height(cmp);
zkTasklist.adjust_height();
make_visible();
}
zkTasklist.adjust_height = function(cmp) {
@ -39,6 +40,7 @@ document.getElementById('ganttpanel_scroller_x').onscroll = function() {
scroller = document.getElementById('ganttpanel_scroller_x');
document.getElementById('timetracker').scrollLeft = scroller.scrollLeft;
document.getElementById('scroll_container').scrollLeft = scroller.scrollLeft;
document.getElementById('zoom_buttons').style["left"] = scroller.scrollLeft+"px";
}
@ -119,4 +121,9 @@ function adjustScrollableDimensions() {
// Inner divs need recalculation to adjust to new scroll displacement lenght
document.getElementById('ganttpanel_inner_scroller_x').style["width"]
= watermark.offsetWidth +"px";
}
function make_visible() {
document.getElementById('ganttpanel_scroller_x').style["display"]="inline";
document.getElementById('ganttpanel_scroller_y').style["display"]="inline";
}

6
navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
View file

@ -80,11 +80,11 @@ public class CustomMenuController extends Div {
ci = new CustomMenuItem("mainmenu.orders",
"/navalplanner-webapp/orders/orders.zul");
ci.appendChildren(new CustomMenuItem("mainmenu.list_orders",
"/orders/orders.zul"));
"/navalplanner-webapp/orders/orders.zul"));
ci.appendChildren(new CustomMenuItem("mainmenu.activity_work_types",
"/orders/orders.zul"));
"/navalplanner-webapp/orders/orders.zul"));
ci.appendChildren(new CustomMenuItem("mainmenu.models",
"/orders/orders.zul"));
"/navalplanner-webapp/orders/orders.zul"));
l.add(ci);
ci = new CustomMenuItem("mainmenu.work_reports",

2
navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
View file

@ -50,7 +50,7 @@
<n:td height="400" valign="top"><div self="@{insert(content)}"/></n:td>
</n:tr>
<n:tr class="footer">
<n:td height="75" align="right" valign="bottom" background="img/linea_down.gif"><n:img src="/navalplanner-webapp/common/img/logos_aplicacion.gif" width="332" height="73" /></n:td>
<n:td height="75" align="right" valign="bottom" background="/navalplanner-webapp/common/img/linea_down.gif"><n:img src="/navalplanner-webapp/common/img/logos_aplicacion.gif" width="332" height="73" /></n:td>
</n:tr>
</n:table>
</n:div>

1
navalplanner-webapp/src/main/webapp/orders/orders.zul
View file

@ -1,3 +1,4 @@
<?page title="Navalpro: Orders"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="List"?>

30
navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
View file

@ -6,11 +6,17 @@ The next constants are used within the planner styling:
Ganntz.ListdetailsWidth = 280
zkTasklist.HEIGHT_PER_ROW = 15
zkTasklist.HEIGHT_TIME_TRACKER = 120
zkTasklist.SCROLLBAR_WIDTH = 15
zkTasklist.SCROLL_CONTAINER_INITIAL_HEIGHT = 500
zkTasklist.SCROLL_CONTAINER_INITIAL_WIDTH = 600
zkTasklist.GANTT_PANEL_LEFT = 300
*/
/* -------------- Listdetails -------------- */
@ -27,7 +33,7 @@ zkTasklist.SCROLLBAR_WIDTH = 15
#listdetails_container {
float:left;
height:300px;
height:500px; /* zkTasklist.SCROLL_CONTAINER_INITIAL_HEIGHT */
position:relative;
top:27px;
overflow-y: hidden;
@ -42,7 +48,7 @@ zkTasklist.SCROLLBAR_WIDTH = 15
#listdetails_container td {
border-bottom:1px solid #86A4BE;
border-left:1px solid #86A4BE;
border:0px;
border:0px;
}
#listdetails_container td {
@ -254,13 +260,16 @@ table {
/* border: solid 1px red; */
position:absolute;
left:285px; /* Ganntz.ListdetailsWidth + borders = 280 + 5 */
width:600px;
height:400px;
height:500px; /* zkTasklist.SCROLL_CONTAINER_INITIAL_HEIGHT (dynamic) */
width:600px; /* zkTasklist.SCROLL_CONTAINER_INITIAL_WIDTH (dynamic) */
position:absolute;
overflow-x:hidden;
float:left;
}
#zoom_buttons {
position:relative;
}
tr.z-vbox-sep {
height: 0px;
@ -276,7 +285,8 @@ tr.z-vbox-sep {
}
#ganttpanel_scroller_x {
top: 600px; /* Calculate initial settings */
top: 600px; /* (dynamic) */
left: 285px; /* Ganntz.ListdetailsWidth + borders = 280 + 5 */
width:635px;
height:15px;
@ -303,4 +313,12 @@ tr.z-vbox-sep {
.footer {
/* Pending to calculate general position */
display:none;
}
}
/* Hide at the beginning */
#ganttpanel_scroller_x {
display:none;
}
#ganttpanel_scroller_y {
display:none;
}

2
navalplanner-webapp/src/main/webapp/planner/main.zul
View file

@ -1,4 +1,4 @@
<?page title="GanttZK demo" contentType="text/html;charset=UTF-8"?>
<?page title="Navalpro: Scheduling"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>

1
navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
View file

@ -1,3 +1,4 @@
<?page title="Navalpro: Resources"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<?page id="Create"?>