separate templates from static files

we're now rather consistent with django mainstream's default layout
even if it's not always very convenient (use symlinks in your workdir)

diff --git a/.gitignore b/.gitignore
index 62df77b..2f9285b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,11 @@ TAGS
 *.pyc
 *~
 # these essentially are copies/links from other places
-static/
-all-templates/
+/static/
+/templates/
 # various working files
 play/
 *.leftovers
 *.hide
 entrypoints.ongoing/
+build/

diff --git a/Makefile b/Makefile
index bb7da6d..4993548 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,22 @@ SHELL = /bin/bash
 
 MAKE-SILENT = $(MAKE) --no-print-directory
 
-### first purpose, build and install from the specfile
+### first purpose, build and install from setup.py
 all: build
 
 force:
 
+# clean up and recompute
+redo: redo-static redo-templates
+
 DESTDIR := /
 datadir := /usr/share
 bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-# as of sept. 2013, we collect static files using manage.py
-build: templates
+# 
+build: static templates force
        python setup.py build
 
 install: 
@@ -23,6 +26,10 @@ install:
            --install-scripts=$(DESTDIR)/$(datadir)/unfold \
            --install-data=$(DESTDIR)/$(datadir)/unfold
 
+redo-static static: force
+       rm -rf static/
+       ./manage.py collectstatic --noinput
+
 ####################
 # general stuff
 DATE=$(shell date -u +"%a, %d %b %Y %T")
@@ -141,14 +148,14 @@ list-templates: plugins-templates local-templates
 ### all-static: clean-static run-static
 
 #################### manage templates for the plugin area
-templates run-templates templates-run: force
-       mkdir -p all-templates
-       ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./all-templates
+templates: force
+       mkdir -p templates
+       ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-templates),../$(x)) ./templates
 
 clean-templates templates-clean: force
-       rm -rf ./all-templates
+       rm -rf ./templates
 
-all-templates: clean-templates run-templates
+redo-templates: clean-templates templates
 
 ####################
 ### list-all list-resources: list-templates list-js list-css list-img
@@ -173,7 +180,7 @@ SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 ### rsync options
 # the config file should probably not be overridden ??
 # --exclude settings.py 
-LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3'  --exclude play/ 
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' --exclude config.py --exclude static --exclude templates --exclude '*.sqlite3'  --exclude play/ 
 # usual excludes
 RSYNC_EXCLUDES         := --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n 

diff --git a/README b/README
index 2b129de..1266c96 100644 (file)
--- a/README
+++ b/README
@@ -21,13 +21,15 @@ $ ./manage.py syncdb
 $ ./manage.py migrate
 
 * gather static files
-$ ./manage.py collectstatic (formerly, we used make static, which is deprecated)
+$ ./manage.py collectstatic 
 -- or --
 $ ./manage.py collectstatic --noinput
+-- or --
+$ make static (which is a shorthand for cleaning up and run manage collectstatic --noinput)
 
 * gather templates files 
   for now we still seem to rely on a make-based templates-collection process
-  that creates all-templates/ 
+  that creates templates/ 
 $ make templates
 
 * run a local server:
@@ -138,7 +140,7 @@ package is published)
 * static/: (generated by collectstatic, see above, do not source-control)
   $ manage.py [ --noinput ] collectstatic
 
-* all-templates/
+* templates/
 
 * myslice.sqlite3
   this is where django stores its own stuff, as per settings.py
@@ -151,65 +153,68 @@ package is published)
 
 . second, when you do use it for developement purposes, please be aware that:
 
-.. the recommended layout for the various files and pieces (py, html, js and css) with django is
-   IMHO really painful; we *SHOULD* use e.g. 
-      plugins/quickfilter/quickfilter.py, 
-      plugins/quickfilter/templates/quickfilter.html,
-      plugins/quickfilter/static/js/quickfilter.js 
-      plugins/quickfilter/static/css/quickfilter.css
-   which I have tried doing for a while but I found myself just hopping around in the file tree all
-   day long, wasting cycles big time
-
-.. as that does not make sense IMHO, I've rewritten the tool for gathering these pieces (this is in
-   the Makefile). Bottom line is we can essentially store this wherever we want.
-   The only restriction being that if you have a template that is *not* html, then it *has to* sit
-   in a templates/ directory, otherwise it gets shipped as a static file.  
-
-.. as a result, we can now store all the files building a plugin in a single (git) directory; like e.g.
-      plugins/quickfilter/quickfilter.py
-      plugins/quickfilter/quickfilter.html
-      plugins/quickfilter/quickfilter.js
-      plugins/quickfilter/quickfilter.css
-
-   Of course it's a completely different matter once the service is packaged and installed, these
-   files of course get properly separated.
-
-.. as a result it is a little bit less convenient to use the development server when you change the
-   layout of your static and template files, you might need to re-run 'make static', so it is
-   recommended to use devel/server-loop.sh instead
-
-
-All this being said, here are our current conventions for storing templates and static files
-
-* templates:
-  we store this under templates/ within the corresponding app, e.g.
-     auth/templates/login.html
-  for now this is mostly about html, but the engine can be used for rendering anything 
-  including js(on) or whatever (in which case, as stated above, this *must* have /templates/ in its path.
-
-* static files:
-  we chose to have all static files (images, but also javascript and stylesheets) in the various
-  proj or app where they belong, with a layout like:
-  where-it-belongs/
-      img/
-      css/
-      js/
-  Honestly it's not yet very clear sometimes what 'where-it-belongs' should be sometimes, and it
-  does not matter too much anyway, given that the code doesn't need to change when we move things
-  around. So in particular it's fuzzy between myslice/ (where the logo could fit e.g.) views/ and
-  even trash/
-
-Makefile has a few convenience targets to list all kinds of stuff; the 2 major targets are 
-
-$ make static templates
-
-that would reset all-static/ and all-templates/ for you from the other contents
-
-* third-party
-  please note that the set of files that actually get exposed in all-static from third-party is
-  hand-coded in Makefile because we tried to preserve the original codebase layout from mainstream,
-  and there's only so much in common between 2 differents js libraries at this point.
-
+NOTE. this whole business is being changed
+basically we come back to the way django has it by default...
+
+==changing== .. the recommended layout for the various files and pieces (py, html, js and css) with django is
+==changing==    IMHO really painful; we *SHOULD* use e.g. 
+==changing==       plugins/quickfilter/quickfilter.py, 
+==changing==       plugins/quickfilter/templates/quickfilter.html,
+==changing==       plugins/quickfilter/static/js/quickfilter.js 
+==changing==       plugins/quickfilter/static/css/quickfilter.css
+==changing==    which I have tried doing for a while but I found myself just hopping around in the file tree all
+==changing==    day long, wasting cycles big time
+==changing== 
+==changing== .. as that does not make sense IMHO, I've rewritten the tool for gathering these pieces (this is in
+==changing==    the Makefile). Bottom line is we can essentially store this wherever we want.
+==changing==    The only restriction being that if you have a template that is *not* html, then it *has to* sit
+==changing==    in a templates/ directory, otherwise it gets shipped as a static file.  
+==changing== 
+==changing== .. as a result, we can now store all the files building a plugin in a single (git) directory; like e.g.
+==changing==       plugins/quickfilter/quickfilter.py
+==changing==       plugins/quickfilter/quickfilter.html
+==changing==       plugins/quickfilter/quickfilter.js
+==changing==       plugins/quickfilter/quickfilter.css
+==changing== 
+==changing==    Of course it's a completely different matter once the service is packaged and installed, these
+==changing==    files of course get properly separated.
+==changing== 
+==changing== .. as a result it is a little bit less convenient to use the development server when you change the
+==changing==    layout of your static and template files, you might need to re-run 'make static', so it is
+==changing==    recommended to use devel/server-loop.sh instead
+==changing== 
+==changing== 
+==changing== All this being said, here are our current conventions for storing templates and static files
+==changing== 
+==changing== * templates:
+==changing==   we store this under templates/ within the corresponding app, e.g.
+==changing==      auth/templates/login.html
+==changing==   for now this is mostly about html, but the engine can be used for rendering anything 
+==changing==   including js(on) or whatever (in which case, as stated above, this *must* have /templates/ in its path.
+==changing== 
+==changing== * static files:
+==changing==   we chose to have all static files (images, but also javascript and stylesheets) in the various
+==changing==   proj or app where they belong, with a layout like:
+==changing==   where-it-belongs/
+==changing==       img/
+==changing==       css/
+==changing==       js/
+==changing==   Honestly it's not yet very clear sometimes what 'where-it-belongs' should be sometimes, and it
+==changing==   does not matter too much anyway, given that the code doesn't need to change when we move things
+==changing==   around. So in particular it's fuzzy between myslice/ (where the logo could fit e.g.) views/ and
+==changing==   even trash/
+==changing== 
+==changing== Makefile has a few convenience targets to list all kinds of stuff; the 2 major targets are 
+==changing== 
+==changing== $ make static templates
+==changing== 
+==changing== that would reset static/ and templates/ for you from the other contents
+==changing== 
+==changing== * third-party
+==changing==   please note that the set of files that actually get exposed in all-static from third-party is
+==changing==   hand-coded in Makefile because we tried to preserve the original codebase layout from mainstream,
+==changing==   and there's only so much in common between 2 differents js libraries at this point.
+==changing== 
 
 
 ======== update django database to reflect changes in existing models without any migration system (e.g., south) =========

diff --git a/auth/css/login.css b/auth/static/css/login.css
similarity index 100%
rename from auth/css/login.css
rename to auth/static/css/login.css

diff --git a/auth/css/logout.css b/auth/static/css/logout.css
similarity index 100%
rename from auth/css/logout.css
rename to auth/static/css/logout.css

diff --git a/auth/img/form_input_password.png b/auth/static/img/form_input_password.png
similarity index 100%
rename from auth/img/form_input_password.png
rename to auth/static/img/form_input_password.png

diff --git a/auth/js/logout.js b/auth/static/js/logout.js
similarity index 100%
rename from auth/js/logout.js
rename to auth/static/js/logout.js

diff --git a/devel/server-loop.sh b/devel/server-loop.sh
index 06a56ee..1ac43e4 100755 (executable)
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@ -7,8 +7,9 @@ hostname | grep -q '^z' && port=8080 || port=80
 [[ -n "$@" ]] && port=$1
 
 while true; do 
-    ./manage.py collectstatic --noinput
-    make all-templates
+    # we use make for convenience
+    # but what the static target really does is to invoke manage.py collectstatic 
+    make static templates
     ./manage.py runserver 0.0.0.0:$port
        sleep 1
 done

diff --git a/manifold/css/manifold.css b/manifold/static/css/manifold.css
similarity index 100%
rename from manifold/css/manifold.css
rename to manifold/static/css/manifold.css

diff --git a/manifold/js/class.js b/manifold/static/js/class.js
similarity index 100%
rename from manifold/js/class.js
rename to manifold/static/js/class.js

diff --git a/manifold/js/manifold-query.js b/manifold/static/js/manifold-query.js
similarity index 100%
rename from manifold/js/manifold-query.js
rename to manifold/static/js/manifold-query.js

diff --git a/manifold/js/manifold.js b/manifold/static/js/manifold.js
similarity index 100%
rename from manifold/js/manifold.js
rename to manifold/static/js/manifold.js

diff --git a/manifold/js/metadata.js b/manifold/static/js/metadata.js
similarity index 100%
rename from manifold/js/metadata.js
rename to manifold/static/js/metadata.js

diff --git a/manifold/js/plugin-sample.html b/manifold/static/js/plugin-sample.html
similarity index 100%
rename from manifold/js/plugin-sample.html
rename to manifold/static/js/plugin-sample.html

diff --git a/manifold/js/plugin.js b/manifold/static/js/plugin.js
similarity index 100%
rename from manifold/js/plugin.js
rename to manifold/static/js/plugin.js

diff --git a/myslice/settings.py b/myslice/settings.py
index f02b10f..3a39ab9 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -95,15 +95,8 @@ STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    ('js', os.path.join(ROOT,'manifold/js')),
-    ('css', os.path.join(ROOT,'manifold/css')),
-    ('js', os.path.join(ROOT,'unfold/js')),
-    ('css', os.path.join(ROOT,'unfold/css')),
-    ('js', os.path.join(ROOT,'auth/js')),
-    ('css', os.path.join(ROOT,'auth/css')),
-    ('img', os.path.join(ROOT,'auth/img')),
-    ('css', os.path.join(ROOT,'views/css')),
-    ('img', os.path.join(ROOT,'views/img')),
+    # Thierry : we do not need to detail the contents 
+    # of our 'apps' since they're mentioned in INSTALLED_APPS
 )
 
 # Needed by PluginFinder
@@ -114,7 +107,8 @@ THIRDPARTY_DIR = os.path.join(ROOT, 'third-party')
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
+# Thierry : no need for this one    
+#    'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
     'unfold.collectstatic.PluginFinder',
     'unfold.collectstatic.ThirdPartyFinder',
@@ -160,7 +154,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT,"all-templates"),
+    os.path.join(ROOT,"templates"),
 )
 
 INSTALLED_APPS = (
@@ -181,8 +175,10 @@ INSTALLED_APPS = (
     'plugins',
     # views - more or less stable 
     'views',
+    # temporary
     'trash',
-    'south', # managing database migrations
+    # managing database migrations
+    'south', 
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
@@ -240,4 +236,3 @@ CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
-

diff --git a/plugins/active_filters/static/active_filters.html b/plugins/active_filters/templates/active_filters.html
similarity index 100%
rename from plugins/active_filters/static/active_filters.html
rename to plugins/active_filters/templates/active_filters.html

diff --git a/plugins/code_editor/static/code_editor.html b/plugins/code_editor/templates/code_editor.html
similarity index 100%
rename from plugins/code_editor/static/code_editor.html
rename to plugins/code_editor/templates/code_editor.html

diff --git a/plugins/debug_platform/static/debug_platform.html b/plugins/debug_platform/templates/debug_platform.html
similarity index 100%
rename from plugins/debug_platform/static/debug_platform.html
rename to plugins/debug_platform/templates/debug_platform.html

diff --git a/plugins/form/static/form.html b/plugins/form/templates/form.html
similarity index 100%
rename from plugins/form/static/form.html
rename to plugins/form/templates/form.html

diff --git a/plugins/googlemap/static/googlemap.html b/plugins/googlemap/templates/googlemap.html
similarity index 100%
rename from plugins/googlemap/static/googlemap.html
rename to plugins/googlemap/templates/googlemap.html

diff --git a/plugins/hazelnut/static/hazelnut.html b/plugins/hazelnut/templates/hazelnut.html
similarity index 100%
rename from plugins/hazelnut/static/hazelnut.html
rename to plugins/hazelnut/templates/hazelnut.html

diff --git a/plugins/lists/static/simplelist.html b/plugins/lists/templates/simplelist.html
similarity index 100%
rename from plugins/lists/static/simplelist.html
rename to plugins/lists/templates/simplelist.html

diff --git a/plugins/lists/static/staticlist.html b/plugins/lists/templates/staticlist.html
similarity index 100%
rename from plugins/lists/static/staticlist.html
rename to plugins/lists/templates/staticlist.html

diff --git a/plugins/messages/static/messages.html b/plugins/messages/templates/messages.html
similarity index 100%
rename from plugins/messages/static/messages.html
rename to plugins/messages/templates/messages.html

diff --git a/plugins/myplugin/static/myplugin.html b/plugins/myplugin/templates/myplugin.html
similarity index 100%
rename from plugins/myplugin/static/myplugin.html
rename to plugins/myplugin/templates/myplugin.html

diff --git a/plugins/pres_view/static/pres_view.html b/plugins/pres_view/templates/pres_view.html
similarity index 100%
rename from plugins/pres_view/static/pres_view.html
rename to plugins/pres_view/templates/pres_view.html

diff --git a/plugins/query_editor/static/filter_input_integer.html b/plugins/query_editor/templates/filter_input_integer.html
similarity index 100%
rename from plugins/query_editor/static/filter_input_integer.html
rename to plugins/query_editor/templates/filter_input_integer.html

diff --git a/plugins/query_editor/static/filter_input_others.html b/plugins/query_editor/templates/filter_input_others.html
similarity index 100%
rename from plugins/query_editor/static/filter_input_others.html
rename to plugins/query_editor/templates/filter_input_others.html

diff --git a/plugins/query_editor/static/filter_input_string.html b/plugins/query_editor/templates/filter_input_string.html
similarity index 100%
rename from plugins/query_editor/static/filter_input_string.html
rename to plugins/query_editor/templates/filter_input_string.html

diff --git a/plugins/query_editor/static/filter_input_string_values.html b/plugins/query_editor/templates/filter_input_string_values.html
similarity index 100%
rename from plugins/query_editor/static/filter_input_string_values.html
rename to plugins/query_editor/templates/filter_input_string_values.html

diff --git a/plugins/query_editor/static/query_editor.html b/plugins/query_editor/templates/query_editor.html
similarity index 100%
rename from plugins/query_editor/static/query_editor.html
rename to plugins/query_editor/templates/query_editor.html

diff --git a/plugins/querycode/static/querycode.html b/plugins/querycode/templates/querycode.html
similarity index 100%
rename from plugins/querycode/static/querycode.html
rename to plugins/querycode/templates/querycode.html

diff --git a/plugins/quickfilter/static/quickfilter.html b/plugins/quickfilter/templates/quickfilter.html
similarity index 100%
rename from plugins/quickfilter/static/quickfilter.html
rename to plugins/quickfilter/templates/quickfilter.html

diff --git a/plugins/resources_selected/static/resources_selected.html b/plugins/resources_selected/templates/resources_selected.html
similarity index 100%
rename from plugins/resources_selected/static/resources_selected.html
rename to plugins/resources_selected/templates/resources_selected.html

diff --git a/plugins/senslabmap/static/senslabmap.html b/plugins/senslabmap/templates/senslabmap.html
similarity index 100%
rename from plugins/senslabmap/static/senslabmap.html
rename to plugins/senslabmap/templates/senslabmap.html

diff --git a/plugins/stack/static/stack.html b/plugins/stack/templates/stack.html
similarity index 100%
rename from plugins/stack/static/stack.html
rename to plugins/stack/templates/stack.html

diff --git a/plugins/tabs/static/tabs.html b/plugins/tabs/templates/tabs.html
similarity index 100%
rename from plugins/tabs/static/tabs.html
rename to plugins/tabs/templates/tabs.html

diff --git a/plugins/updater/static/updater.html b/plugins/updater/templates/updater.html
similarity index 100%
rename from plugins/updater/static/updater.html
rename to plugins/updater/templates/updater.html

diff --git a/plugins/wizard/static/test.html b/plugins/wizard/templates/test.html
similarity index 100%
rename from plugins/wizard/static/test.html
rename to plugins/wizard/templates/test.html

diff --git a/plugins/wizard/static/wizard.html b/plugins/wizard/templates/wizard.html
similarity index 100%
rename from plugins/wizard/static/wizard.html
rename to plugins/wizard/templates/wizard.html

diff --git a/setup.py b/setup.py
index 8783260..9bfc26e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -15,9 +15,9 @@ packages= [ os.path.dirname(init) for init in (glob("*/__init__.py")+glob("*/*/_
 setup(packages = packages,
       scripts = [],
       data_files = [ 
-        ( 'all-static/js', glob ('all-static/js/*')),
-        ( 'all-static/css', glob ('all-static/css/*')),
-        ( 'all-static/img', glob ('all-static/img/*')),
-        ( 'all-templates', glob ('all-templates/*')),
+        ( 'static/js', glob ('static/js/*')),
+        ( 'static/css', glob ('static/css/*')),
+        ( 'static/img', glob ('static/img/*')),
+        ( 'templates', glob ('templates/*')),
         ( 'apache', [ 'apache/myslice.conf', 'apache/myslice.wsgi' ]),
         ])

diff --git a/trash/css/dashboard.css b/trash/static/css/dashboard.css
similarity index 100%
rename from trash/css/dashboard.css
rename to trash/static/css/dashboard.css

diff --git a/trash/css/sample.css b/trash/static/css/sample.css
similarity index 100%
rename from trash/css/sample.css
rename to trash/static/css/sample.css

diff --git a/unfold/collectstatic.py b/unfold/collectstatic.py
index 4fb3bbc..b40afe4 100644 (file)
--- a/unfold/collectstatic.py
+++ b/unfold/collectstatic.py
@@ -39,6 +39,7 @@ class PluginFinder(FileSystemFinder):
         return [os.path.join(dir, name, 'static') for name in os.listdir(dir) 
                 if os.path.isdir(os.path.join(dir, name))]
 
+# as these are a django-specific notion
 class ThirdPartyFinder(BaseFinder):
     """
     A static files finder that looks in the directory of each third-party
@@ -47,7 +48,8 @@ class ThirdPartyFinder(BaseFinder):
     # third-party/MODULE/path/to/js
     extensions = {
         # PREFIX : EXTENSIONS
-        ''   : ('.html',),
+# third party stuff is not expected to provide templates,
+#        ''   : ('.html',),
         'js' : ('.js',),
         'css': ('.css',),
         'img': ('.png', '.ico',),
@@ -76,6 +78,7 @@ class ThirdPartyFinder(BaseFinder):
                         matched_path = os.path.join(path, file) 
                         if not all:
                             return matched_path
+                        print 'ThirdPartyFinder, adding',matched_path
                         matches.append(matched_path)
         return matches
 

diff --git a/unfold/css/plugin.css b/unfold/static/css/plugin.css
similarity index 100%
rename from unfold/css/plugin.css
rename to unfold/static/css/plugin.css

diff --git a/unfold/js/messages-runtime.js b/unfold/static/js/messages-runtime.js
similarity index 100%
rename from unfold/js/messages-runtime.js
rename to unfold/static/js/messages-runtime.js

diff --git a/unfold/js/plugin_helper.js b/unfold/static/js/plugin_helper.js
similarity index 100%
rename from unfold/js/plugin_helper.js
rename to unfold/static/js/plugin_helper.js

diff --git a/unfold/js/spin.presets.js b/unfold/static/js/spin.presets.js
similarity index 100%
rename from unfold/js/spin.presets.js
rename to unfold/static/js/spin.presets.js

diff --git a/unfold/js/unfold-helper.js b/unfold/static/js/unfold-helper.js
similarity index 100%
rename from unfold/js/unfold-helper.js
rename to unfold/static/js/unfold-helper.js

diff --git a/views/css/layout-unfold2.css b/views/static/css/layout-unfold2.css
similarity index 100%
rename from views/css/layout-unfold2.css
rename to views/static/css/layout-unfold2.css

diff --git a/views/css/topmenu.css b/views/static/css/topmenu.css
similarity index 100%
rename from views/css/topmenu.css
rename to views/static/css/topmenu.css

diff --git a/views/img/favicon.ico b/views/static/img/favicon.ico
similarity index 100%
rename from views/img/favicon.ico
rename to views/static/img/favicon.ico

diff --git a/views/img/myslice-logo.png b/views/static/img/myslice-logo.png
similarity index 100%
rename from views/img/myslice-logo.png
rename to views/static/img/myslice-logo.png

diff --git a/views/img/onelab-logo.png b/views/static/img/onelab-logo.png
similarity index 100%
rename from views/img/onelab-logo.png
rename to views/static/img/onelab-logo.png