[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UX] Review the detailed presentation of a calendar event

Alvin Bauma pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
9871fe6d by Alvin Bauma at 2026-04-01T16:11:55+02:00
[FIX][UX] Review the detailed presentation of a calendar event
---
* [FIX][UX] Review the detailed presentation of a calendar event

See merge request tikiwiki/tiki!9903

- - - - -


1 changed file:

- templates/calendar/view_item.tpl


Changes:

=====================================
templates/calendar/view_item.tpl
=====================================
@@ -9,6 +9,24 @@
         file='calendar_header.tpl'
         viewlist='listEventView'
     }
+
+    {if not $preview}
+        <div class="float-end">
+            {permission name='change_events' type='calendaritem' object=$calitem.calitemId}
+                <a href="{service controller='calendar' action='edit_item' calitemId=$calitem.calitemId|escape}" class="btn btn-primary edit-calendar-item-btn">
+                    {tr}Edit{/tr}
+                </a>
+            {/permission}
+            {if $tiki_p_add_events eq 'y'}
+                <a 
+                    href="{service controller='calendar' action='edit_item' calitemId=0 copy_from=$calitem.calitemId|escape modal=1 return_url='tiki-calendar.php'}"
+                    class="btn btn-light edit-calendar-item-btn cleanable-false"
+                    title="{tr}Create a new event based on this one{/tr}">
+                    {icon name='copy'} {tr}Copy{/tr}
+                </a>
+            {/if}
+        </div>
+    {/if}
   
     <h5 class="mt-3 mb-3">{tr}Title{/tr} : {$calitem.parsedName}</h5>
     <div class="summary mb-4">
@@ -210,10 +228,11 @@
         {/if}
     {/if}
     <div class="summary">
-        <span class="px-3 py-2 rounded" style="background:#{$thiscustombgcolor};color:#{$thiscustomfgcolor};">{tr}Start{/tr} - {tr}End{/tr} : <b>{$calitem.display_datetimes}</b></span>
+        <span>{tr}Start{/tr} - {tr}End{/tr} : <b>{$calitem.display_datetimes}</b></span>
     </div>
-    <div class="row px-3 py-2 rounded">
-        <span class=" col-md-3" style="background:#{$thiscustombgcolor};color:#{$thiscustomfgcolor};">{tr}Description{/tr} : </span><p class="description col-md-6">{$calitem.parsed|default:"<em>{tr}No description{/tr}</em>"}</p>
+    <div class="my-3">
+        <b>{tr}Description{/tr}</b><br>
+        {$calitem.parsed|default:"<em>{tr}No description{/tr}</em>"}
     </div>
     {if !empty($trackerItems)}
         <div class="row px-3 py-2">
@@ -233,45 +252,49 @@
                 {* custom properties *}
                 {if $calendar.customstatus eq 'y'}
                     <tr>
-                        <td colspan="2">
+                        <th class="px-0 py-1">{tr}Status:{/tr}</th>
+                        <td class="px-0 py-1">
                             {if $calitem.status eq "Tentative"}
-                                <label class="badge bg-secondary mb-1">{tr}Tentative{/tr}</label>
+                                {icon name="question-circle" ititle='{tr}Tentative{/tr}' alt='{tr}Tentative{/tr}' iclass="text-warning me-1"}
+                                <span class="text-warning">{tr}Tentative{/tr}</span>
                             {elseif $calitem.status eq "Confirmed"}
-                                <label class="badge bg-success mb-1">{tr}Confirmed{/tr}</label>
+                                {icon name="check-circle" ititle='{tr}Confirmed{/tr}' alt='{tr}Confirmed{/tr}' iclass="text-success me-1"}
+                                <span class="text-success">{tr}Confirmed{/tr}</span>
                             {elseif $calitem.status eq "Cancelled"}
-                                <label class="badge bg-danger mb-1">{tr}Cancelled{/tr}</label>
+                                {icon name="status-closed" ititle='{tr}Cancelled{/tr}' alt='{tr}Cancelled{/tr}' iclass="text-danger me-1" istyle="color: red;"}
+                                <span class="text-danger">{tr}Cancelled{/tr}</span>
                             {else}
-                                <label class="badge bg-info mb-1">{tr}{$calitem.status|escape}{/tr}</label>
+                                <span class="text-muted">{tr}{$calitem.status|escape}{/tr}</span>
                             {/if}
                         </td>
                     </tr>
                 {/if}
                 {if $calendar.custompriorities eq 'y'}
                     <tr class="priority">
-                        <th style="background-color:#{$listprioritycolors[$calitem.priority]}">
+                        <th class="px-0 py-1" style="background-color:#{$listprioritycolors[$calitem.priority]}">
                             {tr}Priority:{/tr}
                         </th>
-                        <td>{if $calitem.priority neq ''}{$calitem.priority|escape}{else}<em class="text-secondary">{tr}No priority set for this event{/tr}</em>{/if}</td>
+                        <td class="px-0 py-1">{if $calitem.priority neq ''}{$calitem.priority|escape}{else}<em class="text-secondary">{tr}No priority set for this event{/tr}</em>{/if}</td>
                     </tr>
                 {/if}
                 {if $calendar.customcategories eq 'y'}
                     <tr class="category">
-                        <th>{tr}Classification:{/tr}</th>
-                        <td>{if $calitem.categoryName neq ''}{$calitem.categoryName|escape}{else}<em class="text-secondary">{tr}No classification added to this event{/tr}</em>{/if}</td>
+                        <th class="px-0 py-1">{tr}Classification:{/tr}</th>
+                        <td class="px-0 py-1">{if $calitem.categoryName neq ''}{$calitem.categoryName|escape}{else}<em class="text-secondary">{tr}No classification added to this event{/tr}</em>{/if}</td>
                     </tr>
                 {/if}
                 {if $calendar.customlocations eq 'y'}
                     <tr class="location">
-                        <th>{tr}Location:{/tr}</th>
-                        <td>{if $calitem.locationName neq ''}{$calitem.locationName|escape}{else}<em class="text-secondary">{tr}No location added to this event{/tr}</em>{/if}</td>
+                        <th class="px-0 py-1">{tr}Location:{/tr}</th>
+                        <td class="px-0 py-1">{if $calitem.locationName neq ''}{$calitem.locationName|escape}{else}<em class="text-secondary">{tr}No location added to this event{/tr}</em>{/if}</td>
                     </tr>
                 {/if}
                 {if $calendar.customurl eq 'y'}
                     <tr class="url">
-                        <th>{tr}Custom url:{/tr}</th>
-                        <td>
-                            {if $calitem.customurl neq ''}
-                                <a class="url" href="{$calitem.url}">
+                        <th class="px-0 py-1">{tr}Custom url:{/tr}</th>
+                        <td class="px-0 py-1">
+                            {if $calitem.url neq ''}
+                                <a class="url" href="{$calitem.url}" target="_blank" rel="noopener noreferrer">
                                     {$calitem.url|escape}
                                 </a>
                             {else}
@@ -282,14 +305,14 @@
                 {/if}
                 {if $calendar.customlanguages eq 'y'}
                     <tr class="language">
-                        <th>{tr}Language:{/tr}</th>
-                        <td>{if $calitem.lang neq ''}{$calitem.lang|langname}{else}<em class="text-secondary">{tr}No language added to this event{/tr}</em>{/if}</td>
+                        <th class="px-0 py-1">{tr}Language:{/tr}</th>
+                        <td class="px-0 py-1">{if $calitem.lang neq ''}{$calitem.lang|langname}{else}<em class="text-secondary">{tr}No language added to this event{/tr}</em>{/if}</td>
                     </tr>
                 {/if}
                 {if $calendar.customparticipants eq 'y'}
                     <tr class="organizers">
-                        <th>{tr}Organizers:{/tr}</th>
-                        <td>
+                        <th class="px-0 py-1">{tr}Organizers:{/tr}</th>
+                        <td class="px-0 py-1">
                             {if ! empty($calitem.organizers) && ($calitem.organizers|@count)}
                                 <ul>
                                 {foreach $calitem.organizers as $organizer}
@@ -303,8 +326,8 @@
                     </tr>
                     <tr class="participants">  
                         {$participating = false}
-                        <th>{tr}Participants:{/tr}</th>
-                        <td>
+                        <th class="px-0 py-1">{tr}Participants:{/tr}</th>
+                        <td class="px-0 py-1">
                             <p>
                                 {$emailString=""}
                                 {if $calitem.participants|@count}
@@ -350,19 +373,4 @@
             </table>
         </div>
     </div>
-    {if not $preview}
-        {permission name='change_events' type='calendaritem' object=$calitem.calitemId}
-            <a href="{service controller='calendar' action='edit_item' calitemId=$calitem.calitemId|escape}" class="btn btn-primary edit-calendar-item-btn">
-                {tr}Edit{/tr}
-            </a>
-        {/permission}
-        {if $tiki_p_add_events eq 'y'}
-            <a 
-                href="{service controller='calendar' action='edit_item' calitemId=0 copy_from=$calitem.calitemId|escape modal=1 return_url='tiki-calendar.php'}"
-                class="btn btn-tinted-primary edit-calendar-item-btn cleanable-false"
-                title="{tr}Create a new event based on this one{/tr}">
-                {icon name='copy'} {tr}Copy{/tr}
-            </a>
-        {/if}
-    {/if}
 {/block}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9871fe6dcec2eaaf6490353ceb26e6c2bbe0ac57

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9871fe6dcec2eaaf6490353ceb26e6c2bbe0ac57
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs