Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Nov 4, 2024
1 parent 208af99 commit f3f4f15
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ addon | version | maintainers | summary
[web_action_conditionable](web_action_conditionable/) | 16.0.1.0.0 | | web_action_conditionable
[web_advanced_search](web_advanced_search/) | 16.0.1.0.5 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Easier and more powerful searching tools
[web_apply_field_style](web_apply_field_style/) | 16.0.1.0.1 | | Apply css class style to fields from a dict parameters
[web_calendar_slot_duration](web_calendar_slot_duration/) | 16.0.1.0.1 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Customizable calendar slot durations
[web_calendar_slot_duration](web_calendar_slot_duration/) | 16.0.1.1.0 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Customizable calendar slot durations
[web_chatter_position](web_chatter_position/) | 16.0.1.0.2 | | Add an option to change the chatter position
[web_company_color](web_company_color/) | 16.0.1.2.3 | | Web Company Color
[web_copy_confirm](web_copy_confirm/) | 16.0.1.0.0 | | Show confirmation dialogue before copying records
Expand Down
8 changes: 4 additions & 4 deletions web_calendar_slot_duration/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Calendar slot duration
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1274b3dddbcd34bf1401a1f208b67af94f47a47121fa32b120acbc37c84a63be
!! source digest: sha256:3a39a33ad7a9a5a3673b1461fb0f8651e690a8437512f2a9c58b6614319fe3af
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
Expand Down Expand Up @@ -49,10 +49,10 @@ action includes a context similar to this (example is the default value)::

In addition, you can also configure the calendar view's default mode by adding::

{"calendar_slot_duration": "00:30:00", "adapt_view_to_slot_duration": False}
{"calendar_slot_duration": "00:30:00", "keep_default_view_slot_duration": True}

The ``adapt_view_to_slot_duration`` key is optional and defaults to ``True``.
When set to ``False``, the calendar view will not adapt its view to the slot size.
The ``keep_default_view_slot_duration`` key is optional and defaults to ``False``.
When set to ``True``, the calendar view will not adapt its view to the slot size.

For example, if you want to set the default slot duration to 1 hour and 30 minutes,
by default the calendar view will adapt its view to show slots of 1 hour and 30 minutes.
Expand Down
2 changes: 1 addition & 1 deletion web_calendar_slot_duration/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Calendar slot duration",
"summary": "Customizable calendar slot durations",
"version": "16.0.1.0.1",
"version": "16.0.1.1.0",
"development_status": "Production/Stable",
"category": "Extra Tools",
"website": "https://github.com/OCA/web",
Expand Down
19 changes: 11 additions & 8 deletions web_calendar_slot_duration/static/description/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -366,7 +367,7 @@ <h1 class="title">Calendar slot duration</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1274b3dddbcd34bf1401a1f208b67af94f47a47121fa32b120acbc37c84a63be
!! source digest: sha256:3a39a33ad7a9a5a3673b1461fb0f8651e690a8437512f2a9c58b6614319fe3af
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/16.0/web_calendar_slot_duration"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_calendar_slot_duration"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of backend calendars to support custom
Expand Down Expand Up @@ -397,10 +398,10 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
</pre>
<p>In addition, you can also configure the calendar view’s default mode by adding:</p>
<pre class="literal-block">
{&quot;calendar_slot_duration&quot;: &quot;00:30:00&quot;, &quot;adapt_view_to_slot_duration&quot;: False}
{&quot;calendar_slot_duration&quot;: &quot;00:30:00&quot;, &quot;keep_default_view_slot_duration&quot;: True}
</pre>
<p>The <tt class="docutils literal">adapt_view_to_slot_duration</tt> key is optional and defaults to <tt class="docutils literal">True</tt>.
When set to <tt class="docutils literal">False</tt>, the calendar view will not adapt its view to the slot size.</p>
<p>The <tt class="docutils literal">keep_default_view_slot_duration</tt> key is optional and defaults to <tt class="docutils literal">False</tt>.
When set to <tt class="docutils literal">True</tt>, the calendar view will not adapt its view to the slot size.</p>
<p>For example, if you want to set the default slot duration to 1 hour and 30 minutes,
by default the calendar view will adapt its view to show slots of 1 hour and 30 minutes.
Sometimes this is not desired, for example when you want to show every time slots by hour.</p>
Expand Down Expand Up @@ -447,7 +448,9 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down

0 comments on commit f3f4f15

Please sign in to comment.