aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortr4ck3ur <tr4ck3ur@style-python.fr>2015-02-15 18:42:15 +0100
committertr4ck3ur <tr4ck3ur@style-python.fr>2015-02-15 18:42:15 +0100
commit8cdf3042650ad85a007a055aa264bbac3271a1e7 (patch)
treeda33ac0f71f38205f2699a02b53b6ba769d580be
parent32181a880eea131f6b2db9db0519c430df0188f9 (diff)
downloadjm2l-8cdf3042650ad85a007a055aa264bbac3271a1e7.tar.gz
jm2l-8cdf3042650ad85a007a055aa264bbac3271a1e7.tar.bz2
jm2l-8cdf3042650ad85a007a055aa264bbac3271a1e7.tar.xz
jm2l-8cdf3042650ad85a007a055aa264bbac3271a1e7.zip
Fix Staff part when description missing
-rw-r--r--jm2l/templates/Staff/list.mako3
-rw-r--r--jm2l/templates/helpers.mako39
2 files changed, 2 insertions, 40 deletions
diff --git a/jm2l/templates/Staff/list.mako b/jm2l/templates/Staff/list.mako
index b2cbe5d..682587f 100644
--- a/jm2l/templates/Staff/list.mako
+++ b/jm2l/templates/Staff/list.mako
@@ -25,8 +25,9 @@ from slugify import slugify
<i class="icon-pencil icon-white"></i> Editer le pôle
</a>
<h4>${Entity.name}</h4>
+ % if Entity.description:
<div>${Entity.description | n}</div>
-
+ % endif
<table width="100%" class="table table-striped table-bordered table-hover">
<thead>
<tr>
diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako
index b1409b8..629d094 100644
--- a/jm2l/templates/helpers.mako
+++ b/jm2l/templates/helpers.mako
@@ -244,45 +244,6 @@ TabJs = {'select':[], 'desc':[]}
</tr>
{% } %}
</script>
-%if 1:
-##<script src="/vendor/fileupload/js/jquery-uploader.min.js"></script>
-##<script src="/js/main.js"></script>
-plop
-% else:
-<script src="/static/jquery.min.js"></script>
-<!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="/static/js/vendor/jquery.ui.widget.js"></script>
-<!-- The Templates plugin is included to render the upload/download listings -->
-<script src="/static/js/tmpl.min.js"></script>
-<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-<script src="/static/js/load-image.all.min.js"></script>
-<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-<script src="/static/js/canvas-to-blob.min.js"></script>
-<!-- Bootstrap JS is not required, but included for the responsive demo navigation -->
-<script src="/static/bootstrap.min.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="/static/js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="/static/js/jquery.fileupload.js"></script>
-<!-- The File Upload processing plugin -->
-<script src="/static/js/jquery.fileupload-process.js"></script>
-<!-- The File Upload image preview & resize plugin -->
-<script src="/static/js/jquery.fileupload-image.js"></script>
-<!-- The File Upload audio preview plugin -->
-<script src="/static/js/jquery.fileupload-audio.js"></script>
-<!-- The File Upload video preview plugin -->
-<script src="/static/js/jquery.fileupload-video.js"></script>
-<!-- The File Upload validation plugin -->
-<script src="/static/js/jquery.fileupload-validate.js"></script>
-<!-- The File Upload user interface plugin -->
-<script src="/static/js/jquery.fileupload-ui.js"></script>
-<!-- The main application script -->
-<script src="/static/js/main.js"></script>
-<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
-<!--[if (gte IE 8)&(lt IE 10)]>
-<script src="/static/js/cors/jquery.xdr-transport.js"></script>
-<![endif]-->
-% endif
</%def> \
## -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
## Wrapper pour les intervention utilisateur