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

@@ -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',

calendar/templates/pixelegg/images/1_day_view.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g>
+	<path fill="#62686A" d="M5.468,4.934H5.411L1.848,6.629L1.13,3.354l4.971-2.298h3.591V19.73H5.468V4.934z"/>
+</g>
+<g>
+	<g>
+		<path fill="#62686A" d="M26.001,1.001H16v3h9.001c1.657,0,3,1.343,3,3V25c0,1.657-1.343,3-3,3H7c-1.656,0-3-1.343-3-3v-3H1v4
+			c0,2.762,2.238,5,5,5h20.001c2.761,0,5-2.238,5-5V6.001C31.001,3.239,28.762,1.001,26.001,1.001z"/>
+	</g>
+</g>
+</svg>

calendar/templates/pixelegg/images/today.svg

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
+<svg version="1.1" id="calendar_day" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g>
-	<path fill="#62686A" d="M5.468,4.934H5.411L1.848,6.629L1.13,3.354l4.971-2.298h3.591V19.73H5.468V4.934z"/>
-</g>
 <g>
 	<g>
-		<path fill="#62686A" d="M26.001,1.001H16v3h9.001c1.657,0,3,1.343,3,3V25c0,1.657-1.343,3-3,3H7c-1.656,0-3-1.343-3-3v-3H1v4
-			c0,2.762,2.238,5,5,5h20.001c2.761,0,5-2.238,5-5V6.001C31.001,3.239,28.762,1.001,26.001,1.001z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#696969" d="M23.084,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2
+			c-1.105,0-2,0.896-2,2v3C21.084,7.104,21.979,8,23.084,8z M9.083,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2s-2,0.896-2,2v3
+			C7.083,7.104,7.979,8,9.083,8z M27.084,4h-1v3c0,1.104-0.896,2-2,2h-2c-1.105,0-2-0.896-2-2V4h-8v3c0,1.104-0.896,2-2,2h-2
+			c-1.104,0-2-0.896-2-2V4h-1c-1.104,0-2,0.896-2,2v23c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V6
+			C29.084,4.896,28.188,4,27.084,4z M12.083,28h-6v-5h6V28z M12.083,22h-6v-5h6V22z M12.083,16h-6v-5h6V16z M19.084,28h-6v-5h6V28z
+			 M19.084,22h-6v-5h6V22z M19.084,16h-6v-5h6V16z M26.084,28h-6v-5h6V28z M26.084,16h-6v-5h6V16z"/>
 	</g>
 </g>
 </svg>