From 594d62db21ebba3caa4e734f31d5bafbf2a21e8f Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 22 Nov 2017 13:49:31 -0500 Subject: [PATCH] A bunch of html tweaks --- app/Resources/views/base.html.twig | 36 +------------------ app/Resources/views/camera/edit.html.twig | 6 ++-- app/Resources/views/camera/index.html.twig | 2 +- app/Resources/views/camera/new.html.twig | 2 +- app/Resources/views/cameratype/edit.html.twig | 8 ++--- .../views/cameratype/index.html.twig | 2 +- app/Resources/views/cameratype/new.html.twig | 4 +-- app/Resources/views/cameratype/show.html.twig | 2 +- app/Resources/views/flash/edit.html.twig | 8 ++--- app/Resources/views/flash/index.html.twig | 6 ++-- app/Resources/views/flash/new.html.twig | 4 +-- app/Resources/views/flash/show.html.twig | 2 +- app/Resources/views/header.html.twig | 31 ++++++++++++++++ app/Resources/views/lenses/edit.html.twig | 8 ++--- app/Resources/views/lenses/index.html.twig | 4 +-- app/Resources/views/lenses/new.html.twig | 4 +-- .../previouslyownedcamera/edit.html.twig | 4 +-- .../previouslyownedcamera/index.html.twig | 4 +-- .../views/previouslyownedflash/edit.html.twig | 6 ++-- .../previouslyownedflash/index.html.twig | 16 ++++----- .../previouslyownedlenses/edit.html.twig | 4 +-- .../previouslyownedlenses/index.html.twig | 4 +-- 22 files changed, 83 insertions(+), 84 deletions(-) create mode 100644 app/Resources/views/header.html.twig diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 8855e20..1bbb1a0 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -13,41 +13,7 @@
-

Camera Collection Admin

-
-
- -
-
- -
-
+ {% include 'header.html.twig' %} {% block body %}{% endblock %}
diff --git a/app/Resources/views/camera/edit.html.twig b/app/Resources/views/camera/edit.html.twig index 1520c12..700d850 100644 --- a/app/Resources/views/camera/edit.html.twig +++ b/app/Resources/views/camera/edit.html.twig @@ -3,7 +3,7 @@ {% block form %}

Edit Camera

-
+
-
+
{{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
diff --git a/app/Resources/views/camera/index.html.twig b/app/Resources/views/camera/index.html.twig index 24f7e7d..97feb01 100644 --- a/app/Resources/views/camera/index.html.twig +++ b/app/Resources/views/camera/index.html.twig @@ -6,7 +6,7 @@
diff --git a/app/Resources/views/camera/new.html.twig b/app/Resources/views/camera/new.html.twig index 811402c..3e1fd95 100644 --- a/app/Resources/views/camera/new.html.twig +++ b/app/Resources/views/camera/new.html.twig @@ -14,7 +14,7 @@
{{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }}
diff --git a/app/Resources/views/cameratype/edit.html.twig b/app/Resources/views/cameratype/edit.html.twig index 4ec877e..12d0395 100644 --- a/app/Resources/views/cameratype/edit.html.twig +++ b/app/Resources/views/cameratype/edit.html.twig @@ -1,9 +1,9 @@ {% extends 'form.html.twig' %} {% block form %} -

Edit Camera Type

+

Edit Camera Type

-
+
-
+
{{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
diff --git a/app/Resources/views/cameratype/index.html.twig b/app/Resources/views/cameratype/index.html.twig index 10c4029..c69175a 100644 --- a/app/Resources/views/cameratype/index.html.twig +++ b/app/Resources/views/cameratype/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -

Camera Types

+

Camera Types

    diff --git a/app/Resources/views/cameratype/new.html.twig b/app/Resources/views/cameratype/new.html.twig index 5a309e2..75b871a 100644 --- a/app/Resources/views/cameratype/new.html.twig +++ b/app/Resources/views/cameratype/new.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

    Add a Camera Type

    +

    Add a Camera Type

      @@ -14,7 +14,7 @@
      {{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }}
      {% endblock %} diff --git a/app/Resources/views/cameratype/show.html.twig b/app/Resources/views/cameratype/show.html.twig index e939040..37ae79c 100644 --- a/app/Resources/views/cameratype/show.html.twig +++ b/app/Resources/views/cameratype/show.html.twig @@ -3,7 +3,7 @@ {% block form %}

      Camera Type

      -
      +
      • Back to the list diff --git a/app/Resources/views/flash/edit.html.twig b/app/Resources/views/flash/edit.html.twig index 6826a3e..04cb54f 100644 --- a/app/Resources/views/flash/edit.html.twig +++ b/app/Resources/views/flash/edit.html.twig @@ -1,9 +1,9 @@ {% extends 'form.html.twig' %} {% block form %} -

        Flash edit

        +

        Flash edit

        -
        +
        -
        +
        {{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
        diff --git a/app/Resources/views/flash/index.html.twig b/app/Resources/views/flash/index.html.twig index 4eb53ac..7ecd345 100644 --- a/app/Resources/views/flash/index.html.twig +++ b/app/Resources/views/flash/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -

        Flashes list

        +

        Flashes list

          @@ -25,6 +25,7 @@ P-TTL type Guide Number Purchase Price + Received Batteries Notes Serial @@ -49,7 +50,8 @@ {% if flash.isPTtl %}Yes{% else %}No{% endif %} {{ flash.pTtlType }} {{ flash.guideNumber }} - {{ flash.purchasePrice }} + ${{ flash.purchasePrice }} + {% if flash.received %}Yes{% else %}No{% endif %} {{ flash.batteries }} {{ flash.notes }} {{ flash.serial }} diff --git a/app/Resources/views/flash/new.html.twig b/app/Resources/views/flash/new.html.twig index cd06c26..2f97401 100644 --- a/app/Resources/views/flash/new.html.twig +++ b/app/Resources/views/flash/new.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

          Flash creation

          +

          Add a Flash

            @@ -14,7 +14,7 @@
            {{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }}
            diff --git a/app/Resources/views/flash/show.html.twig b/app/Resources/views/flash/show.html.twig index e44dfa9..4eed1e9 100644 --- a/app/Resources/views/flash/show.html.twig +++ b/app/Resources/views/flash/show.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

            Flash

            +

            Flash

              diff --git a/app/Resources/views/header.html.twig b/app/Resources/views/header.html.twig new file mode 100644 index 0000000..73134d5 --- /dev/null +++ b/app/Resources/views/header.html.twig @@ -0,0 +1,31 @@ +

              Camera Collection Admin

              +
              +
              + +
              +
              \ No newline at end of file diff --git a/app/Resources/views/lenses/edit.html.twig b/app/Resources/views/lenses/edit.html.twig index ec6f0d1..c327a23 100644 --- a/app/Resources/views/lenses/edit.html.twig +++ b/app/Resources/views/lenses/edit.html.twig @@ -1,9 +1,9 @@ {% extends 'form.html.twig' %} {% block form %} -

              Edit Lens

              +

              Edit Lens

              -
              +
              -
              +
              {{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
              diff --git a/app/Resources/views/lenses/index.html.twig b/app/Resources/views/lenses/index.html.twig index 73c7504..6124261 100644 --- a/app/Resources/views/lenses/index.html.twig +++ b/app/Resources/views/lenses/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -

              Lenses

              +

              Lenses

                @@ -49,7 +49,7 @@ {{ lense.minFStop }} — {{ lense.maxFStop }} {{ lense.minFocalLength }} — {{ lense.maxFocalLength }} {{ lense.serial }} - {{ lense.purchasePrice }} + ${{ lense.purchasePrice }} {{ lense.notes }} {{ lense.mount }} {% if lense.received %}Yes{% else %}No{% endif %} diff --git a/app/Resources/views/lenses/new.html.twig b/app/Resources/views/lenses/new.html.twig index 068ff19..3b4741c 100644 --- a/app/Resources/views/lenses/new.html.twig +++ b/app/Resources/views/lenses/new.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

                Add a Lens

                +

                Add a Lens

                  @@ -14,7 +14,7 @@
                  {{ form_start(form) }} {{ form_widget(form) }} - + {{ form_end(form) }}
                  {% endblock %} diff --git a/app/Resources/views/previouslyownedcamera/edit.html.twig b/app/Resources/views/previouslyownedcamera/edit.html.twig index 97fe29c..580546d 100644 --- a/app/Resources/views/previouslyownedcamera/edit.html.twig +++ b/app/Resources/views/previouslyownedcamera/edit.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

                  Edit Camera

                  +

                  Edit Camera

                    @@ -14,7 +14,7 @@
                    {{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
                    {% endblock %} diff --git a/app/Resources/views/previouslyownedcamera/index.html.twig b/app/Resources/views/previouslyownedcamera/index.html.twig index 7ca5ab7..14c74e1 100644 --- a/app/Resources/views/previouslyownedcamera/index.html.twig +++ b/app/Resources/views/previouslyownedcamera/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -

                    Previously Owned Cameras

                    +

                    Previously Owned Cameras

                    @@ -41,7 +41,7 @@ - + diff --git a/app/Resources/views/previouslyownedflash/edit.html.twig b/app/Resources/views/previouslyownedflash/edit.html.twig index fa27f45..1db336f 100644 --- a/app/Resources/views/previouslyownedflash/edit.html.twig +++ b/app/Resources/views/previouslyownedflash/edit.html.twig @@ -3,7 +3,7 @@ {% block form %}

                    Edit Previously Owned Flash

                    -
                    +
                    -
                    +
                    {{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
                    diff --git a/app/Resources/views/previouslyownedflash/index.html.twig b/app/Resources/views/previouslyownedflash/index.html.twig index b938181..9b1f884 100644 --- a/app/Resources/views/previouslyownedflash/index.html.twig +++ b/app/Resources/views/previouslyownedflash/index.html.twig @@ -10,13 +10,13 @@
                    - - - - - - - + + + + + + + @@ -41,7 +41,7 @@ - + diff --git a/app/Resources/views/previouslyownedlenses/edit.html.twig b/app/Resources/views/previouslyownedlenses/edit.html.twig index 5d81269..4c02de2 100644 --- a/app/Resources/views/previouslyownedlenses/edit.html.twig +++ b/app/Resources/views/previouslyownedlenses/edit.html.twig @@ -1,7 +1,7 @@ {% extends 'form.html.twig' %} {% block form %} -

                    Edit Lens

                    +

                    Edit Lens

                      @@ -14,7 +14,7 @@
                      {{ form_start(edit_form) }} {{ form_widget(edit_form) }} - + {{ form_end(edit_form) }}
                      {% endblock %} diff --git a/app/Resources/views/previouslyownedlenses/index.html.twig b/app/Resources/views/previouslyownedlenses/index.html.twig index b456be3..a1e849d 100644 --- a/app/Resources/views/previouslyownedlenses/index.html.twig +++ b/app/Resources/views/previouslyownedlenses/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -

                      Previously Owned Lenses

                      +

                      Previously Owned Lenses

                    {% if previouslyOwnedCamera.isWorking %}Yes{% else %}No{% endif %} {{ previouslyOwnedCamera.notes }} {{ previouslyOwnedCamera.serial }}{{ previouslyOwnedCamera.purchasePrice }}${{ previouslyOwnedCamera.purchasePrice }} {{ previouslyOwnedCamera.batteryType }} {{ previouslyOwnedCamera.filmFormat }} {% if previouslyOwnedCamera.received %}Yes{% else %}No{% endif %}Id Brand ModelIsautoflashIsttlTtltypeIspttlPttltypeGuidenumberPurchasepriceIs Auto Flash?Is TTLTTL TypeIs P-TTLP-TTL TypeGuide NumberPurchase Price Batteries Notes Serial{% if previouslyOwnedFlash.isPTtl %}Yes{% else %}No{% endif %} {{ previouslyOwnedFlash.pTtlType }} {{ previouslyOwnedFlash.guideNumber }}{{ previouslyOwnedFlash.purchasePrice }}${{ previouslyOwnedFlash.purchasePrice }} {{ previouslyOwnedFlash.batteries }} {{ previouslyOwnedFlash.notes }} {{ previouslyOwnedFlash.serial }}
                    @@ -43,7 +43,7 @@ - +
                    {{ previouslyOwnedLense.minFStop }} — {{ previouslyOwnedLense.maxFStop }} {{ previouslyOwnedLense.minFocalLength }} — {{ previouslyOwnedLense.maxFocalLength }} {{ previouslyOwnedLense.serial }}{{ previouslyOwnedLense.purchasePrice }}${{ previouslyOwnedLense.purchasePrice }} {{ previouslyOwnedLense.notes }} {{ previouslyOwnedLense.mount }} {{ previouslyOwnedLense.frontFilterSize }}