git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicate css file (onelab_marko) and group all common stuff in base.html
[myslice.git]
/
trash
/
dashboard.py
diff --git
a/trash/dashboard.py
b/trash/dashboard.py
index
e996477
..
f4bde8f
100644
(file)
--- a/
trash/dashboard.py
+++ b/
trash/dashboard.py
@@
-11,15
+11,15
@@
from unfold.page import Page
from manifold.core.query import Query
#from manifold.manifoldquery import ManifoldQuery
from manifold.core.query import Query
#from manifold.manifoldquery import ManifoldQuery
-from plugins.stack
.stack
import Stack
+from plugins.stack import Stack
from plugins.lists.slicelist import SliceList
from plugins.lists.slicelist import SliceList
-from plugins.querycode
.querycode
import QueryCode
-from plugins.quickfilter
.quickfilter
import QuickFilter
+from plugins.querycode import QueryCode
+from plugins.quickfilter import QuickFilter
-from trash.trashutils
import quickfilter_criterias
+from trash.trashutils import quickfilter_criterias
#
#
-from
myslice.viewutils
import topmenu_items, the_user
+from
ui.topmenu
import topmenu_items, the_user
@login_required
def dashboard_view (request):
@login_required
def dashboard_view (request):
@@
-65,8
+65,8
@@
def dashboard_view (request):
# variables that will get passed to the view-unfold2.html template
template_env = {}
# variables that will get passed to the view-unfold2.html template
template_env = {}
- # define 'unfold
2
_main' to the template engine
- template_env [ 'unfold
2
_main' ] = main_plugin.render(request)
+ # define 'unfold_main' to the template engine
+ template_env [ 'unfold_main' ] = main_plugin.render(request)
# more general variables expected in the template
template_env [ 'title' ] = 'Test view for a full request cycle'
# more general variables expected in the template
template_env [ 'title' ] = 'Test view for a full request cycle'
@@
-87,10
+87,10
@@
def dashboard_view (request):
query=slices_query,
)
# likewise but on the side view
query=slices_query,
)
# likewise but on the side view
- template_env [ 'unfold
2
_margin' ] = related_plugin.render (request)
+ template_env [ 'unfold_margin' ] = related_plugin.render (request)
# add our own css in the mix
# add our own css in the mix
- page.add_css_files ( 'css/dashboard.css')
+
#
page.add_css_files ( 'css/dashboard.css')
# don't forget to run the requests
page.expose_queries ()
# don't forget to run the requests
page.expose_queries ()