Commit 91674a2a authored by vertighel's avatar vertighel
Browse files

refactor widget_shutter to accept config dict 



Align widget_shutter signature with other widgets: single config dict
with label, info, and move_url keys. Drop unused get_url parameter.
Update call sites in init.html and control.html.

Co-Authored-By: default avatarClaude Sonnet 4.6 <noreply@anthropic.com>
parent a18cecbb

noctua/web/pages/control.html

+7 −4
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ 
        "buttons": [{"label": "Go", "endpoint": "/stage/position", "method": "PUT"}],

        }) }}

        

        <!--

            {{ ctrl.stage_relative() }}

          -->



        {{ w.widget_toggle({

        "label": "Is init?",
@@ -106,8 +108,9 @@ 


        {{ w.widget_shutter({

            "label":    "Dome",

        },

        "/dome/shutter", "/dome/shutter/movement", extra_flags=False) }}

            "info":     "/dome/shutter",

            "move_url": "/dome/shutter/movement",

        }) }}

        

      </section>

noctua/web/pages/init.html

+4 −5
Original line number Diff line number Diff line
@@ -123,10 +123,9 @@ 


            {{ w.widget_shutter({

                "label":    "Shutter",

            },

                get_url  = "/dome/shutter",

                move_url = "/dome/shutter/movement",

            ) }}

                "info":     "/dome/shutter",

                "move_url": "/dome/shutter/movement",

            }) }}

        </section>



    </article>

noctua/web/pages/macros/widgets.html

+12 −10
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
{% endmacro %}



<!-- WIDGET: Shutter -->

{% macro widget_shutter(get_url, move_url, extra_flags=True) %}

{% macro widget_shutter(config) %}

{% set safe_id = config.label | replace(' ', '-') | replace('?', '') | lower %}

<fieldset class="row mt-1 widget-universal align-items-center" id="toggle-{{ safe_id }}">

  <label class="col-md-3 col-form-label">
@@ -123,9 +123,11 @@ 
  <div class="col-md">

    <div class="input-group input-group-sm">



      {% if config.info %}

      <span class="col-md-2 input-group-text status-container">

        <var class="badge bg-secondary w-100" data-status="dome-shutter">Unk</var>

        <var class="badge bg-secondary w-100" data-status="{{ config.info.strip('/') | replace('/', '-') }}">Unk</var>

      </span>

      {% endif %}



      <button class="col-md btn btn-outline-primary dropdown-toggle"

              type="button" data-bs-toggle="dropdown" aria-expanded="false">
@@ -135,7 +137,7 @@ 
        <li>

          <button class="dropdown-item text-center fw-bold text-danger btn-universal"

                  data-method="POST"

                  data-url="{{ move_url }}"

                  data-url="{{ config.move_url }}"

                  data-safe-id="{{ safe_id }}"

                  data-value='true'>

            REALLY OPEN!
@@ -144,7 +146,7 @@ 
      </ul>

      <button class="col-md btn btn-outline-primary btn-universal"

              data-method="POST"

              data-url="{{ move_url }}"

              data-url="{{ config.move_url }}"

              data-safe-id="{{ safe_id }}"

              data-value='false'>

        Close