Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -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-03 09:37:19 +03:00
parent 712f222e03
commit c5fce2efcd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/list.blade.php
View File

@ -87,6 +87,7 @@
}); });
</script> </script>
@elseif ($entityType == ENTITY_TASK) @elseif ($entityType == ENTITY_TASK)
{!! Button::normal(trans('texts.time_tracker'))->asLinkTo('javascript:openTimeTracker()')->appendIcon(Icon::create('time')) !!}
{!! DropdownButton::normal(trans('texts.projects')) {!! DropdownButton::normal(trans('texts.projects'))
->withAttributes(['class'=>'projectsDropdown']) ->withAttributes(['class'=>'projectsDropdown'])
->withContents([ ->withContents([
@ -100,7 +101,6 @@
}); });
}); });
</script> </script>
{!! Button::normal(trans('texts.time_tracker'))->asLinkTo('javascript:openTimeTracker()')->appendIcon(Icon::create('time')) !!}
@endif @endif
@if (Auth::user()->can('create', $entityType) && empty($vendorId)) @if (Auth::user()->can('create', $entityType) && empty($vendorId))

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

@ -196,7 +196,7 @@
<div class="row no-gutter"> <div class="row no-gutter">
<!-- Task Form --> <!-- Task Form -->
<div id="taskForm" class="col-sm-7 col-sm-push-5"> <div id="taskForm" class="col-sm-8 col-sm-push-4 col-md-7 col-md-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">
@ -304,7 +304,7 @@
</div> </div>
<!-- Task List --> <!-- Task List -->
<div id="taskList" class="list-group col-sm-5 col-sm-pull-7" style="display:none;overflow:auto;margin-bottom:0px;"> <div id="taskList" class="list-group col-sm-4 col-sm-pull-8 col-md-5 col-md-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">