From dafb3e20ddb1318163cfb2c5849256673b13f223 Mon Sep 17 00:00:00 2001
From: Rodolphe Breard <rodolphe@what.tf>
Date: Sat, 2 Jun 2018 12:23:12 +0200
Subject: [PATCH] Move the navbar icons to a dedicated subdirectory

---
 navbar/models.py                               |   4 ++--
 navbar/static/{ => navbar}/icons/bitbucket.png | Bin
 navbar/static/{ => navbar}/icons/blog.png      | Bin
 navbar/static/{ => navbar}/icons/config.png    | Bin
 navbar/static/{ => navbar}/icons/contact.png   | Bin
 navbar/static/{ => navbar}/icons/ds.png        | Bin
 navbar/static/{ => navbar}/icons/forum.png     | Bin
 navbar/static/{ => navbar}/icons/image.png     | Bin
 navbar/static/{ => navbar}/icons/irc.png       | Bin
 navbar/static/{ => navbar}/icons/lirria.png    | Bin
 navbar/static/{ => navbar}/icons/mag.png       | Bin
 navbar/static/{ => navbar}/icons/mediateki.png | Bin
 navbar/static/{ => navbar}/icons/nextcloud.png | Bin
 navbar/static/{ => navbar}/icons/pad.png       | Bin
 navbar/static/{ => navbar}/icons/panka.png     | Bin
 navbar/static/{ => navbar}/icons/pastebin.png  | Bin
 navbar/static/{ => navbar}/icons/small_rss.png | Bin
 navbar/static/{ => navbar}/icons/soutien.png   | Bin
 navbar/static/{ => navbar}/icons/soutien1.png  | Bin
 navbar/static/{ => navbar}/icons/todo.png      | Bin
 navbar/static/{ => navbar}/icons/um1.png       | Bin
 navbar/static/{ => navbar}/icons/wikhan.png    | Bin
 navbar/static/{ => navbar}/icons/xmpp.png      | Bin
 23 files changed, 2 insertions(+), 2 deletions(-)
 rename navbar/static/{ => navbar}/icons/bitbucket.png (100%)
 rename navbar/static/{ => navbar}/icons/blog.png (100%)
 rename navbar/static/{ => navbar}/icons/config.png (100%)
 rename navbar/static/{ => navbar}/icons/contact.png (100%)
 rename navbar/static/{ => navbar}/icons/ds.png (100%)
 rename navbar/static/{ => navbar}/icons/forum.png (100%)
 rename navbar/static/{ => navbar}/icons/image.png (100%)
 rename navbar/static/{ => navbar}/icons/irc.png (100%)
 rename navbar/static/{ => navbar}/icons/lirria.png (100%)
 rename navbar/static/{ => navbar}/icons/mag.png (100%)
 rename navbar/static/{ => navbar}/icons/mediateki.png (100%)
 rename navbar/static/{ => navbar}/icons/nextcloud.png (100%)
 rename navbar/static/{ => navbar}/icons/pad.png (100%)
 rename navbar/static/{ => navbar}/icons/panka.png (100%)
 rename navbar/static/{ => navbar}/icons/pastebin.png (100%)
 rename navbar/static/{ => navbar}/icons/small_rss.png (100%)
 rename navbar/static/{ => navbar}/icons/soutien.png (100%)
 rename navbar/static/{ => navbar}/icons/soutien1.png (100%)
 rename navbar/static/{ => navbar}/icons/todo.png (100%)
 rename navbar/static/{ => navbar}/icons/um1.png (100%)
 rename navbar/static/{ => navbar}/icons/wikhan.png (100%)
 rename navbar/static/{ => navbar}/icons/xmpp.png (100%)

diff --git a/navbar/models.py b/navbar/models.py
index d737e31..e5bac27 100644
--- a/navbar/models.py
+++ b/navbar/models.py
@@ -16,7 +16,7 @@ class Element(models.Model):
     new_window = models.BooleanField(default=False)
     add_locale = models.BooleanField(default=False)
     icon = models.FilePathField(
-        path=os.path.join(settings.BASE_DIR, 'navbar/static/icons'),
+        path=os.path.join(settings.BASE_DIR, 'navbar/static/navbar/icons'),
         match=".png",
         null=True,
         blank=True
@@ -24,7 +24,7 @@ class Element(models.Model):
     weight = models.PositiveSmallIntegerField()
 
     def icon_path(self):
-        return os.path.join('icons', os.path.basename(self.icon))
+        return os.path.join('navbar/icons', os.path.basename(self.icon))
 
     def children(self):
         return sorted(
diff --git a/navbar/static/icons/bitbucket.png b/navbar/static/navbar/icons/bitbucket.png
similarity index 100%
rename from navbar/static/icons/bitbucket.png
rename to navbar/static/navbar/icons/bitbucket.png
diff --git a/navbar/static/icons/blog.png b/navbar/static/navbar/icons/blog.png
similarity index 100%
rename from navbar/static/icons/blog.png
rename to navbar/static/navbar/icons/blog.png
diff --git a/navbar/static/icons/config.png b/navbar/static/navbar/icons/config.png
similarity index 100%
rename from navbar/static/icons/config.png
rename to navbar/static/navbar/icons/config.png
diff --git a/navbar/static/icons/contact.png b/navbar/static/navbar/icons/contact.png
similarity index 100%
rename from navbar/static/icons/contact.png
rename to navbar/static/navbar/icons/contact.png
diff --git a/navbar/static/icons/ds.png b/navbar/static/navbar/icons/ds.png
similarity index 100%
rename from navbar/static/icons/ds.png
rename to navbar/static/navbar/icons/ds.png
diff --git a/navbar/static/icons/forum.png b/navbar/static/navbar/icons/forum.png
similarity index 100%
rename from navbar/static/icons/forum.png
rename to navbar/static/navbar/icons/forum.png
diff --git a/navbar/static/icons/image.png b/navbar/static/navbar/icons/image.png
similarity index 100%
rename from navbar/static/icons/image.png
rename to navbar/static/navbar/icons/image.png
diff --git a/navbar/static/icons/irc.png b/navbar/static/navbar/icons/irc.png
similarity index 100%
rename from navbar/static/icons/irc.png
rename to navbar/static/navbar/icons/irc.png
diff --git a/navbar/static/icons/lirria.png b/navbar/static/navbar/icons/lirria.png
similarity index 100%
rename from navbar/static/icons/lirria.png
rename to navbar/static/navbar/icons/lirria.png
diff --git a/navbar/static/icons/mag.png b/navbar/static/navbar/icons/mag.png
similarity index 100%
rename from navbar/static/icons/mag.png
rename to navbar/static/navbar/icons/mag.png
diff --git a/navbar/static/icons/mediateki.png b/navbar/static/navbar/icons/mediateki.png
similarity index 100%
rename from navbar/static/icons/mediateki.png
rename to navbar/static/navbar/icons/mediateki.png
diff --git a/navbar/static/icons/nextcloud.png b/navbar/static/navbar/icons/nextcloud.png
similarity index 100%
rename from navbar/static/icons/nextcloud.png
rename to navbar/static/navbar/icons/nextcloud.png
diff --git a/navbar/static/icons/pad.png b/navbar/static/navbar/icons/pad.png
similarity index 100%
rename from navbar/static/icons/pad.png
rename to navbar/static/navbar/icons/pad.png
diff --git a/navbar/static/icons/panka.png b/navbar/static/navbar/icons/panka.png
similarity index 100%
rename from navbar/static/icons/panka.png
rename to navbar/static/navbar/icons/panka.png
diff --git a/navbar/static/icons/pastebin.png b/navbar/static/navbar/icons/pastebin.png
similarity index 100%
rename from navbar/static/icons/pastebin.png
rename to navbar/static/navbar/icons/pastebin.png
diff --git a/navbar/static/icons/small_rss.png b/navbar/static/navbar/icons/small_rss.png
similarity index 100%
rename from navbar/static/icons/small_rss.png
rename to navbar/static/navbar/icons/small_rss.png
diff --git a/navbar/static/icons/soutien.png b/navbar/static/navbar/icons/soutien.png
similarity index 100%
rename from navbar/static/icons/soutien.png
rename to navbar/static/navbar/icons/soutien.png
diff --git a/navbar/static/icons/soutien1.png b/navbar/static/navbar/icons/soutien1.png
similarity index 100%
rename from navbar/static/icons/soutien1.png
rename to navbar/static/navbar/icons/soutien1.png
diff --git a/navbar/static/icons/todo.png b/navbar/static/navbar/icons/todo.png
similarity index 100%
rename from navbar/static/icons/todo.png
rename to navbar/static/navbar/icons/todo.png
diff --git a/navbar/static/icons/um1.png b/navbar/static/navbar/icons/um1.png
similarity index 100%
rename from navbar/static/icons/um1.png
rename to navbar/static/navbar/icons/um1.png
diff --git a/navbar/static/icons/wikhan.png b/navbar/static/navbar/icons/wikhan.png
similarity index 100%
rename from navbar/static/icons/wikhan.png
rename to navbar/static/navbar/icons/wikhan.png
diff --git a/navbar/static/icons/xmpp.png b/navbar/static/navbar/icons/xmpp.png
similarity index 100%
rename from navbar/static/icons/xmpp.png
rename to navbar/static/navbar/icons/xmpp.png