--- a/src/hdalab/templates/renkan_edit.html Wed May 27 14:06:37 2015 +0200
+++ b/src/hdalab/templates/renkan_edit.html Fri Jun 19 18:25:35 2015 +0200
@@ -10,6 +10,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'renkanmanager/lib/renkan/css/renkan.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/additionnal_renkan.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/lib/bjqs.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/login.css' %}" />
{% endblock %}
{% block js_import %}
@@ -33,7 +34,7 @@
<script type="text/javascript">
var io_options = {}, dialog=false, _rkn;
_.extend(Rkns.i18n.fr, {"Search in Bins": "Rechercher dans les résultats"});
- function startRenkan(){
+ function startRenkan(){
var _renkan = new Rkns.Renkan({
manual_save: true,
show_user_list: false,
@@ -46,6 +47,8 @@
allow_image_upload : false,
default_view: false,
save_view: true,
+ hide_nodes: false,
+ show_node_editor_description_richtext: false,
search: [
{
type: "HdaTags",
@@ -87,13 +90,13 @@
//_____________//
io_options = {
- url: "{% url 'renkan_get_put' %}" + window.location.search,
- {% if user.is_authenticated %}
- user_authenticated: true,
- user_id:"{{ user.id }}",
- user_name:"{{ user }}",
- {% else %}
- user_authenticated: false,
+ url: "{% url 'renkan_get_put' %}" + window.location.search,
+ {% if user.is_authenticated %}
+ user_authenticated: true,
+ user_id:"{{ user.id }}",
+ user_name:"{{ user }}",
+ {% else %}
+ user_authenticated: false,
{% endif %}
};
Rkns.jsonIOSaveOnClick(_renkan, io_options);
@@ -109,9 +112,9 @@
width: 520,
modal: true,
create: function (event, ui) {
- $("#login-popup-close").click(function(){
- dialog.dialog("close");
- });
+ $("#login-popup-close").click(function(){
+ dialog.dialog("close");
+ });
}
});
@@ -142,91 +145,91 @@
manageLoginForm(event, this);
});
$("#login-popup-close").click(function(){
- dialog.dialog("close");
- });
+ dialog.dialog("close");
+ });
}
});
}
- form = dialog.find( "form" ).on( "submit", function( event ) {
- manageLoginForm(event, this);
- });
+ form = dialog.find( "form" ).on( "submit", function( event ) {
+ manageLoginForm(event, this);
+ });
- //help dialog init
- var help_dialog = $( "#help-container" ).dialog({
- autoOpen: false,
- height: 330,
- width: 880,
- resizable: false,
- draggable: false,
- create: function (event, ui) {
- var help_slideshow = $('#help-slideshow').bjqs({
- responsive:false,
- height: 320,
- width: 870,
- animtype: 'slide',
- showcontrols: true,
- centercontrols: false,
- nexttext: "",
- prevtext: "",
- showmarkers : false,
- automatic: false
- });
+ //help dialog init
+ var help_dialog = $( "#help-container" ).dialog({
+ autoOpen: false,
+ height: 330,
+ width: 880,
+ resizable: false,
+ draggable: false,
+ create: function (event, ui) {
+ var help_slideshow = $('#help-slideshow').bjqs({
+ responsive:false,
+ height: 320,
+ width: 870,
+ animtype: 'slide',
+ showcontrols: true,
+ centercontrols: false,
+ nexttext: "",
+ prevtext: "",
+ showmarkers : false,
+ automatic: false
+ });
- $("#toggle-help").click(function(){
- if (help_dialog.dialog("isOpen")){
- help_dialog.dialog("close");
- }
- else{
- help_dialog.dialog("open");
- }
- });
- $(".img-close").click(function(){
- help_dialog.dialog("close");
- });
- }
- });
- });
+ $("#toggle-help").click(function(){
+ if (help_dialog.dialog("isOpen")){
+ help_dialog.dialog("close");
+ }
+ else{
+ help_dialog.dialog("open");
+ }
+ });
+ $(".img-close").click(function(){
+ help_dialog.dialog("close");
+ });
+ }
+ });
+ });
</script>
{% endblock %}
{% block main_content %}
<div class="all-title">
- <h1><strong>RENKAN</strong></h1>
- <div class="renkan_help">
- {% if switch_shape_url %}
- <ul>
- <li>
- {% trans 'Change organisation' %}
- <p> {% trans '(Indisponible si modification du RENKAN)' %}</p>
- <ul>
- {% if 'shape=vert' in switch_shape_url.current %}
- <li id="graph-line"><a href="">✓ {% trans 'View graph in column' %}</a></li>
- <li id="graph-lineH"><a href="{{ switch_shape_url.horiz }}"> {% trans 'View graph in line' %}</a></li>
- <li id="graph-circle"><a href="{{ switch_shape_url.circle }}"> {% trans 'View graph in circle' %}</a></li>
- {% elif 'shape=horiz' in switch_shape_url.current %}
- <li id="graph-line"><a href="{{ switch_shape_url.vert }}"> {% trans 'View graph in column' %}</a></li>
- <li id="graph-lineH"><a href="">✓ {% trans 'View graph in line' %}</a></li>
- <li id="graph-circle"><a href="{{ switch_shape_url.circle }}"> {% trans 'View graph in circle' %}</a></li>
- {% else %}
- <li id="graph-line"><a href="{{ switch_shape_url.vert }}"> {% trans 'View graph in column' %}</a></li>
- <li id="graph-lineH"><a href="{{ switch_shape_url.horiz }}"> {% trans 'View graph in line' %}</a></li>
- <li id="graph-circle"><a href="">✓ {% trans 'View graph in circle' %}</a></li>
- {% endif %}
- </ul>
- </li>
- </ul>
- {% endif %}
- <a id="toggle-help" href="#"></a>
- </div>
+ <h1><strong>RENKAN</strong></h1>
+ <div class="renkan_help">
+ {% if switch_shape_url %}
+ <ul>
+ <li>
+ {% trans 'Change organisation' %}
+ <p> {% trans '(Indisponible si modification du RENKAN)' %}</p>
+ <ul>
+ {% if 'shape=vert' in switch_shape_url.current %}
+ <li id="graph-line"><a href="">✓ {% trans 'View graph in column' %}</a></li>
+ <li id="graph-lineH"><a href="{{ switch_shape_url.horiz }}"> {% trans 'View graph in line' %}</a></li>
+ <li id="graph-circle"><a href="{{ switch_shape_url.circle }}"> {% trans 'View graph in circle' %}</a></li>
+ {% elif 'shape=horiz' in switch_shape_url.current %}
+ <li id="graph-line"><a href="{{ switch_shape_url.vert }}"> {% trans 'View graph in column' %}</a></li>
+ <li id="graph-lineH"><a href="">✓ {% trans 'View graph in line' %}</a></li>
+ <li id="graph-circle"><a href="{{ switch_shape_url.circle }}"> {% trans 'View graph in circle' %}</a></li>
+ {% else %}
+ <li id="graph-line"><a href="{{ switch_shape_url.vert }}"> {% trans 'View graph in column' %}</a></li>
+ <li id="graph-lineH"><a href="{{ switch_shape_url.horiz }}"> {% trans 'View graph in line' %}</a></li>
+ <li id="graph-circle"><a href="">✓ {% trans 'View graph in circle' %}</a></li>
+ {% endif %}
+ </ul>
+ </li>
+ </ul>
+ {% endif %}
+ <a id="toggle-help" href="#"></a>
+ </div>
</div>
<div id="dialog-form" title="Identification">
- {% include 'ajax_identification/ajax_login.html' %}
+ {% include 'ajax_identification/ajax_login.html' %}
</div>
<div id="help-container" class="">
- {% include 'help_popup.html' %}
+ {% include 'help_popup.html' %}
</div>
<div class="rnk-wrapper">