From 1500ff92b2dc3d3932c8e06755bec23f9017e8a4 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 31 Jan 2016 12:15:26 -0500 Subject: Templates cleanup --- app/Template/export/subtasks.php | 8 +++----- app/Template/export/summary.php | 8 +++----- app/Template/export/tasks.php | 8 +++----- app/Template/export/transitions.php | 8 +++----- 4 files changed, 12 insertions(+), 20 deletions(-) (limited to 'app/Template/export') diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php index 4aad2641..f2a00f84 100644 --- a/app/Template/export/subtasks.php +++ b/app/Template/export/subtasks.php @@ -1,7 +1,5 @@

@@ -13,7 +11,7 @@ form->hidden('project_id', $values) ?> form->label(t('Start Date'), 'from') ?> - form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+ form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> form->label(t('End Date'), 'to') ?> form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> @@ -21,6 +19,6 @@
- +
\ No newline at end of file diff --git a/app/Template/export/summary.php b/app/Template/export/summary.php index ffbd6ac2..0c2a96fb 100644 --- a/app/Template/export/summary.php +++ b/app/Template/export/summary.php @@ -1,7 +1,5 @@

@@ -13,7 +11,7 @@ form->hidden('project_id', $values) ?> form->label(t('Start Date'), 'from') ?> - form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+ form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> form->label(t('End Date'), 'to') ?> form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> @@ -21,6 +19,6 @@
- +
\ No newline at end of file diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php index c74c8f98..c27149d2 100644 --- a/app/Template/export/tasks.php +++ b/app/Template/export/tasks.php @@ -1,7 +1,5 @@

@@ -13,7 +11,7 @@ form->hidden('project_id', $values) ?> form->label(t('Start Date'), 'from') ?> - form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+ form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> form->label(t('End Date'), 'to') ?> form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> @@ -21,6 +19,6 @@
- +
\ No newline at end of file diff --git a/app/Template/export/transitions.php b/app/Template/export/transitions.php index bf6ef249..d935bde1 100644 --- a/app/Template/export/transitions.php +++ b/app/Template/export/transitions.php @@ -1,7 +1,5 @@

@@ -13,7 +11,7 @@ form->hidden('project_id', $values) ?> form->label(t('Start Date'), 'from') ?> - form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+ form->text('from', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> form->label(t('End Date'), 'to') ?> form->text('to', $values, $errors, array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?> @@ -21,6 +19,6 @@
- +
\ No newline at end of file -- cgit v1.2.3 From 91200ddcdebb9e592cc264714c4a14921416868f Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Wed, 3 Feb 2016 18:27:45 -0500 Subject: Change sidebar style --- ChangeLog | 1 + Makefile | 2 +- app/Template/analytic/layout.php | 3 +- app/Template/analytic/sidebar.php | 2 - app/Template/app/sidebar.php | 2 - app/Template/config/sidebar.php | 2 - app/Template/export/sidebar.php | 2 - app/Template/project/sidebar.php | 2 - app/Template/task/layout.php | 2 +- app/Template/task/sidebar.php | 2 - app/Template/user/sidebar.php | 2 - assets/css/app.css | 2 +- assets/css/print.css | 2 +- assets/css/src/listing.css | 2 +- assets/css/src/sidebar.css | 109 +++++++++++++++----------------------- assets/js/app.js | 2 +- assets/js/src/App.js | 2 - assets/js/src/Sidebar.js | 25 --------- 18 files changed, 50 insertions(+), 116 deletions(-) delete mode 100644 assets/js/src/Sidebar.js (limited to 'app/Template/export') diff --git a/ChangeLog b/ChangeLog index 86f17e0d..8f48abaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ New features: Improvements: +* Change sidebar style * Change task summary layout * Use inline popup for subtasks modification * Move homepage menus to the user dropdown diff --git a/Makefile b/Makefile index d498487c..edbdfb00 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ CSS_APP = $(addprefix assets/css/src/, $(addsuffix .css, base links title table CSS_PRINT = $(addprefix assets/css/src/, $(addsuffix .css, print links table board task comment subtask markdown)) CSS_VENDOR = $(addprefix assets/css/vendor/, $(addsuffix .css, jquery-ui.min jquery-ui-timepicker-addon.min chosen.min fullcalendar.min font-awesome.min c3.min)) -JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Popover Dropdown Tooltip Markdown Sidebar Search App Screenshot Calendar Board Swimlane Gantt Task Project TaskRepartitionChart UserRepartitionChart CumulativeFlowDiagram BurndownChart AvgTimeColumnChart TaskTimeColumnChart LeadCycleTimeChart CompareHoursColumnChart Router)) +JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Popover Dropdown Tooltip Markdown Search App Screenshot Calendar Board Swimlane Gantt Task Project TaskRepartitionChart UserRepartitionChart CumulativeFlowDiagram BurndownChart AvgTimeColumnChart TaskTimeColumnChart LeadCycleTimeChart CompareHoursColumnChart Router)) JS_VENDOR = $(addprefix assets/js/vendor/, $(addsuffix .js, jquery-1.11.3.min jquery-ui.min jquery-ui-timepicker-addon.min jquery.ui.touch-punch.min chosen.jquery.min moment.min fullcalendar.min mousetrap.min mousetrap-global-bind.min jquery.textcomplete)) JS_LANG = $(addprefix assets/js/vendor/lang/, $(addsuffix .js, cs da de es el fi fr hu id it ja nl nb pl pt pt-br ru sv sr th tr zh-cn)) diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php index 4f22db10..f1dba552 100644 --- a/app/Template/analytic/layout.php +++ b/app/Template/analytic/layout.php @@ -31,8 +31,7 @@ -