Merge 465598edd3 into 4f9cad88bd

Rename master to main
Update forms.html
2025-05-15 08:51:50 +02:00 · 2024-12-28 02:12:30 +01:00 · 2024-12-28 00:50:27 +01:00 · 2024-08-10 01:26:37 -04:00 · 2024-08-10 00:57:36 -04:00
3 changed files with 6 additions and 5 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,9 +2,9 @@ name: CI

 on:
  push:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]

 jobs:
  lint:
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@ -3,9 +3,9 @@ name: Docker build
 on:
  push:
    tags: ['*']
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]


 jobs:
--- a/ihatemoney/templates/forms.html
+++ b/ihatemoney/templates/forms.html
@ -236,7 +236,8 @@
    {{ input(form.weight) }}
    </fieldset>
    <div class="actions">
-        {{ form.submit(class="btn btn-primary") }}
+        <button class="btn btn-secondary input-group-addon" type="submit">{{ _("Save") }}</button>
+        <a href="{{ url_for(".list_bills") }}" class="btn btn-outline-secondary"> {{_("Cancel") }} </a>
    </div>
 {% endmacro %}
Author	SHA1	Message	Date
singeltary	8576169184	Merge `465598edd3` into `4f9cad88bd`	2024-12-28 02:12:30 +01:00
Alexis Métaireau	4f9cad88bd	Rename master to main Some checks failed CI / lint (push) Has been cancelled Details CI / docs (push) Has been cancelled Details Docker build / test (push) Has been cancelled Details CI / test (mariadb, minimal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.9) (push) Has been cancelled Details CI / test (postgresql, minimal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.9) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.10) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.11) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.12) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.9) (push) Has been cancelled Details CI / test (sqlite, normal, 3.10) (push) Has been cancelled Details CI / test (sqlite, normal, 3.11) (push) Has been cancelled Details CI / test (sqlite, normal, 3.12) (push) Has been cancelled Details CI / test (sqlite, normal, 3.8) (push) Has been cancelled Details CI / test (sqlite, normal, 3.9) (push) Has been cancelled Details Docker build / build_upload (push) Has been cancelled Details	2024-12-28 00:50:27 +01:00
singeltary	465598edd3	Update forms.html Updated button on form for editing participants--"Save" for edits instead of "Add."	2024-08-10 01:26:37 -04:00
singeltary	3825710189	Update forms.html Added navigation element in 'Edit Participants' window	2024-08-10 00:57:36 -04:00