Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on the time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-10-02 12:57:38 +03:00
parent d7b1998ae6
commit 251d960b60
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/views/tasks/time_tracker.blade.php
View File

@ -121,6 +121,15 @@
margin-bottom: 60px; margin-bottom: 60px;
} }
#taskList {
position: fixed;
}
#taskForm {
overflow: visible;
}
.times-table td { .times-table td {
xmargin: 0px !important; xmargin: 0px !important;
xpadding: 0px !important; xpadding: 0px !important;
@ -194,7 +203,7 @@
<div class="row no-gutter"> <div class="row no-gutter">
<!-- Task Form --> <!-- Task Form -->
<div class="col-sm-7 col-sm-push-5"> <div id="taskForm" class="col-sm-7 col-sm-push-5">
<div id="formDiv" class="panel panel-default x-affix" data-bind="visible: selectedTask" style="margin:20px; display:none;"> <div id="formDiv" class="panel panel-default x-affix" data-bind="visible: selectedTask" style="margin:20px; display:none;">
<div class="panel-body"> <div class="panel-body">
<form id="taskForm"> <form id="taskForm">
@ -294,7 +303,7 @@
</div> </div>
<!-- Task List --> <!-- Task List -->
<div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none"> <div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none;overflow:auto;margin-bottom:0px;">
<div id="filterPanel" style="margin-bottom:0px;padding-top:20px;padding-bottom:0px;padding-left:10px;display:none;"> <div id="filterPanel" style="margin-bottom:0px;padding-top:20px;padding-bottom:0px;padding-left:10px;display:none;">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@ -610,10 +619,16 @@
$('#buttons .btn').removeClass('btn-lg'); $('#buttons .btn').removeClass('btn-lg');
} }
} }
function setPanelHeights() {
var height = $(window).height() - $('.navbar').height() - 2;
$('#taskList').height(height);
}
$(window).on('resize', function() { $(window).on('resize', function() {
setButtonSize(); setButtonSize();
setPanelHeights();
}); });
setButtonSize(); setButtonSize();
setPanelHeights();
$(window).on('beforeunload', function () { $(window).on('beforeunload', function () {
if (model.isDesktop()) { if (model.isDesktop()) {

1
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -362,7 +362,6 @@
return false; return false;
} }
var project = task.project(); var project = task.project();
console.log(project);
if (self.selectedProject() && self.selectedProject().public_id() == project.public_id()) { if (self.selectedProject() && self.selectedProject().public_id() == project.public_id()) {
self.filter(''); self.filter('');
self.selectedProject(false); self.selectedProject(false);