demo: Fix forgotten changed class names

[people/ms/westferry.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 97cb3aa9699c85025f1ed378ae4dfcf5642c07a7..c86e056935af1bebc59763cc3c4d132f16602898 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ westferry_PYTHON = \
        src/westferry/constants.py \
        src/westferry/application.py \
        src/westferry/i18n.py \
+       src/westferry/logging.py \
        src/westferry/services.py
 
 westferrydir = $(pythondir)/westferry
@@ -106,16 +107,6 @@ westferry_backend_PYTHON = \
 
 westferry_backenddir = $(pythondir)/westferry/backend
 
-westferry_backend_forms_PYTHON = \
-       src/westferry/backend/forms/__init__.py \
-       src/westferry/backend/forms/base.py \
-       src/westferry/backend/forms/choice.py \
-       src/westferry/backend/forms/main.py \
-       src/westferry/backend/forms/text.py \
-       src/westferry/backend/forms/yesno.py
-
-westferry_backend_formsdir = $(westferry_backenddir)/forms
-
 westferry_handlers_PYTHON = \
        src/westferry/handlers/__init__.py \
        src/westferry/handlers/analytics.py \
@@ -128,9 +119,11 @@ westferry_handlersdir = $(pythondir)/westferry/handlers
 westferry_ui_PYTHON = \
        src/westferry/ui/__init__.py \
        src/westferry/ui/base.py \
+       src/westferry/ui/boxes.py \
        src/westferry/ui/forms.py \
        src/westferry/ui/graphs.py \
-       src/westferry/ui/menu.py \
+       src/westferry/ui/menus.py \
+       src/westferry/ui/tabs.py \
        src/westferry/ui/utils.py
 
 westferry_uidir = $(pythondir)/westferry/ui
@@ -140,17 +133,20 @@ westferry_uidir = $(pythondir)/westferry/ui
 templatesdir = $(datadir)/westferry/templates
 
 dist_templates_DATA = \
-       src/templates/base.html
+       src/templates/base.html \
+       src/templates/default.html \
+       src/templates/graphs.html
 
 templates_demodir = $(templatesdir)/demo
 
 dist_templates_demo_DATA = \
-       src/templates/demo/forms.html \
        src/templates/demo/index.html
 
 templates_modulesdir = $(templatesdir)/modules
 
-dist_templates_modules_DATA =
+dist_templates_modules_DATA = \
+       src/templates/modules/box.html \
+       src/templates/modules/tabs.html
 
 templates_modules_formsdir = $(templates_modulesdir)/forms
 
@@ -170,16 +166,15 @@ dist_templates_modules_forms_inputs_DATA = \
 templates_modules_graphsdir = $(templates_modulesdir)/graphs
 
 dist_templates_modules_graphs_DATA = \
-       src/templates/modules/graphs/box.html \
-       src/templates/modules/graphs/preview.html \
-       src/templates/modules/graphs/thumbnail.html \
-       src/templates/modules/graphs/thumbnail-bar.html
+       src/templates/modules/graphs/box.html
 
-templates_modules_menudir = $(templates_modulesdir)/menu
+templates_modules_menusdir = $(templates_modulesdir)/menus
 
-dist_templates_modules_menu_DATA = \
-       src/templates/modules/menu/sidebar.html \
-       src/templates/modules/menu/sidebar-link.html
+dist_templates_modules_menus_DATA = \
+       src/templates/modules/menus/dropdown.html \
+       src/templates/modules/menus/link.html \
+       src/templates/modules/menus/sidebar.html \
+       src/templates/modules/menus/topbar.html
 
 ui_modulesdir = $(datadir)/westferry/templates/modules