From 6e3b8247905541cb9d72cd6529bfbc2f95d4c698 Mon Sep 17 00:00:00 2001 From: "anthony.richard" Date: Tue, 21 Nov 2023 15:11:35 +0100 Subject: [PATCH 1/3] css groupView --- Project/php/templates/manageGroupView.html | 6 +----- Project/php/templates/manageVocabListView.html | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Project/php/templates/manageGroupView.html b/Project/php/templates/manageGroupView.html index 07e1fe5..db0d0c3 100755 --- a/Project/php/templates/manageGroupView.html +++ b/Project/php/templates/manageGroupView.html @@ -18,15 +18,11 @@ {% include 'navBar.twig' %}
-
+

Group list

{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %}
diff --git a/Project/php/templates/manageVocabListView.html b/Project/php/templates/manageVocabListView.html index 0c2914d..4b62b05 100755 --- a/Project/php/templates/manageVocabListView.html +++ b/Project/php/templates/manageVocabListView.html @@ -19,10 +19,6 @@ {% include 'navBar.twig' %} From 7b18767eeda9f535be91428ee9dbd24354963781 Mon Sep 17 00:00:00 2001 From: "anthony.richard" Date: Tue, 21 Nov 2023 16:41:16 +0100 Subject: [PATCH 2/3] +de css --- Project/php/css/styles.css | 5 +- Project/php/templates/addGroupForm.twig | 6 +- Project/php/templates/groupContainer.twig | 99 ++++++++----------- Project/php/templates/manageGroupView.html | 27 +++-- Project/php/templates/userContainer.twig | 90 ++++++++--------- .../php/templates/vocabularyContainer.twig | 4 +- 6 files changed, 106 insertions(+), 125 deletions(-) diff --git a/Project/php/css/styles.css b/Project/php/css/styles.css index ee4683a..abaed08 100755 --- a/Project/php/css/styles.css +++ b/Project/php/css/styles.css @@ -2767,7 +2767,6 @@ textarea.form-control-lg { .btn { --bs-btn-padding-x: 0.75rem; --bs-btn-padding-y: 0.375rem; - --bs-btn-font-family: ; --bs-btn-font-size: 1rem; --bs-btn-font-weight: 400; --bs-btn-line-height: 1.5; @@ -2878,7 +2877,7 @@ textarea.form-control-lg { .btn-success { --bs-btn-color: #000; - --bs-btn-bg: #67c29c; + --bs-btn-bg: #008800; --bs-btn-border-color: #67c29c; --bs-btn-hover-color: #000; --bs-btn-hover-bg: #7ecbab; @@ -2929,7 +2928,7 @@ textarea.form-control-lg { .btn-danger { --bs-btn-color: #fff; - --bs-btn-bg: #a16468; + --bs-btn-bg: #bb0000; --bs-btn-border-color: #a16468; --bs-btn-hover-color: #fff; --bs-btn-hover-bg: #895558; diff --git a/Project/php/templates/addGroupForm.twig b/Project/php/templates/addGroupForm.twig index 401a681..d5ffc15 100755 --- a/Project/php/templates/addGroupForm.twig +++ b/Project/php/templates/addGroupForm.twig @@ -1,6 +1,6 @@
- - - + + +
\ No newline at end of file diff --git a/Project/php/templates/groupContainer.twig b/Project/php/templates/groupContainer.twig index 606c6dc..80c7729 100755 --- a/Project/php/templates/groupContainer.twig +++ b/Project/php/templates/groupContainer.twig @@ -1,58 +1,41 @@ - - {% if groups is defined %} - {% for row in groups %} - {% if selectedGroup is defined and selectedGroup == row.id %} - - {% else %} - - {% endif %} - - - - - - - - - - - - {% if actions is defined %} - - {% if 'showGroupDetails' in actions %} - - {% endif %} - - {% if 'removeGroup' in actions %} - - {% endif %} - - {% if 'removeVocabFromGroup' in actions %} - - {% endif %} - - {% if 'addVocabToGroup' in actions %} - - {% endif %} - - {% endif %} - - {% endfor %} - {% endif %} -
IDNumYearSector
{{ row.id }}{{ row.num }}{{ row.year }}{{ row.sector }} - - - - - - - - - - - - - - - -
\ No newline at end of file +
+ + + + + + + + + + + + {% if groups is defined %} + {% for row in groups %} + + + + + + + + {% endfor %} + {% endif %} + +
IDNumYearSectorActions
{{ row.id }}{{ row.num }}{{ row.year }}{{ row.sector }} + {% if actions is defined %} + {% if 'showGroupDetails' in actions %} + Show + {% endif %} + {% if 'removeGroup' in actions %} + Remove + {% endif %} + {% if 'removeVocabFromGroup' in actions %} + Remove from group + {% endif %} + {% if 'addVocabToGroup' in actions %} + Add to group + {% endif %} + {% endif %} +
+
diff --git a/Project/php/templates/manageGroupView.html b/Project/php/templates/manageGroupView.html index 87d5274..7dd548f 100755 --- a/Project/php/templates/manageGroupView.html +++ b/Project/php/templates/manageGroupView.html @@ -11,35 +11,34 @@ + - + {% include 'navBar.twig' %}
-
-

Group list

+
+

Group list

{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %} -
-
-

Users of the group

+
+
+

Users of the group

{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %} -
-
-

Add group

+
+
+

Add group

{% include 'addGroupForm.twig' %} - -
+
+

Unassigned users

{% include 'userContainer.twig' with {'users' : unassignedUsers, 'action' : 'addUserToGroup'} %} - +
- \ No newline at end of file diff --git a/Project/php/templates/userContainer.twig b/Project/php/templates/userContainer.twig index d742f6e..1bd54a9 100755 --- a/Project/php/templates/userContainer.twig +++ b/Project/php/templates/userContainer.twig @@ -1,46 +1,46 @@ - - - - - - - - - - - - {% if users is defined %} - {% for row in users %} - - - - - - - - - - - {% if action is defined %} - - {% if action == 'removeUserFromGroup' %} - - - {% elseif action == 'addUserToGroup' %} - - - {% elseif action == 'removeUser' %} - +
+
IDNicknameNameSurnameMailGroupRoleExtra Time
{{row.id}}{{row.nickname}}{{row.name}}{{row.surname}}{{row.email}}{{row.group}}{{row.roles|join(', ')}}{{row.extraTime? 'yes' : 'no' }} - - - - - -
+ + + + + + + + + + + {% if action is defined %} + + {% endif %} + + + + {% if users is defined %} + {% for row in users %} + + + + + + + + + + {% if action is defined %} + {% endif %} - - {% endif %} - - {% endfor %} - {% endif %} -
IDNicknameNameSurnameMailGroupRoleExtra TimeAction
{{ row.id }}{{ row.nickname }}{{ row.name }}{{ row.surname }}{{ row.email }}{{ row.group }}{{ row.roles|join(', ') }}{{ row.extraTime ? 'yes' : 'no' }} + {% if action == 'removeUserFromGroup' %} + Delete from group + {% elseif action == 'addUserToGroup' %} + Add to group + {% elseif action == 'removeUser' %} + Delete + {% endif %} +
\ No newline at end of file + + {% endfor %} + {% endif %} + + + diff --git a/Project/php/templates/vocabularyContainer.twig b/Project/php/templates/vocabularyContainer.twig index 5a6918a..551329b 100755 --- a/Project/php/templates/vocabularyContainer.twig +++ b/Project/php/templates/vocabularyContainer.twig @@ -22,13 +22,13 @@ {% if 'getContent' in actions %} - + {% endif %} {% if 'delById' in actions %} - + {% endif %} From 8cc18109dbcd31cc5bea642500954040ac689c9b Mon Sep 17 00:00:00 2001 From: "anthony.richard" Date: Tue, 21 Nov 2023 16:49:57 +0100 Subject: [PATCH 3/3] + de css --- Project/php/templates/addGroupForm.twig | 8 ++++---- Project/php/templates/usersView.html | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Project/php/templates/addGroupForm.twig b/Project/php/templates/addGroupForm.twig index d5ffc15..aaf3dec 100755 --- a/Project/php/templates/addGroupForm.twig +++ b/Project/php/templates/addGroupForm.twig @@ -1,6 +1,6 @@
- - - - + + + +
\ No newline at end of file diff --git a/Project/php/templates/usersView.html b/Project/php/templates/usersView.html index bca4dc8..c3f01e4 100755 --- a/Project/php/templates/usersView.html +++ b/Project/php/templates/usersView.html @@ -13,18 +13,18 @@
- +
- + - + - + - +