首页成员样式

Hunter_ht/hunter/models.py

@@ -3,16 +3,22 @@ from django.utils import timezone
 
 # Create your models here.
 
+# isCurrent=1 是当前成员, 0 旧成员；
+# member_type = 0 academic 老师, 1 engineer, 2 研究生 Master, 3 博士生PHD;
+
 
 class User(models.Model):
     userID = models.BigIntegerField(primary_key=True)
     name = models.CharField(max_length=50)
     pwd = models.CharField(max_length=100)
-    nake_name = models.CharField(max_length=100)
+    name_hanzi = models.CharField(max_length=100)
+    member_type = models.IntegerField(default=2)
+    isCurrent = models.IntegerField(default=1)
     identity = models.CharField(max_length=1, default='0')
     introduction = models.TextField(default="No Information")
     score = models.IntegerField(default=0)
     scoreUsed = models.IntegerField(default=0)
+    mailAddress = models.CharField(max_length=100, default='mail@example.com')
 
     def is_admin(self):
         return self.identity

Hunter_ht/hunter/templates/hunter/index.html

@@ -30,21 +30,29 @@
 <section id="home">
     <div class="box"></div>
 
-    <div class="staff_tag">
-        <span>Academic STAFF</span>
-        <span>Engineer STAFF</span>
-        <span>Student</span>
+    <div class="left-bar">
+        <span>
+            小组成员
+        </span>
     </div>
-    <div class="content">
-        {% if user_list %}
+    <div class="wrap">
+        {% for tp,users in user_type_list.items %}
+            <div class="member_type">
+                <p>{{ tp }}</p>
+            {% if users %}
+                {% for user in users %}
                 <ul>
-            {% for user in user_list %}
-                <li><a href="{% url 'hunter:user' user.userID %}">{{ user.name }}</a></li>
-            {% endfor %}
+                    <li>
+                        <a href="{% url 'hunter:user' user.userID %}" target="_blank">{{ user.name_hanzi }}</a>
+                    </li>
+                    <li class="user_mail">{{ user.mailAddress }}</li>
                 </ul>
-
+                {% endfor %}
             {% endif %}
             </div>
+        {% endfor %}
+    </div>
+
 
 </section>
 
@@ -59,9 +67,7 @@
             <div>
                 <div>
                 <div class="proj_name">
-
                         <a href="https://github.com/hunter-ht-2018/ptfuzzer" target="_blank">PTFUZZER</a>
-
                     </div>
                 <div class="proj_description">
                     Fuzzing using the Intel PT support.
@@ -160,14 +166,30 @@
 
 <section id="article">
     <div class="box"></div>
-    {% if article_list %}
+    <div class="left-bar">
+        <span>
+           文章随笔
+        </span>
+    </div>
+    <div class="wrap">
+        {% for year, arts in article_year_list.items %}
+        <blockquote ><p>{{ year }}</p></blockquote>
+        {% if arts %}
+            {% for art in arts %}
                 <ul>
-        {% for article in article_list %}
-            <li><a href="{% url 'hunter:article' article.articleID %}">{{ article.title }}</a></li>
-            <li>{{ article.author }}</li>
-        {% endfor %}
+                <li class="big_text">
+                    <a href="{% url 'hunter:article' art.articleID %}" target="_blank">{{ art.title }}</a>
+                </li>
+                <li>{{ art.author }}</li>
+                <li class="small_text">{{ art.author }}</li>
+                <li class="middle_text right">{{ art.editDateTime }}</li>
                 </ul>
+            {% endfor %}
+
         {% endif %}
+        {% endfor %}
+    </div>
+
 </section>
 
 

Hunter_ht/hunter/views.py

@@ -8,9 +8,23 @@ from django.db.models import Count
 
 
 def index(request):
-    user_list = User.objects.values('userID', 'name')
-    publication_list = Publications.objects.order_by('-date')
+    user_list = User.objects.filter(isCurrent=1).all()
+    user_type_list = {}
+    for u in user_list:
+        if u.member_type == 0:
+            u.member_type = "Academic STAFF"
+        else:
+            if u.member_type == 1:
+                u.member_type = "Engineer STAFF"
+            else:
+                u.member_type = "Phd & Master"
+        member_type = u.member_type
+        if member_type in user_type_list.keys():
+            user_type_list[member_type].append(u)
+        else:
+            user_type_list[member_type] = [u]
 
+    publication_list = Publications.objects.order_by('-date')
     publication_year_list = {}
     for pub in publication_list:
         year = str(pub.date)[0:4]
@@ -32,12 +46,21 @@ def index(request):
             cve_year_list[year].append(cve)
         else:
             cve_year_list[year] = [cve]
+
     article_list = Articles.objects.order_by('-editDateTime')
+    article_year_list = {}
+    for art in article_list:
+        year = str(art.editDateTime)[0:4]
+        art.editDateTime = str(art.editDateTime)[5:10]
+        if year in article_year_list.keys():
+            article_year_list[year] = [art]
+        else:
+            article_year_list[year] = [art]
     context = {
-        'user_list': user_list,
+        'user_type_list': user_type_list,
         'publication_year_list': publication_year_list,
         'cve_year_list': cve_year_list,
-        'article_list': article_list,
+        'article_year_list': article_year_list,
     }
     return render(request, 'hunter/index.html', context)