From 738470bdc7ed48e07ab6af1c090b01f81f681fa4 Mon Sep 17 00:00:00 2001 From: Rossetto Date: Sun, 19 Nov 2023 20:04:27 +0100 Subject: [PATCH] 'Design' seems to be finished, even if it's not as beautiful as it should be :sparkling_heart: --- fluxRSS/src/model/AdminModel.php | 2 +- fluxRSS/templates/CSS/myStyle.css | 8 +++----- fluxRSS/templates/erreur.html | 1 - fluxRSS/templates/listArticle.html | 4 ++-- fluxRSS/templates/listArticleAdmin.html | 21 +++++++++++++-------- fluxRSS/templates/listFlux.html | 13 +++++++++---- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/fluxRSS/src/model/AdminModel.php b/fluxRSS/src/model/AdminModel.php index a81acdc..80bef95 100755 --- a/fluxRSS/src/model/AdminModel.php +++ b/fluxRSS/src/model/AdminModel.php @@ -38,6 +38,6 @@ class AdminModel unset($_SESSION['role']); $_SESSION['pseudo'] = ""; unset($_SESSION['pseudo']); - header("Location: /~mapoint2/SAE/Php_RSS/fluxRSS/admin"); + header("Location: /~rorossetto/Php_RSS/fluxRSS/admin"); } } \ No newline at end of file diff --git a/fluxRSS/templates/CSS/myStyle.css b/fluxRSS/templates/CSS/myStyle.css index 77c071d..a9d2c28 100755 --- a/fluxRSS/templates/CSS/myStyle.css +++ b/fluxRSS/templates/CSS/myStyle.css @@ -2,10 +2,6 @@ .myBody{ background-color: rgba(255,187,248,0.50); } -.centreCa{ - display: flex; - justify-content: center; -} .imgArticle{ width: 15em; margin: 1em; @@ -17,10 +13,12 @@ font-size: xxx-large; } .caseInfo{ + margin: 1em; + padding: 1em; background-color: rgba(255,185,251,0.61); } .dnconnect{ - padding: 2em; + padding: 1em; display: flex; justify-content: right; } diff --git a/fluxRSS/templates/erreur.html b/fluxRSS/templates/erreur.html index 5f0a25d..8f66976 100755 --- a/fluxRSS/templates/erreur.html +++ b/fluxRSS/templates/erreur.html @@ -6,7 +6,6 @@ Erreur -

ERREUR page !!!!!

{% if dVueEreur is defined %} diff --git a/fluxRSS/templates/listArticle.html b/fluxRSS/templates/listArticle.html index 3ec0c95..fcb5b1d 100755 --- a/fluxRSS/templates/listArticle.html +++ b/fluxRSS/templates/listArticle.html @@ -8,13 +8,13 @@ All Articles - +
{% if not isAdmin %} Connect {% else %} - Déconnection + Déconnection {% endif %}

Actualités

diff --git a/fluxRSS/templates/listArticleAdmin.html b/fluxRSS/templates/listArticleAdmin.html index f77a5b7..440ddda 100755 --- a/fluxRSS/templates/listArticleAdmin.html +++ b/fluxRSS/templates/listArticleAdmin.html @@ -3,18 +3,25 @@ + + All Articles - -
+ +Déconnection +Vue flux +
+

Vue des articles

+
+
{% for article in dVue.data %} -

- {{article.dateStr()}} - - {{ article.getTitle() }} +

+ {{article.dateStr()}}
+
+ {{ article.getTitle() }} {{ article.getDescription() }}

{% endfor %} @@ -24,7 +31,5 @@ location.reload(); }, 50000); -Vue flux -Déconnection \ No newline at end of file diff --git a/fluxRSS/templates/listFlux.html b/fluxRSS/templates/listFlux.html index 017bd50..ce6b6e4 100755 --- a/fluxRSS/templates/listFlux.html +++ b/fluxRSS/templates/listFlux.html @@ -3,15 +3,21 @@ + + All Flux - + +Vue article +
+

Liste flux

+
{% for value in dVue.data %} -
+
{{ value.getFlux() }}
- +
{% endfor %} @@ -19,6 +25,5 @@ - Vue article \ No newline at end of file