Commit b3bdbd0b authored by Marcel Rieger's avatar Marcel Rieger
Browse files

Fix error templates.

parent e2a36f22
......@@ -26,14 +26,13 @@ class ErrorController(object):
cherrypy.config.update({"error_page.%s" % code: self.__error})
@cherrypy.expose
@cherrypy.tools.render(template="error/%s.mako" % code)
@cherrypy.tools.render(template="errors/%s.mako" % code)
def func():
return self.get_error_data()
setattr(self, name, func)
@cherrypy.expose
@cherrypy.tools.method(accept="GET")
def index(self, *args, **kwargs):
raise cherrypy.HTTPRedirect(vispa.url.dynamic("/"), status=301)
......
......@@ -150,6 +150,12 @@ class Server(object):
'/ajax': {
'tools.workspace.on': True,
'tools.ajax.on': True
},
'/error': {
'tools.db.on': False,
'tools.private_parameters.on': False,
'tools.user.on': False,
'tools.workspace.on': False
}
}
......
.modal-header i.fa,.modal-header i.fi,.modal-header i.glyphicon,a>i.fa:first-child,a>i.fi:first-child,a>i.glyphicon:first-child,button>i.fa:first-child,button>i.fi:first-child,button>i.glyphicon:first-child{margin-right:5px}
a>i.fa:last-child,a>i.fi:last-child,a>i.glyphicon:last-child,button>i.fa:last-child,button>i.fi:last-child,button>i.glyphicon:last-child{margin-right:0}
ul.dropdown-menu>li.divider:first-child{display:none}
.glyphicon-none:before{content:"\2122";color:transparent!important}
.fa-none:before{content:"\2122";color:transparent!important}
.dropdown-submenu{position:relative}
.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px}
.dropdown-submenu:hover>.dropdown-menu{display:block}
.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}
.dropdown-submenu:hover>a:after{border-left-color:#fff}
.vispa-hidden{display:hidden}
.vispa-modal{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.4);cursor:default;z-index:2}
.vispa-table-outer{display:table;height:100%;width:100%}
.vispa-table-inner{display:table-cell;vertical-align:middle}
.vispa-rtl-fix{color:transparent;font-size:0}
.vispa-rtl-fix-hidden{color:transparent;font-size:0;display:none}
.vispa-caret-trans{border-top-color:transparent!important;border-bottom-color:transparent!important}
.vispa-zeroheight{height:0!important}
body>.blocker{visibility:hidden!important;opacity:0!important}
\ No newline at end of file
......@@ -2,7 +2,7 @@
<%! from vispa import url %>
<%inherit file="/error/base.mako" />
<%inherit file="base.mako" />
<%namespace name="base" file="/base.mako" />
<%block name="error_message">
......
## error/errorbase.mako
## errors/base.mako
<%! from vispa import url %>
<%inherit file="/vispa.mako" />
<%namespace name="base" file="/base.mako" />
<%block name="css_imports">
<%block name="js_inline_post">
<%
parent.css_imports()
vispa_files = [
"base/base.less"
]
for file in vispa_files:
base.import_css(url.static("css/" + file))
parent.js_inline_post()
%>
</%block>
<%block name="js_inline_pre">
var less = {logLevel: 0};
</%block>
<%block name="js_inline_post">
$(function() {
require(["jquery", "css!styles/common.css"], function($) {
$("#back").click(function() {
window.history.back();
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment