From f1e729ad89b78796b7f24176deb04f4e4fd5ffd8 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 24 Sep 2017 15:42:24 +0300 Subject: [PATCH] Working on time tracker --- .../Controllers/TimeTrackerController.php | 2 +- resources/lang/en/texts.php | 1 + resources/views/tasks/time_tracker.blade.php | 333 ++++++ resources/views/time_tracker.blade.php | 962 ------------------ 4 files changed, 335 insertions(+), 963 deletions(-) create mode 100644 resources/views/tasks/time_tracker.blade.php delete mode 100644 resources/views/time_tracker.blade.php diff --git a/app/Http/Controllers/TimeTrackerController.php b/app/Http/Controllers/TimeTrackerController.php index b26d425f4e78..dbebf0a7ae57 100644 --- a/app/Http/Controllers/TimeTrackerController.php +++ b/app/Http/Controllers/TimeTrackerController.php @@ -23,6 +23,6 @@ class TimeTrackerController extends Controller 'account' => $account, ]; - return view('time_tracker', $data); + return view('tasks.time_tracker', $data); } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 7c33b139674e..d6bcf0a942bd 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2452,6 +2452,7 @@ $LANG = array( 'time_tracker' => 'Time Tracker', 'refresh' => 'Refresh', 'filter_sort' => 'Filter/Sort', + 'no_description' => 'No Description', ); diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php new file mode 100644 index 000000000000..6cfbde266d68 --- /dev/null +++ b/resources/views/tasks/time_tracker.blade.php @@ -0,0 +1,333 @@ +@extends('master') + +@section('head') + @parent + + + +@stop + +@section('head_css') + @parent + + + +@stop + +@section('body') + + +
+ + + +
+
+ + +
+ +
+ + + + +
+
+ + @include('tasks.time_tracker_knockout') + + + +@stop diff --git a/resources/views/time_tracker.blade.php b/resources/views/time_tracker.blade.php deleted file mode 100644 index d8b1f934e417..000000000000 --- a/resources/views/time_tracker.blade.php +++ /dev/null @@ -1,962 +0,0 @@ -@extends('master') - -@section('head') - @parent - - - -@stop - -@section('head_css') - @parent - - - -@stop - -@section('body') - - -
- - - -
-
- - -
- -
- - - - -
-
- - - -@stop