Change sidebar icons to Bootstrap Icon

modules/account/modules.php

@@ -208,7 +208,7 @@ protected function output() {
         if ($this->get('internal_users')) {
             $res = '<li class="menu_change_password"><a class="unread_link" href="?page=change_password">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$key).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-key-fill fs-5 me-2"></i>';
             }
             $res .= $this->trans('Password').'</a></li>';
             $this->concat('formatted_folder_list', $res);

modules/calendar/hm-calendar.php

@@ -69,7 +69,7 @@ private function output_event($day) {
                 $res .= '<div class="cal_event text-secondary">'.
                     $this->output_event_details($event).
                     $this->output_mod->html_safe(date('H:i', $event['ts'])).
-                    ' <a class="cal_title">'.$this->output_mod->html_safe($event['title']).
+                    ' <a class="cal_title cursor-pointer">'.$this->output_mod->html_safe($event['title']).
                     '</a></div>';
             }
             return $res;

modules/calendar/modules.php

@@ -119,7 +119,7 @@ public function process() {
 class Hm_Output_vcalendar_add_output extends Hm_Output_Module {
     protected function output() {
         if ($this->get('imap_calendar_struct')) {
-            $link = '<a class="add_vcal" href="">Add to calendar</a>';
+            $link = '<a class="add_vcal float-end mt-2 pe-4" href="">Add to calendar</a>';
             $this->concat('msg_headers', $link);
         }
     }
@@ -132,7 +132,7 @@ class Hm_Output_calendar_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_calendar"><a class="unread_link" href="?page=calendar">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$calendar).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-calendar-week-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Calendar').'</a></li>';
         if ($this->format == 'HTML5') {
@@ -156,7 +156,7 @@ protected function output() {
         );
         if ($this->get('cal_action') == 'add') {
             $res = '<div class="calendar p-0">
-                        <div class="content_title">'.$this->trans('Add an Event').'</div>
+                        <div class="content_title px-3">'.$this->trans('Add an Event').'</div>
                         <div class="px-4 mt-5">
                             <form method="post">
                                 <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
@@ -231,8 +231,8 @@ protected function output() {
             $events = $cal_events->in_date_range($bounds[0], $bounds[1]);
             $out = new Hm_Cal_Output($this, $events);
             $out = $out->output($data, $date, $view);
-            return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between">'.$this->trans('Calendar').
-                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm me-4">'.
+            return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between px-3">'.$this->trans('Calendar').
+                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm">'.
                 '<i class="bi bi-plus-circle me-2"></i> '.$this->trans('Add Event').'</a></div>'.
                 $out.'</div>';
         }

modules/calendar/site.css

@@ -1,22 +1,6 @@
-/* .calendar { width: 100%; } */
-/* .event_form { margin-left: 40px; } */
-/* .calendar_week th, .calendar_month th { font-weight: normal; padding-top: 10px; border-bottom: solid 1px #eee; padding-bottom: 10px; border-right: solid 1px #eee; } */
 .mobile .calendar_month th { max-width: 30px; overflow: hidden; }
 .calendar_month td { width: 14%; height: 120px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
-/* .calendar_week, .calendar_month { padding-bottom: 50px; width: 100%; } */
-/* .calendar_week .today, .calendar_month .today { background-color: #f5f5f5; } */
 .calendar_week .offmonth, .calendar_month .offmonth { color: #ccc; }
-/* .month_label { font-size: 120%; padding: 20px; margin-left: 10px; color: #999; } */
 .calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
-.calendar .event_form { margin-top: 20px; width: 20%; }
-.calendar .event_form td { padding-top: 5px; }
-/* .cal_label { text-align: left; padding-right: 20px; } */
-/* .event_submit { padding-top: 15px !important; } */
-/* .cal_event { position: relative; margin-top: 5px; color: #666; } */
 .event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
 .event_details td { padding: 5px; border: none;  height: auto; }
-.cal_title { cursor: pointer; }
-/* .event_title { border-bottom: solid 1px #eee; font-size: 120%; margin-bottom: 10px; } */
-/* .event_detail { padding: 10px; padding-bottom: 15px; } */
-/* .event_repeat { font-size: 90%; font-style: italic; text-align: right; } */
-.add_vcal { padding-right: 35px; float: right; margin-top: 10px; }

modules/carddav_contacts/modules.php

@@ -313,7 +313,7 @@ protected function output() {
             if (array_key_exists('phone_number', $current)) {
                 $phone = $current['phone_number'];
             }
-            $form_class = 'contact_update_form';
+            $form_class = 'contact_update_form mt-3';
             $title = sprintf($this->trans('Update Carddav - %s'), $this->html_safe($current['source']));
             $button = '<input type="hidden" name="contact_id" value="'.$this->html_safe($current['id']).'" />'.
                 '<input class="edit_contact_submit" type="submit" name="edit_contact" value="'.$this->trans('Update').'" />';