From 5980266fc7e7f185589a0ade40507c3d6c2edfd9 Mon Sep 17 00:00:00 2001 From: nathangray Date: Fri, 13 Sep 2019 09:50:13 -0600 Subject: [PATCH] Calendar - more icon changes from Eva - Restore today icon - replace day view icon - better names for view icons to avoid future confusion --- calendar/inc/class.calendar_uiviews.inc.php | 16 ++++++++-------- .../default/images/{day.png => 1_day_view.png} | Bin .../default/images/{list.png => list_view.png} | Bin .../images/{month.png => month_view.png} | Bin .../{multiweek.png => multiweek_view.png} | Bin .../images/{planner.png => planner_view.png} | Bin .../default/images/{week.png => week_view.png} | Bin .../default/images/{year.png => year_view.png} | Bin .../templates/pixelegg/images/1_day_view.svg | 15 +++++++++++++++ .../images/{cal4.png => 4_day_view.png} | Bin .../images/{cal4.svg => 4_day_view.svg} | 0 .../pixelegg/images/{list.png => list_view.png} | Bin .../pixelegg/images/{list.svg => list_view.svg} | 0 .../images/{month.png => month_view.png} | Bin .../images/{month.svg => month_view.svg} | 0 .../{multiweek.png => multiweek_view.png} | Bin .../{multiweek.svg => multiweek_view.svg} | 0 ...r_category.png => planner_category_view.png} | Bin ...r_category.svg => planner_category_view.svg} | 0 .../images/{planner.png => planner_view.png} | Bin .../images/{planner.svg => planner_view.svg} | 0 calendar/templates/pixelegg/images/today.svg | 14 ++++++++------ .../pixelegg/images/{week.png => week_view.png} | Bin .../pixelegg/images/{week.svg => week_view.svg} | 0 .../pixelegg/images/{year.png => year_view.png} | Bin .../pixelegg/images/{year.svg => year_view.svg} | 0 26 files changed, 31 insertions(+), 14 deletions(-) rename calendar/templates/default/images/{day.png => 1_day_view.png} (100%) rename calendar/templates/default/images/{list.png => list_view.png} (100%) rename calendar/templates/default/images/{month.png => month_view.png} (100%) rename calendar/templates/default/images/{multiweek.png => multiweek_view.png} (100%) rename calendar/templates/default/images/{planner.png => planner_view.png} (100%) rename calendar/templates/default/images/{week.png => week_view.png} (100%) rename calendar/templates/default/images/{year.png => year_view.png} (100%) create mode 100644 calendar/templates/pixelegg/images/1_day_view.svg rename calendar/templates/pixelegg/images/{cal4.png => 4_day_view.png} (100%) rename calendar/templates/pixelegg/images/{cal4.svg => 4_day_view.svg} (100%) rename calendar/templates/pixelegg/images/{list.png => list_view.png} (100%) rename calendar/templates/pixelegg/images/{list.svg => list_view.svg} (100%) rename calendar/templates/pixelegg/images/{month.png => month_view.png} (100%) rename calendar/templates/pixelegg/images/{month.svg => month_view.svg} (100%) rename calendar/templates/pixelegg/images/{multiweek.png => multiweek_view.png} (100%) rename calendar/templates/pixelegg/images/{multiweek.svg => multiweek_view.svg} (100%) rename calendar/templates/pixelegg/images/{planner_category.png => planner_category_view.png} (100%) rename calendar/templates/pixelegg/images/{planner_category.svg => planner_category_view.svg} (100%) rename calendar/templates/pixelegg/images/{planner.png => planner_view.png} (100%) rename calendar/templates/pixelegg/images/{planner.svg => planner_view.svg} (100%) rename calendar/templates/pixelegg/images/{week.png => week_view.png} (100%) rename calendar/templates/pixelegg/images/{week.svg => week_view.svg} (100%) rename calendar/templates/pixelegg/images/{year.png => year_view.png} (100%) rename calendar/templates/pixelegg/images/{year.svg => year_view.svg} (100%) diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 17d2a3b0dd..e10387ba0c 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -269,7 +269,7 @@ class calendar_uiviews extends calendar_ui ), 'day_view' => array( 'caption' => 'Dayview', - 'icon' => 'day', + 'icon' => '1_day_view', 'group' => ++$group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Dayview', @@ -278,7 +278,7 @@ class calendar_uiviews extends calendar_ui ), '4day_view' => array( 'caption' => 'Four days view', - 'icon' => 'cal4', + 'icon' => '4_day_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Four days view', @@ -287,7 +287,7 @@ class calendar_uiviews extends calendar_ui ), 'week_view' => array( 'caption' => 'Weekview', - 'icon' => 'week', + 'icon' => 'week_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Weekview', @@ -296,7 +296,7 @@ class calendar_uiviews extends calendar_ui ), 'weekN_view' => array( 'caption' => 'Multiple week view', - 'icon' => 'multiweek', + 'icon' => 'multiweek_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Multiple week view', @@ -305,7 +305,7 @@ class calendar_uiviews extends calendar_ui ), 'month_view' => array( 'caption' => 'Monthview', - 'icon' => 'month', + 'icon' => 'month_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Monthview', @@ -314,7 +314,7 @@ class calendar_uiviews extends calendar_ui ), 'planner_category' => array( 'caption' => 'Planner by category', - 'icon' => 'planner_category', + 'icon' => 'planner_category_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Planner by category', @@ -323,7 +323,7 @@ class calendar_uiviews extends calendar_ui ), 'planner_user' => array( 'caption' => 'Planner by user', - 'icon' => 'planner', + 'icon' => 'planner_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Planner by user', @@ -332,7 +332,7 @@ class calendar_uiviews extends calendar_ui ), 'planner_month' => array( 'caption' => 'Yearly planner', - 'icon' => 'year', + 'icon' => 'year_view', 'group' => $group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Yearly planner', diff --git a/calendar/templates/default/images/day.png b/calendar/templates/default/images/1_day_view.png similarity index 100% rename from calendar/templates/default/images/day.png rename to calendar/templates/default/images/1_day_view.png diff --git a/calendar/templates/default/images/list.png b/calendar/templates/default/images/list_view.png similarity index 100% rename from calendar/templates/default/images/list.png rename to calendar/templates/default/images/list_view.png diff --git a/calendar/templates/default/images/month.png b/calendar/templates/default/images/month_view.png similarity index 100% rename from calendar/templates/default/images/month.png rename to calendar/templates/default/images/month_view.png diff --git a/calendar/templates/default/images/multiweek.png b/calendar/templates/default/images/multiweek_view.png similarity index 100% rename from calendar/templates/default/images/multiweek.png rename to calendar/templates/default/images/multiweek_view.png diff --git a/calendar/templates/default/images/planner.png b/calendar/templates/default/images/planner_view.png similarity index 100% rename from calendar/templates/default/images/planner.png rename to calendar/templates/default/images/planner_view.png diff --git a/calendar/templates/default/images/week.png b/calendar/templates/default/images/week_view.png similarity index 100% rename from calendar/templates/default/images/week.png rename to calendar/templates/default/images/week_view.png diff --git a/calendar/templates/default/images/year.png b/calendar/templates/default/images/year_view.png similarity index 100% rename from calendar/templates/default/images/year.png rename to calendar/templates/default/images/year_view.png diff --git a/calendar/templates/pixelegg/images/1_day_view.svg b/calendar/templates/pixelegg/images/1_day_view.svg new file mode 100644 index 0000000000..439e63b404 --- /dev/null +++ b/calendar/templates/pixelegg/images/1_day_view.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/calendar/templates/pixelegg/images/cal4.png b/calendar/templates/pixelegg/images/4_day_view.png similarity index 100% rename from calendar/templates/pixelegg/images/cal4.png rename to calendar/templates/pixelegg/images/4_day_view.png diff --git a/calendar/templates/pixelegg/images/cal4.svg b/calendar/templates/pixelegg/images/4_day_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/cal4.svg rename to calendar/templates/pixelegg/images/4_day_view.svg diff --git a/calendar/templates/pixelegg/images/list.png b/calendar/templates/pixelegg/images/list_view.png similarity index 100% rename from calendar/templates/pixelegg/images/list.png rename to calendar/templates/pixelegg/images/list_view.png diff --git a/calendar/templates/pixelegg/images/list.svg b/calendar/templates/pixelegg/images/list_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/list.svg rename to calendar/templates/pixelegg/images/list_view.svg diff --git a/calendar/templates/pixelegg/images/month.png b/calendar/templates/pixelegg/images/month_view.png similarity index 100% rename from calendar/templates/pixelegg/images/month.png rename to calendar/templates/pixelegg/images/month_view.png diff --git a/calendar/templates/pixelegg/images/month.svg b/calendar/templates/pixelegg/images/month_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/month.svg rename to calendar/templates/pixelegg/images/month_view.svg diff --git a/calendar/templates/pixelegg/images/multiweek.png b/calendar/templates/pixelegg/images/multiweek_view.png similarity index 100% rename from calendar/templates/pixelegg/images/multiweek.png rename to calendar/templates/pixelegg/images/multiweek_view.png diff --git a/calendar/templates/pixelegg/images/multiweek.svg b/calendar/templates/pixelegg/images/multiweek_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/multiweek.svg rename to calendar/templates/pixelegg/images/multiweek_view.svg diff --git a/calendar/templates/pixelegg/images/planner_category.png b/calendar/templates/pixelegg/images/planner_category_view.png similarity index 100% rename from calendar/templates/pixelegg/images/planner_category.png rename to calendar/templates/pixelegg/images/planner_category_view.png diff --git a/calendar/templates/pixelegg/images/planner_category.svg b/calendar/templates/pixelegg/images/planner_category_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/planner_category.svg rename to calendar/templates/pixelegg/images/planner_category_view.svg diff --git a/calendar/templates/pixelegg/images/planner.png b/calendar/templates/pixelegg/images/planner_view.png similarity index 100% rename from calendar/templates/pixelegg/images/planner.png rename to calendar/templates/pixelegg/images/planner_view.png diff --git a/calendar/templates/pixelegg/images/planner.svg b/calendar/templates/pixelegg/images/planner_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/planner.svg rename to calendar/templates/pixelegg/images/planner_view.svg diff --git a/calendar/templates/pixelegg/images/today.svg b/calendar/templates/pixelegg/images/today.svg index 439e63b404..656cb1b514 100644 --- a/calendar/templates/pixelegg/images/today.svg +++ b/calendar/templates/pixelegg/images/today.svg @@ -1,15 +1,17 @@ - + - - - - + diff --git a/calendar/templates/pixelegg/images/week.png b/calendar/templates/pixelegg/images/week_view.png similarity index 100% rename from calendar/templates/pixelegg/images/week.png rename to calendar/templates/pixelegg/images/week_view.png diff --git a/calendar/templates/pixelegg/images/week.svg b/calendar/templates/pixelegg/images/week_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/week.svg rename to calendar/templates/pixelegg/images/week_view.svg diff --git a/calendar/templates/pixelegg/images/year.png b/calendar/templates/pixelegg/images/year_view.png similarity index 100% rename from calendar/templates/pixelegg/images/year.png rename to calendar/templates/pixelegg/images/year_view.png diff --git a/calendar/templates/pixelegg/images/year.svg b/calendar/templates/pixelegg/images/year_view.svg similarity index 100% rename from calendar/templates/pixelegg/images/year.svg rename to calendar/templates/pixelegg/images/year_view.svg