From d7070bf4ae5070a2fdc8992699e68664099cc6e9 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 6 Jul 2016 20:59:06 +0800 Subject: [PATCH] Finalized CSS, however notable to test out officially --- db.sqlite3 | Bin 51200 -> 51200 bytes resources/templates/resources/all_groups.html | 17 +++++-- .../resources/all_resources_and_groups.html | 31 ++++++----- .../templates/resources/group_detail.html | 21 +++++--- resources/urls.py | 5 +- templates/home.html | 19 +++++-- templates/layout.html | 26 +++++++++- templates/navbar.html | 17 +++++-- tips/templates/tips/all_tips_in_series.html | 48 ++++++++++++++---- tips/templates/tips/series_list.html | 19 ++++--- tips/templates/tips/tip_list.html | 38 ++++++++++++-- tips/urls.py | 6 +-- tips/views.py | 1 + 13 files changed, 189 insertions(+), 59 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 5d424af2862b3e411499962ab784ca2c1304a04b..2aa4064a04a5622bf11fdafe3e7b50cb154095b0 100644 GIT binary patch delta 789 zcmah{&1(}u9G%&>X)_zE#%fA5)|j?XDoJ)Xn@zG6B=p*V|3Pi@(QXb+$cM2aw3ZY- zl}IjvHx(-MWcQGZ7cGca58ir^-uwVhZ4N2u?8aaZqAbkr&U?T2-fw=h(ZWUxtt&M9 zBrr#_ukXAZ_Avw`e8d}Q$lwu{@C>gIu&%oWT=jXO&`Q2qs#mi4>cZel7;_;;+g>`_ zp7+eqFYSg$@n1NP8*IR+E-Y6{_3|hXX6?70nTurX6!x2C{q%g8IGZxGq@l$kYFyWJ z&H5CLy1Dfh!Fz03-oP5xZwW(WYEEH|Qr;{SOAUKnsnyCxG^(hHh|C|wNXoJtbxa2| zGhZy2oLwv=sVy+U8u?PeEcWq#2{<&9^9mz`kQd@j_YlPq!4c2%4QChy@pCO6L$YW9 zB1ex2jxA~aJ0u3bZN$O7+u|gLdIUXQ_yb--L{P>gE=qAiaN=wa^Iw3my$7Q0vrVwg z_nTNRQ;D4Ovxk=`ODlcJbS{_AMS{*NI5_NJ=yYSDzrd#sE)-#^tmt7`569%7oHF9F zp(zn1u4!_@f>FT<`&8s(qD>;aqfLHU?$PPZS;3WQ zy3&nWC9d9&$MmJFuFJZ-SYKSL-d$Z;&gD|(YO!K{eeR~dKVwhERef`oI<@W3J3)?L zrrftf(7^%s-Nn=-GW37CLi=E6n%C_U9Acl>b#QGQY1(f$5mq$2-N9wET?OlKcRcV5 Da!lNn delta 251 zcmVZN)2)F_W zf;#~PO@swOli;Tyv+AN60R{mB+yDdIvk@H91C!jRC

{{ group.name }}

- {% endfor %} + {% include "navbar.html" with home="" tips="" resources="active" %} + +
+
    +

  • All Resource Groups

    + +
    • +
+
+ {% endblock body %} \ No newline at end of file diff --git a/resources/templates/resources/all_resources_and_groups.html b/resources/templates/resources/all_resources_and_groups.html index f2fc746..2c9d20f 100644 --- a/resources/templates/resources/all_resources_and_groups.html +++ b/resources/templates/resources/all_resources_and_groups.html @@ -5,17 +5,24 @@ {% endblock title %} {% block body %} - {% for group in groups %} -

{{ group.name }}:

-
    - {% for resource in resources %} - {% for r in resource %} - {% if group == r.group %} -

  • {{ r.name }}

    • -

    {{ r.description }}

    - {% endif %} + {% include "navbar.html" with home="" tips="" resources="active" %} + +
    +

    All Resource and Groups

    + {% for group in groups %} +
      +

      {{ group.name }}:

      + {% for resource in resources %} +
        + {% for r in resource %} + {% if group == r.group %} +

      • {{ r.name }}

        • + {{ r.description }} + {% endif %} + {% endfor %} +
      {% endfor %} - {% endfor %} -
    - {% endfor %} +
+ {% endfor %} + {% endblock body %} \ No newline at end of file diff --git a/resources/templates/resources/group_detail.html b/resources/templates/resources/group_detail.html index 7f0f264..034b386 100644 --- a/resources/templates/resources/group_detail.html +++ b/resources/templates/resources/group_detail.html @@ -5,11 +5,18 @@ {% endblock title %} {% block body %} -

{{ group.name }}

-
    - {% for r in resources %} -

  • {{ r.name }}

    • -

    {{ r.description }}

    - {% endfor %} -
+ {% include "navbar.html" with home="" tips="" resources="active" %} + +
+
    +

  • {{ group.name }}

    +
      + {% for r in resources %} +

    • {{ r.name }}

      • + {{ r.description }} + {% endfor %} +
    +
    • +
+
{% endblock body %} \ No newline at end of file diff --git a/resources/urls.py b/resources/urls.py index 56e1512..a3da544 100644 --- a/resources/urls.py +++ b/resources/urls.py @@ -4,8 +4,7 @@ app_name = 'resources' urlpatterns = [ - url(r'^$', views.all_resources_and_groups), - url(r'^groups/$', views.all_groups), - url(r'^categories/', views.all_groups), + url(r'^$', views.all_resources_and_groups, name="index"), + url(r'^groups/$', views.all_groups, name="groups"), url(r'^groups/(?P[0-9]+)', views.group_detail, name='group_detail'), ] \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index 5ba00c2..7bd24a7 100644 --- a/templates/home.html +++ b/templates/home.html @@ -5,8 +5,19 @@ {% endblock title %} {% block body %} - {% include "navbar.html" %} -

Welcome!

- Bye - hello! + {% include "navbar.html" with home="active" %} +
+ Coding +
+
+

Curiosity == Knowledge

+
+
+

+ Pro Coding Tips is a project that aims to help developers with getting started on coding while assisting them with challenges they may face throughout their own experience. +

+
+ Read Some Tips +
+
{% endblock body %} \ No newline at end of file diff --git a/templates/layout.html b/templates/layout.html index 2511ca7..6641a1e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -2,9 +2,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + {% block title %}{% endblock title %} - + {% block body %}{% endblock body %} diff --git a/templates/navbar.html b/templates/navbar.html index 506942e..893c711 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -12,12 +12,19 @@