]> git.parisson.com Git - diggersdigest.git/commitdiff
projects / diggersdigest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a561517)
Update templates
authorThomas Fillon <thomas@parisson.com>
Wed, 2 Sep 2015 14:57:06 +0000 (16:57 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 2 Sep 2015 14:57:06 +0000 (16:57 +0200)
.gitignore patch | blob | history
diggersdigest/records/script_data_recover.py patch | blob | history
diggersdigest/static/css/dig2.css patch | blob | history
diggersdigest/static/img/diggersdigest_400.png patch | blob | history
diggersdigest/templates/base.html patch | blob | history
diggersdigest/templates/index.html patch | blob | history

diff --git a/.gitignore b/.gitignore
index 220c1aa7d60669635bef3ae00c7721bd2525ae37..775ff5e7241054b865dae6423ea6473ed52351b3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ pip-log.txt
 
 #Volume Directory for docker-compose
 mysql/
-diggersdigest/static/
\ No newline at end of file
+diggersdigest/static/media
\ No newline at end of file
diff --git a/diggersdigest/records/script_data_recover.py b/diggersdigest/records/script_data_recover.py
index 94c790bfee6b9a92892d7fa0ba46d49818709617..da0cc9117cc69ee24754d1ed3c17a8ea90359e40 100644 (file)
--- a/diggersdigest/records/script_data_recover.py
+++ b/diggersdigest/records/script_data_recover.py
@@ -103,7 +103,7 @@ check_mp3(mp3_mix_list, MIX_PATH)
 
 # PODCAST FROM MIX
 MIX_CATEGORY = 'Podcast'
-blog_models.BlogCategory.objects.get_or_create(title='Podcast')
+blog_models.BlogCategory.objects.get_or_create(title=MIX_CATEGORY)
 
 PODCAST_IMG_PATH = os.path.join('uploads/blog/mixes')
 PODCAST_AUDIO_PATH = os.path.join('uploads/audio/mixes')
diff --git a/diggersdigest/static/css/dig2.css b/diggersdigest/static/css/dig2.css
index d58c8143bd059a6816bcb0b225a03a0348ff7e65..55babe47925f687f443fc0714d7b5153b1bfb25d 100644 (file)
--- a/diggersdigest/static/css/dig2.css
+++ b/diggersdigest/static/css/dig2.css
@@ -1,4 +1,17 @@
 .container{
    background:url("../img/dotted_background.png"
    ) repeat;
+}
+
+body {
+    padding-top: 300px;
+}
+
+hr {
+    display: block;
+    height: 2px;
+    border: 0;
+    border-top: 2px solid #000;
+    margin: 1em 0;
+    padding: 0;
 }
\ No newline at end of file
diff --git a/diggersdigest/static/img/diggersdigest_400.png b/diggersdigest/static/img/diggersdigest_400.png
index db99b9cbaedbb9b2bf4de500a70dfa699e476519..6d29912fa0637c2c84b65aef09250eff79aa813d 100644 (file)
Binary files a/diggersdigest/static/img/diggersdigest_400.png and b/diggersdigest/static/img/diggersdigest_400.png differ
diff --git a/diggersdigest/templates/base.html b/diggersdigest/templates/base.html
index b67b36cc5a25c2e5a9b90c6076bd1faed416d1b4..5e3049167e1867fd7cfe0be3651c7f53403abbef 100644 (file)
--- a/diggersdigest/templates/base.html
+++ b/diggersdigest/templates/base.html
@@ -50,23 +50,27 @@
 <body id="{% block body_id %}body{% endblock %}">
 
 <div class="navbar navbar-default navbar-fixed-top" role="navigation">
-<div class="container dotted_bg ">
-<div class="navbar-header">
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+  <div class="container ">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="sr-only">{% trans "Toggle Navigation" %}</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
-    </button>
-    {% if settings.SITE_TITLE %}<a class="navbar-brand" href="/"><img class="pull-left" src="{% static "img/diggersdigest_400.png" %}"alt={{ settings.SITE_TITLE }}  ></a>{% endif %}
-    {% if settings.SITE_TAGLINE %}<p class="navbar-text visible-lg">{{ settings.SITE_TAGLINE }}</p>{% endif %}
-</div>
-<div class="navbar-collapse collapse">
-    {% search_form "all" %}
-    {% page_menu "pages/menus/dropdown.html" %}
-</div>
-</div>
+      </button>
+      {% if settings.SITE_TITLE %}<a class="navbar-brand" href="/"><img class="pull-left" src="{% static "img/diggersdigest_400.png" %}"alt={{ settings.SITE_TITLE }}  ></a>{% endif %}
+      {% if settings.SITE_TAGLINE %}<p class="navbar-text visible-lg">{{ settings.SITE_TAGLINE }}</p>{% endif %}
+    </div>
+    
+    <div class="navbar-collapse collapse">
+      {% search_form "all" %}
+      {% page_menu "pages/menus/dropdown.html" %}
+    </div>   <hr>
+  </div>
 </div>
+    
+
+
 
 <div class="container">
 
diff --git a/diggersdigest/templates/index.html b/diggersdigest/templates/index.html
index c0809e8f76bf63f79feb7fcb7ec9984212322544..bce31b373dea2cce7c0057b84320dca180307f01 100644 (file)
--- a/diggersdigest/templates/index.html
+++ b/diggersdigest/templates/index.html
@@ -25,6 +25,10 @@
     <li><a href="http://mezzanine.jupo.org/docs/deployment.html">Deploying to a production server</a></li>
 </ul>
 {% endblocktrans %}
+<div><!-- Showcase-->
+</div><!-- /Showcase -->
+<div><!-- Latest Releases -->
+</div><!-- /Latest Releases -->
 <div><!-- Recent Posts -->
 {% load blog_tags keyword_tags i18n mezzanine_tags %}
 {% blog_recent_posts 5 as recent_posts %}
@@ -40,6 +44,9 @@
 
     <a href="{{ recent_post.get_absolute_url }}" class="btn btn-info btn-mini">{% trans "read more" %}</a>
     <hr>
+    {% if recent_post.categories %}
+    {{ recent_post.categories. }}
+    {% endif %}
     {% if settings.BLOG_USE_FEATURED_IMAGE and recent_post.featured_image %}
         {% block recent_post_list_post_featured_image %}
         <a href="{{ recent_post.get_absolute_url }}">
Unnamed repository; edit this file 'description' to name the repository.