summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-05-31 11:29:49 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2015-05-31 11:29:49 +0200
commitd5f1f7cd60b0a6750c6189ad5ac92caeb3ed4d12 (patch)
treeeed6bce0bd08988b47de981ab675f0bbed64cbc1
parent5729c1c30b73bf2f12fd14c3e937532df8493cc3 (diff)
parent1e3a40940d30e76c1736f9aaad3d26727e3370f9 (diff)
downloadChimère - projet Saclay-d5f1f7cd60b0a6750c6189ad5ac92caeb3ed4d12.tar.bz2
Chimère - projet Saclay-d5f1f7cd60b0a6750c6189ad5ac92caeb3ed4d12.zip
Merge branch 'master' into saclay
-rw-r--r--static/saclay/css/styles.css7
-rw-r--r--static/saclay/images/popup/thanks_title.pngbin2057 -> 2136 bytes
-rw-r--r--templates/chimere/blocks/map.html2
-rw-r--r--templates/chimere/blocks/submited.html2
-rw-r--r--templates/chimere/main_map_simple.html2
5 files changed, 10 insertions, 3 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 038acf9..2968c27 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -295,7 +295,7 @@ h3.warn{
}
.no-titlebar-small.ui-dialog .ui-dialog-titlebar{
- width:300px;
+ width:340px;
}
.no-titlebar.ui-dialog .ui-dialog-titlebar{
@@ -335,6 +335,11 @@ h3.warn{
display:none;
}
+#cluster_list .dialog-content{
+ overflow: auto;
+ max-height: 380px;
+}
+
#welcome{
opacity:1;
padding:0;
diff --git a/static/saclay/images/popup/thanks_title.png b/static/saclay/images/popup/thanks_title.png
index 3c6ec2c..40bfba5 100644
--- a/static/saclay/images/popup/thanks_title.png
+++ b/static/saclay/images/popup/thanks_title.png
Binary files differ
diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html
index aa2b51c..bc27287 100644
--- a/templates/chimere/blocks/map.html
+++ b/templates/chimere/blocks/map.html
@@ -7,7 +7,7 @@ $(function(){
$('#cluster_list').dialog({'autoOpen':false,
'resizable':false,
'width':340,
- 'dialogClass':'no-titlebar'});
+ 'dialogClass':'no-titlebar-small'});
});
// -->
</script>
diff --git a/templates/chimere/blocks/submited.html b/templates/chimere/blocks/submited.html
index 02f86d7..5e72617 100644
--- a/templates/chimere/blocks/submited.html
+++ b/templates/chimere/blocks/submited.html
@@ -11,7 +11,7 @@
$("#submited-window").dialog({
modal: true,
dialogClass:'no-titlebar-small',
- width:300,
+ width:340,
resizable:false,
beforeClose: function() {
window.location = "{{index_url}}";
diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html
index dd81d39..552d309 100644
--- a/templates/chimere/main_map_simple.html
+++ b/templates/chimere/main_map_simple.html
@@ -5,6 +5,8 @@
{% block menu %}{# no menu in simple mode #}{% endblock %}
{% block message_edit %}{% endblock %}
{% block sidebar %}
+ <div class='sidebar-handler' id='sidebar-handler-hide'>
+ </div>
<div id='panel'>
<a>
<h2>{% trans "Categories"%}</h2>