diff --git a/ippisite/ippidb/admin.py b/ippisite/ippidb/admin.py index 2333c51df3ec60579ee9dc6a8ed4943f548c1dc6..fbd3dfe71fa976350e4b04da3a15c2443fa321df 100644 --- a/ippisite/ippidb/admin.py +++ b/ippisite/ippidb/admin.py @@ -76,7 +76,7 @@ class ViewOnSiteModelAdmin(admin.ModelAdmin): @admin.register(Faq) class FaqAdmin(admin.ModelAdmin): - list_display = ("question", "answer") + list_display = ("question", "answer", "type") @admin.register(PDB) diff --git a/ippisite/ippidb/migrations/0077_faq_type.py b/ippisite/ippidb/migrations/0077_faq_type.py new file mode 100644 index 0000000000000000000000000000000000000000..aa8c5cacfe9d1c123756e1cf7fe0fcb8e970d3e6 --- /dev/null +++ b/ippisite/ippidb/migrations/0077_faq_type.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.10 on 2024-02-29 16:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ippidb', '0076_faq'), + ] + + operations = [ + migrations.AddField( + model_name='faq', + name='type', + field=models.CharField(choices=[('compounds', 'compounds'), ('pie', 'pie')], default='pie', max_length=10, verbose_name='type'), + ), + ] diff --git a/ippisite/ippidb/models/ippidb.py b/ippisite/ippidb/models/ippidb.py index 10727187fcb210e2e94b7d98bdfe6076e57fd230..31f499b8e927a86ac0bfd26416aeca276e811ff7 100644 --- a/ippisite/ippidb/models/ippidb.py +++ b/ippisite/ippidb/models/ippidb.py @@ -2290,5 +2290,10 @@ class Contributor(User): class Faq(models.Model): + TYPES = ( + ("compounds", "compounds"), + ("pie", "pie"), + ) question = models.TextField("Question") answer = models.TextField("Answer") + type = models.CharField("type", max_length=10, choices=TYPES, default=TYPES[1][0]) diff --git a/ippisite/ippidb/templates/FAQ.html b/ippisite/ippidb/templates/FAQ.html index ddaab30085bc644b28b2e3ea51b94128d0805ac3..be6d8864084c0e944fffd626f4818303bf645139 100644 --- a/ippisite/ippidb/templates/FAQ.html +++ b/ippisite/ippidb/templates/FAQ.html @@ -7,31 +7,69 @@ <div class="inner-wrap"> <div class="container-fluid p-5"> + <h1 class="page-title"> FAQ </h1> + <div class="row m-2"> + <div class="col-sm-6"> + <h2 class="text-center">COMPOUNDS</h2> + </div> + <div class="col-sm-6"> + <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2> + </div> + </div> + <div class="row m-2"> + <div class="col-6"> + <div id="accordion_compounds"> + {% for faq in faq_list %} + {% if faq.type == 'compounds' %} + <div class="card"> + <div class="card-header" id="heading{{ faq.id }}"> + <h5 class="mb-0"> + <button style="white-space: normal;" class="btn btn-link collapsed" + data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false" + aria-controls="collapse{{ faq.id }}"> + {{ faq.question }} + </button> + </h5> + </div> - <div id="accordion"> - {% for faq in faq_list %} - <div class="card"> - <div class="card-header" id="heading{{ faq.id }}"> - <h5 class="mb-0"> - <button class="btn btn-link collapsed" data-toggle="collapse" - data-target="#collapse{{ faq.id }}" aria-expanded="false" - aria-controls="collapse{{ faq.id }}"> - {{ faq.question }} - </button> - </h5> + <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}" + data-parent="#accordion_compounds"> + <div class="card-body"> + {{ faq.answer }} + </div> + </div> + </div> + {% endif %} + {% endfor %} </div> + </div> + <div class="col-6"> + <div id="accordion_pie"> + {% for faq in faq_list %} + {% if faq.type == 'pie' %} + <div class="card"> + <div class="card-header" id="heading{{ faq.id }}"> + <h5 class="mb-0"> + <button style="white-space: normal;" class="btn btn-link collapsed" + data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false" + aria-controls="collapse{{ faq.id }}"> + {{ faq.question }} + </button> + </h5> + </div> - <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}" - data-parent="#accordion"> - <div class="card-body"> - {{ faq.answer }} + <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}" + data-parent="#accordion_pie"> + <div class="card-body"> + {{ faq.answer }} + </div> + </div> </div> + {% endif %} + {% endfor %} </div> </div> - - {% endfor %} </div> - </div> </div> <script> diff --git a/ippisite/ippidb/templates/tutorials.html b/ippisite/ippidb/templates/tutorials.html index 258aecb5dad4c0d1d4d74430c28fb3dfe439e7fd..8c07cda112a3f33bc9ad07516fb831fdf4b2d4fa 100644 --- a/ippisite/ippidb/templates/tutorials.html +++ b/ippisite/ippidb/templates/tutorials.html @@ -12,15 +12,15 @@ <main role="main"> <h1 class="page-title"> TUTORIALS </h1> <div class="row m-2"> - <div class="col-sm-6"> + <div class="col-6"> <h2 class="text-center">COMPOUNDS</h2> </div> - <div class="col-sm-6"> - <h2 class="text-center">POCKETS</h2> + <div class="col-6"> + <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2> </div> </div> <div class="row m-2"> - <div class="col-sm-6"> + <div class="col-6"> <div class="card" style="max-width: 100%;"> <div class="card-header"> <h5 class="card-title text-center">Tutorial for Query mode</h5> @@ -38,12 +38,12 @@ </div> </div> </div> - <div class="col-sm-6"> + <div class="col-6"> </div> </div> <div class="row m-2"> - <div class="col-sm-6"> + <div class="col-6"> <div class="card" style="max-width: 100%;"> <div class="card-header"> <h5 class="card-title text-center">Tutorial for Contribution mode</h5> @@ -60,7 +60,7 @@ </div> </div> </div> - <div class="col-sm-6"> + <div class="col-6"> </div> </div>