Skip to content

Commit

Permalink
Push new theme 🎉
Browse files Browse the repository at this point in the history
  • Loading branch information
Smaug6739 committed Mar 19, 2021
1 parent ff6492f commit 53cc9b9
Show file tree
Hide file tree
Showing 55 changed files with 361 additions and 160 deletions.
2 changes: 1 addition & 1 deletion __frontend/pages/admin/announcements.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<label style="font-size:20px;" for="title">Titre de l'annonce :</label>
<input type="text" class="title form-control" name="title" id="title">
<label style="font-size:20px;" for="contenu">Ecrivez ci-dessous votre annonce :</label>
<textarea type="hidden" name="contenu" id="contenu"></textarea>
<textarea type="hidden" name="contenu" id="contenu" class="form-control"></textarea>
<label style="font-size:20px;">Staff :</label>
<label class="switch" id="switch">
<input type="checkbox" name="staff">
Expand Down
4 changes: 2 additions & 2 deletions __frontend/pages/admin/badges.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/announcements.css">
<link rel="stylesheet" href="/static/css/admin/badges.css">
<title>FGF Admin</title>
</head>

<body>
<%- include ('../include/nav.ejs'); -%>
<main role="main">

<table class="table table-striped" id="table-announcements">
<table class="table table-striped" id="table-badges">

<thead>
<tr>
Expand Down
5 changes: 3 additions & 2 deletions __frontend/pages/admin/forum.categorie.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/announcements.css">
<link rel="stylesheet" href="/static/css/admin/form.categorie.css">
<title>FGF Admin</title>
</head>

Expand All @@ -26,7 +26,8 @@
<label style="font-size:20px;" for="title">Titre de la catégorie :</label>
<input type="text" class="title form-control" name="title" id="title" value="<%=categorie[0].cat_nom%>">
<label style="font-size:20px;" for="content">Description de la catégorie (max 255 caractères) :</label>
<textarea type="hidden" name="content" id="content"><%=categorie[0].cat_description%></textarea>
<textarea class="form-control" type="hidden" name="content"
id="content"><%=categorie[0].cat_description%></textarea>
<label style="font-size:20px;" for="icon">Icon de la catégorie :</label>
<input type="text" class="icon form-control" name="icon" id="icon" value="<%=categorie[0].cat_icon%>">
<label style="font-size:20px;" for="icon">Groupe de la catégorie :</label>
Expand Down
2 changes: 1 addition & 1 deletion __frontend/pages/admin/forum.container.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/announcements.css">
<link rel="stylesheet" href="/static/css/admin/forum.container.css">
<title>FGF Album</title>
</head>

Expand Down
4 changes: 2 additions & 2 deletions __frontend/pages/admin/forum.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/announcements.css">
<link rel="stylesheet" href="/static/css/admin/forum.css">
<title>FGF Album</title>
</head>

Expand Down Expand Up @@ -61,7 +61,7 @@
<label style="font-size:20px;" for="title">Titre de la catégorie :</label>
<input type="text" class="title form-control" name="title" id="title">
<label style="font-size:20px;" for="content">Description de la catégorie (max 255 caractères) :</label>
<textarea type="hidden" name="content" id="content"></textarea>
<textarea class="form-control" type="hidden" name="content" id="content"></textarea>
<label style="font-size:20px;" for="icon">Icon de la catégorie :</label>
<input type="text" class="icon form-control" name="icon" id="icon">
<label style="font-size:20px;" for="icon">Groupe (id) de la catégorie :</label>
Expand Down
4 changes: 2 additions & 2 deletions __frontend/pages/admin/forum.modos.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/announcements.css">
<link rel="stylesheet" href="/static/css/admin/forum.modos.css">
<title>FGF Album</title>
</head>

Expand Down Expand Up @@ -58,7 +58,7 @@
</section>
<section id="form">
<fieldset class="form-group">
<legend>Nouvelle catégorie</legend>
<legend>Nouveau modo</legend>
<form action="/admin/forum/modos" method="POST">
<div class="form-group d-flex flex-column">
<label style="font-size:20px;" for="pseudo">Pseudo du modérateur</label>
Expand Down
9 changes: 5 additions & 4 deletions __frontend/pages/admin/update/album.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
<img src="/uploads/album/<%=album[0].album_image%>" alt="Image" id="image">
<form action="/admin/albums/update/<%=album[0].album_id%>" method="POST" id="form-update">
<label for="statut">Statut de l'image :</label>
<select id="statut" name="statut">
<option value="0" <%if(album[0].album_statut===0){%> selected <%}%>>En attente</option>
<option value="1" <%if(album[0].album_statut===1){%> selected <%}%>>Validé</option>
<select id="statut" name="statut" class="form-control">
<option class="form-control" value="0" <%if(album[0].album_statut===0){%> selected <%}%>>En attente
</option>
<option class="form-control" value="1" <%if(album[0].album_statut===1){%> selected <%}%>>Validé</option>
</select>
<br>
<label for="title">Titre de l'image</label>
<input type="text" name="title" value="<%=album[0].album_title%>">
<input class="form-control" type="text" name="title" value="<%=album[0].album_title%>">
<br>
<button type="submit" class="button button-primary" id="button-send">Envoyer</button>
</form>
Expand Down
25 changes: 14 additions & 11 deletions __frontend/pages/admin/update/article.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<%- include ('../../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/admin/update/article.css">
<link rel="stylesheet" href="/static/css/footer.css">
<script src="/static/js/admin/update/article.js"></script>
<link rel="stylesheet" href="/static/markdown/css/simplemde.css">
Expand All @@ -29,23 +30,25 @@
<legend>Type d'article</legend>
<div class="form-group d-flex flex-column">
<label for="categorie">Catégorie de votre article :</label>
<select id="categorie" name="categorie">
<option value="1" <%if(article.categorie===1){%> selected <%}%>>Console</option>
<option value="2" <%if(article.categorie===2){%> selected <%}%>>Jeux</option>
<option value="3" <%if(article.categorie===3){%> selected <%}%>>Informatique</option>
<option value="4" <%if(article.categorie===4){%> selected <%}%>>Musique</option>
<option value="5" <%if(article.categorie===5){%> selected <%}%>>Partenaires</option>
<option value="6" <%if(article.categorie===6){%> selected <%}%>>Divers</option>
<select id="categorie" name="categorie" class="form-control">
<option class="form-control" value="1" <%if(article.categorie===1){%> selected <%}%>>Console</option>
<option class="form-control" value="2" <%if(article.categorie===2){%> selected <%}%>>Jeux</option>
<option class="form-control" value="3" <%if(article.categorie===3){%> selected <%}%>>Informatique
</option>
<option class="form-control" value="4" <%if(article.categorie===4){%> selected <%}%>>Musique</option>
<option class="form-control" value="5" <%if(article.categorie===5){%> selected <%}%>>Partenaires
</option>
<option class="form-control" value="6" <%if(article.categorie===6){%> selected <%}%>>Divers</option>
</select>
</div>
</fieldset>
<fieldset class="form-group">
<legend>Status de l'article</legend>
<div class="form-group d-flex flex-column">
<label for="status">Catégorie de votre article :</label>
<select id="status" name="status">
<option value="0" <%if(article.status===0){%> selected <%}%>>En attente</option>
<option value="1" <%if(article.status===1){%> selected <%}%>>Validé</option>
<select id="status" name="status" class="form-control">
<option value="0" class="form-control" <%if(article.status===0){%> selected <%}%>>En attente</option>
<option value="1" class="form-control" <%if(article.status===1){%> selected <%}%>>Validé</option>
</select>
</div>
</fieldset>
Expand All @@ -69,7 +72,7 @@
Choisir un fichier
</label>
<label style="font-size:20px;" for="intro">Ecrivez ci-dessous l'intro de l'article :</label>
<textarea type="hidden" name="intro" id="intro"><%=article.intro%></textarea>
<textarea class="form-control" type="hidden" name="intro" id="intro"><%=article.intro%></textarea>
<label style="font-size:20px;" for="contenu">Ecrivez ci-dessous votre article :</label>
<textarea type="hidden" name="contenu" id="contenu"><%= article.content %></textarea>

Expand Down
8 changes: 4 additions & 4 deletions __frontend/pages/admin/view.job.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
<%=request[0].q6%>
</p>
<form action="/admin/jobs/update/<%=request[0].id%>" method="POST">
<select name="statut" id="statut">
<option value="0">En attente</option>
<option value="1">Accepté</option>
<option value="2">Refuser</option>
<select name="statut" id="statut" class="form-control">
<option class="form-control" value="0">En attente</option>
<option class="form-control" value="1">Accepté</option>
<option class="form-control" value="2">Refuser</option>
</select>
<button type="submit" class="button button-warning">Mettre a jour la demande</button>
</form>
Expand Down
21 changes: 6 additions & 15 deletions __frontend/pages/admin/view.partner.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<%- include ('../include/bootstrap/bootstrap.css.ejs'); -%>
<link rel="stylesheet" href="/static/css/main.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/admin/members.css">
<script src="/static/js/admin/members.js"></script>
<link rel="stylesheet" href="/static/css/admin/view.partner.css">

<title>French Gaming Family</title>
</head>
Expand Down Expand Up @@ -57,10 +56,10 @@
<%=request[0].q6%>
</p>
<form action="/admin/partners/update/<%=request[0].id%>" method="POST">
<select name="statut" id="statut">
<option value="0">En attente</option>
<option value="1">Accepté</option>
<option value="2">Refuser</option>
<select class="form-control" name="statut" id="statut">
<option class="form-control" value="0">En attente</option>
<option class="form-control" value="1">Accepté</option>
<option class="form-control" value="2">Refusé</option>
</select>
<button type="submit" class="button button-warning">Mettre a jour la demande</button>
</form>
Expand All @@ -71,12 +70,4 @@

</body>

</html>

<style>
#container-demande {
width: 70%;
margin-left: 15%;
background-color: #ffffff;
}
</style>
</html>
6 changes: 3 additions & 3 deletions __frontend/pages/admin/view.request.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<%=request[0].demande%>
</p>
<form action="/admin/demandes/update/<%=request[0].id%>" method="POST">
<select name="statut" id="statut">
<option value="0">En attente</option>
<option value="1">Traitée</option>
<select name="statut" id="statut" class="form-control">
<option class="form-control" value="0">En attente</option>
<option class="form-control" value="1">Traitée</option>
</select>
<button type="submit" class="button button-warning">Mettre a jour la demande</button>
</form>
Expand Down
1 change: 1 addition & 0 deletions __frontend/pages/forum/categorie.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<button id="send" class="button button-success">Envoyer</button>
</form>
</fieldset>

</div>
<div id="text-center">
<a href="#" class="button button-info" id="precedent">
Expand Down
45 changes: 23 additions & 22 deletions __frontend/pages/forum/topic.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,31 @@
<a onclick="report(<%=element.topic_id%>, <%=element.post_id%>)" href="#"><img class="button-control right" src ="/static/images/btn_report.svg"></a>
</p>
<% arrayBadges.forEach(badge => { %>
<% const colorBadge = badge.split(' -') %>
<% if(colorBadge[1]){%>
<% const badgeName=colorBadge[0] %>
<!--<span class="badge bg-<%=//colorBadge[1]%> rounded-pill" ><%=//badgeName%></span>-->
<span class="badge bg-<%=colorBadge[1]%>">
<%=badgeName%>
</span>
<% }else{ %>
<!--<span class="badge bg-secondary rounded-pill" ><%=//badge%></span>-->
<span class="badge bg-secondary">
<%=badge%>
<% const colorBadge = badge.split(`-`) %>
<% if(colorBadge[1]){%>
<% const badgeName=colorBadge[0] %>
<!--<span class="badge bg-<%=//colorBadge[1]%> rounded-pill" ><%=//badgeName%></span>-->
<span class="badge bg-<%=colorBadge[1]%>">
<%=badgeName%>
</span>
<% } %>
<% }); %>
<p><a href="#<%=element.post_id%>" class="link-msg">
<%= `${date}/${month}/${year}`%>
</a></p>
<div id='<%=element.post_id%>'></div>
<div id="edit-<%=element.post_id%>"></div>
<hr>
<p>
<%= element.post_texte %>
</p>
<% }else{ %>
<!--<span class="badge bg-secondary rounded-pill" ><%=//badge%></span>-->
<span class="badge bg-secondary">
<%=badge%>
</span>
<% } %>
<% }); %>
<p><a href="#<%=element.post_id%>" class="link-msg">
<%= `${date}/${month}/${year}`%>
</a></p>
<div id=' <%=element.post_id%>'>
</div>
<div id="edit-<%=element.post_id%>"></div>
<hr>
<p>
<%= element.post_texte %>
</p>
</div>
</div>
<% }); %>
<div id="container-reply">
Expand Down
4 changes: 4 additions & 0 deletions __frontend/pages/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
<div class="card-intro mt-3">
<%=article.intro.substring(0,90)%>...
</div>
<div class="button-margin">
<a href="/articles/view/<%=article.id%>" class="button button-danger button-article">Lire
l'article</a>
</div>
</div>
<% }); %>
<%}else{%>
Expand Down
2 changes: 1 addition & 1 deletion __frontend/pages/jobs.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<div class="form-group d-flex flex-column">
<label for="q6">Avez vous une demande, question, remarque à laisser a l'intention des admins
?</label>
<textarea class="question" name="q6" id="q6" cols="40" rows="4"> </textarea>
<textarea class="form-control question" name="q6" id="q6" cols="40" rows="4"> </textarea>
</div>
<a>
<div class="g-recaptcha" data-sitekey="6Lc2VNsUAAAAACUt1YxoQYnV2KuxwWumlQETVM_E"></div>
Expand Down
7 changes: 3 additions & 4 deletions __frontend/pages/member/articles.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@

</div>

<main role="main">
</main>



<%- include('../include/footer.ejs') %>
<%- include ('../include/bootstrap/bootstrap.js.ejs'); -%>
<%- include('../include/footer.ejs') %>
<%- include ('../include/bootstrap/bootstrap.js.ejs'); -%>

</body>

Expand Down
Loading

0 comments on commit 53cc9b9

Please sign in to comment.