From 85e578477c1bae165a2c0046b2344afe4d8cc8a2 Mon Sep 17 00:00:00 2001 From: Kayn Ty Date: Tue, 17 Apr 2018 14:52:31 +0200 Subject: [PATCH] style cruds --- .../views/default/login-choices.html.twig | 35 +++++++------ app/Resources/views/festival/edit.html.twig | 2 +- app/Resources/views/festival/index.html.twig | 4 +- app/Resources/views/festival/new.html.twig | 2 +- app/Resources/views/festival/show.html.twig | 35 +++++++------ .../views/logged/angular/current.html.twig | 34 +++++-------- .../logged/angular/listing-products.html.twig | 15 +++--- .../logged/angular/loaded-caisse.html.twig | 12 +++-- .../logged/angular/validate-button.html.twig | 11 ++++ app/Resources/views/product/edit.html.twig | 2 +- app/Resources/views/product/index.html.twig | 6 +-- app/Resources/views/product/new.html.twig | 2 +- app/Resources/views/product/show.html.twig | 51 ++++++++++--------- .../views/productcategory/edit.html.twig | 2 +- .../views/productcategory/index.html.twig | 6 +-- .../views/productcategory/new.html.twig | 2 +- .../views/productcategory/show.html.twig | 6 +-- app/Resources/views/sellrecord/edit.html.twig | 2 +- .../views/sellrecord/index.html.twig | 4 +- app/Resources/views/sellrecord/new.html.twig | 2 +- app/Resources/views/sellrecord/show.html.twig | 19 ++++--- app/config/security.yml | 1 + assets/css/pages/global.scss | 5 ++ 23 files changed, 140 insertions(+), 120 deletions(-) create mode 100644 app/Resources/views/logged/angular/validate-button.html.twig diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index 38fe5a18..dcde9483 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -6,38 +6,41 @@ {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
- {{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} | + Bonjour + {##} + {##} + {##} + {{ app.user.username }} + + | {{ 'layout.logout'|trans({}, 'FOSUserBundle') }} diff --git a/app/Resources/views/festival/edit.html.twig b/app/Resources/views/festival/edit.html.twig index 47f9bafb..20df02e4 100755 --- a/app/Resources/views/festival/edit.html.twig +++ b/app/Resources/views/festival/edit.html.twig @@ -12,7 +12,7 @@
  • - + Retour à la liste
  • diff --git a/app/Resources/views/festival/index.html.twig b/app/Resources/views/festival/index.html.twig index b0509228..530fbab6 100755 --- a/app/Resources/views/festival/index.html.twig +++ b/app/Resources/views/festival/index.html.twig @@ -3,7 +3,7 @@ {% block body %}

    Festivals list

    - +
    @@ -41,7 +41,7 @@ {% endblock %} diff --git a/app/Resources/views/festival/new.html.twig b/app/Resources/views/festival/new.html.twig index 25c67533..458ce2e0 100755 --- a/app/Resources/views/festival/new.html.twig +++ b/app/Resources/views/festival/new.html.twig @@ -10,7 +10,7 @@ {% endblock %} diff --git a/app/Resources/views/festival/show.html.twig b/app/Resources/views/festival/show.html.twig index 7b96a1de..65734eef 100755 --- a/app/Resources/views/festival/show.html.twig +++ b/app/Resources/views/festival/show.html.twig @@ -3,33 +3,36 @@ {% block body %}

    Festival

    -
    Id
    +
    - - - - - - - - - - - - + + + + + + + + + + + +
    Id{{ festival.id }}
    Name{{ festival.name }}
    Datecreation{% if festival.dateCreation %}{{ festival.dateCreation|date('Y-m-d H:i:s') }}{% endif %}
    Id{{ festival.id }}
    Name{{ festival.name }}
    Datecreation{% if festival.dateCreation %}{{ festival.dateCreation|date('Y-m-d H:i:s') }}{% endif %}
    diff --git a/app/Resources/views/logged/angular/current.html.twig b/app/Resources/views/logged/angular/current.html.twig index cdf5d195..aa5ad042 100755 --- a/app/Resources/views/logged/angular/current.html.twig +++ b/app/Resources/views/logged/angular/current.html.twig @@ -1,26 +1,16 @@ {% verbatim %}
    -
    - -
     
    -{{lesParams|json}}
    -
    -
    Festival:
    + Client actuel: {{ activeSelling.length }} produits
    -
    • @@ -67,21 +57,21 @@
      - -
      -
      - + {% endverbatim %} + {% include 'logged/angular/validate-button.html.twig' %} +{% verbatim %}
      + + + + + +

    + {% endverbatim %} + diff --git a/app/Resources/views/logged/angular/listing-products.html.twig b/app/Resources/views/logged/angular/listing-products.html.twig index 86a11113..e4a715ee 100755 --- a/app/Resources/views/logged/angular/listing-products.html.twig +++ b/app/Resources/views/logged/angular/listing-products.html.twig @@ -1,19 +1,18 @@ {% verbatim %} -
    +

    {{ c.name }}

    {% endverbatim %} diff --git a/app/Resources/views/logged/angular/loaded-caisse.html.twig b/app/Resources/views/logged/angular/loaded-caisse.html.twig index 63b5a3a1..7ea932af 100755 --- a/app/Resources/views/logged/angular/loaded-caisse.html.twig +++ b/app/Resources/views/logged/angular/loaded-caisse.html.twig @@ -10,12 +10,14 @@
    + + {% include 'logged/angular/validate-button.html.twig' %} {% include 'logged/angular/current.html.twig' %} - {% include 'logged/angular/paused.html.twig' %} - {% include 'logged/angular/recent.html.twig' %} - - - + {#{% include 'logged/angular/paused.html.twig' %}#}
+
+ + {% include 'logged/angular/recent.html.twig' %} +
diff --git a/app/Resources/views/logged/angular/validate-button.html.twig b/app/Resources/views/logged/angular/validate-button.html.twig new file mode 100644 index 00000000..ed7aabd1 --- /dev/null +++ b/app/Resources/views/logged/angular/validate-button.html.twig @@ -0,0 +1,11 @@ + diff --git a/app/Resources/views/product/edit.html.twig b/app/Resources/views/product/edit.html.twig index f6cca44d..9ff52d27 100755 --- a/app/Resources/views/product/edit.html.twig +++ b/app/Resources/views/product/edit.html.twig @@ -11,7 +11,7 @@
  • - + Retour à la liste
  • diff --git a/app/Resources/views/product/index.html.twig b/app/Resources/views/product/index.html.twig index 220db33d..e8452d82 100755 --- a/app/Resources/views/product/index.html.twig +++ b/app/Resources/views/product/index.html.twig @@ -3,8 +3,8 @@ {% block body %}

    Products list

    - - +
    + @@ -44,7 +44,7 @@ {% endblock %} diff --git a/app/Resources/views/product/new.html.twig b/app/Resources/views/product/new.html.twig index a0282163..534cbed9 100755 --- a/app/Resources/views/product/new.html.twig +++ b/app/Resources/views/product/new.html.twig @@ -11,7 +11,7 @@
    • - + Retour à la liste
    • diff --git a/app/Resources/views/product/show.html.twig b/app/Resources/views/product/show.html.twig index 8b308da5..29d39258 100755 --- a/app/Resources/views/product/show.html.twig +++ b/app/Resources/views/product/show.html.twig @@ -3,41 +3,44 @@ {% block body %}

      Product

      -
    Id Name
    +
    - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
    Id{{ product.id }}
    Name{{ product.name }}
    Image{{ product.image }}
    Price{{ product.price }}
    Comment{{ product.comment }}
    Id{{ product.id }}
    Name{{ product.name }}
    Image{{ product.image }}
    Price{{ product.price }}
    Comment{{ product.comment }}
    diff --git a/app/Resources/views/productcategory/edit.html.twig b/app/Resources/views/productcategory/edit.html.twig index 404f3eb4..6c972876 100755 --- a/app/Resources/views/productcategory/edit.html.twig +++ b/app/Resources/views/productcategory/edit.html.twig @@ -10,7 +10,7 @@
    • - Retour à la liste + Retour à la liste
    • {{ form_start(delete_form) }} diff --git a/app/Resources/views/productcategory/index.html.twig b/app/Resources/views/productcategory/index.html.twig index 4c81bbcc..ba9a9dd8 100755 --- a/app/Resources/views/productcategory/index.html.twig +++ b/app/Resources/views/productcategory/index.html.twig @@ -3,11 +3,11 @@ {% block body %}

      Productcategories list

      - +
      - + @@ -41,7 +41,7 @@ {% endblock %} diff --git a/app/Resources/views/productcategory/new.html.twig b/app/Resources/views/productcategory/new.html.twig index 0624f5f0..8faa2cad 100755 --- a/app/Resources/views/productcategory/new.html.twig +++ b/app/Resources/views/productcategory/new.html.twig @@ -10,7 +10,7 @@ {% endblock %} diff --git a/app/Resources/views/productcategory/show.html.twig b/app/Resources/views/productcategory/show.html.twig index d071cb44..8ea3e392 100755 --- a/app/Resources/views/productcategory/show.html.twig +++ b/app/Resources/views/productcategory/show.html.twig @@ -3,7 +3,7 @@ {% block body %}

      Productcategory

      -
      IdNameNom Actions
      +
      @@ -18,10 +18,10 @@
      • - Retour à la liste + Retour à la liste
      • - edit
      • {{ form_start(delete_form) }} diff --git a/app/Resources/views/sellrecord/edit.html.twig b/app/Resources/views/sellrecord/edit.html.twig index 2bb84571..e8152760 100755 --- a/app/Resources/views/sellrecord/edit.html.twig +++ b/app/Resources/views/sellrecord/edit.html.twig @@ -10,7 +10,7 @@
        • - Retour à la liste + Retour à la liste
        • {{ form_start(delete_form) }} diff --git a/app/Resources/views/sellrecord/index.html.twig b/app/Resources/views/sellrecord/index.html.twig index 61a25b2d..408d399f 100755 --- a/app/Resources/views/sellrecord/index.html.twig +++ b/app/Resources/views/sellrecord/index.html.twig @@ -3,7 +3,7 @@ {% block body %}

          Sellrecords list

          -
      Id
      +
      @@ -39,7 +39,7 @@ {% endblock %} diff --git a/app/Resources/views/sellrecord/new.html.twig b/app/Resources/views/sellrecord/new.html.twig index 06024f25..f6623181 100755 --- a/app/Resources/views/sellrecord/new.html.twig +++ b/app/Resources/views/sellrecord/new.html.twig @@ -10,7 +10,7 @@ {% endblock %} diff --git a/app/Resources/views/sellrecord/show.html.twig b/app/Resources/views/sellrecord/show.html.twig index 90f7be44..ae890ebf 100755 --- a/app/Resources/views/sellrecord/show.html.twig +++ b/app/Resources/views/sellrecord/show.html.twig @@ -3,25 +3,28 @@ {% block body %}

      Sellrecord

      -
      Date
      +
      - - - - + + + +
      Date{% if sellRecord.date %}{{ sellRecord.date|date('Y-m-d H:i:s') }}{% endif %}
      Date{% if sellRecord.date %}{{ sellRecord.date|date('Y-m-d H:i:s') }}{% endif %}
      diff --git a/app/config/security.yml b/app/config/security.yml index 7c6b4c3e..03663ada 100755 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -49,6 +49,7 @@ security: ROLE_SUPER_ADMIN: ROLE_ADMIN access_control: + - { path: ^/dashboard$, role: IS_AUTHENTICATED_REMEMBERED } - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } diff --git a/assets/css/pages/global.scss b/assets/css/pages/global.scss index c24db39f..95fc1b1a 100755 --- a/assets/css/pages/global.scss +++ b/assets/css/pages/global.scss @@ -13,3 +13,8 @@ overflow: hidden; z-index: -1; } + +thead { + background: #000; + color: #fff; +}