Skip to content

Commit

Permalink
Add desktop interface
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Apr 5, 2016
1 parent 84e6e22 commit ecf5443
Show file tree
Hide file tree
Showing 20 changed files with 71 additions and 1,433 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
/c2cgeoportal/scaffolds/update/+dot+tx/CONST_config_mako
/c2cgeoportal/scaffolds/create/+package+/static-ngeo/js/mobile.js_tmpl
/c2cgeoportal/scaffolds/create/+package+/templates/mobile.html_tmpl
/c2cgeoportal/scaffolds/create/+package+/static-ngeo/js/desktop.js_tmpl
/c2cgeoportal/scaffolds/create/+package+/templates/desktop.html_tmpl
/c2cgeoportal/version.py
/c2cgeoportal.egg-info
/ngeo
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SRC_FILES = $(filter-out c2cgeoportal/version.py, $(shell ls -1 c2cgeoportal/*.p
$(shell find c2cgeoportal/views -name "*.py" -print) \
$(filter-out c2cgeoportal/scripts/theme2fts.py, $(shell find c2cgeoportal/scripts -name "*.py" -print))

APPS += mobile
APPS += desktop mobile
APPS_PACAKGE_PATH = c2cgeoportal/scaffolds/create/+package+
APPS_HTML_FILES = $(addprefix $(APPS_PACAKGE_PATH)/templates/, $(addsuffix .html_tmpl, $(APPS)))
APPS_JS_FILES = $(addprefix $(APPS_PACAKGE_PATH)/static-ngeo/js/, $(addsuffix .js_tmpl, $(APPS)))
Expand Down
11 changes: 1 addition & 10 deletions c2cgeoportal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,7 @@ def add_interface(
)

elif interface_type == INTERFACE_TYPE_NGEO:
if interface_name is None or interface_name == "main":
interface_name = "main"
add_interface_ngeo(
config,
interface_name=interface_name,
route_name="root",
route="/",
renderer="/%s.html" % interface_name,
)
route = "/%s" % interface_name
route = "/" if interface_name == "desktop" else "/%s" % interface_name

add_interface_ngeo(
config,
Expand Down
4 changes: 1 addition & 3 deletions c2cgeoportal/scaffolds/create/+package+/__init__.py_tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ def main(global_config, **settings):
config.scan()

# add the interfaces
add_interface(config)
add_interface(config, "edit")
add_interface(config, "routing")
add_interface(config, "desktop", INTERFACE_TYPE_NGEO)
add_interface(config, "mobile", INTERFACE_TYPE_NGEO)

return config.make_wsgi_app()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import '../../../node_modules/ngeo/contribs/gmf/less/font.less';
@import 'desktop.less';
@import "../../../node_modules/ngeo/contribs/gmf/less/desktop.less";
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "{{package}}.less";
@import "../../../node_modules/ngeo/contribs/gmf/less/desktop.less";
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@import "{{package}}.less";
@import "../../../node_modules/ngeo/contribs/gmf/less/layertree.less";
@import "../../../node_modules/ngeo/contribs/gmf/less/mobile.less";
97 changes: 0 additions & 97 deletions c2cgeoportal/scaffolds/create/+package+/templates/edit.html_tmpl

This file was deleted.

234 changes: 0 additions & 234 deletions c2cgeoportal/scaffolds/create/+package+/templates/edit.js_tmpl

This file was deleted.

Loading

0 comments on commit ecf5443

Please sign in to comment.