--- a/src/hdalab/static/hdalab/css/additionnal_renkan.css Wed Aug 20 15:36:50 2014 +0200
+++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Wed Aug 20 16:09:56 2014 +0200
@@ -3,4 +3,17 @@
}
.hand{
cursor: pointer;
+}
+.rnk-wrapper, .rnk-container{
+ width: 100%;
+}
+.rnk-container{
+ height: 100%;
+ width: 100%;
+}
+.rnk-wrapper{
+ height: 100%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
\ No newline at end of file
--- a/src/hdalab/static/hdalab/js/renkan-manual-save.js Wed Aug 20 15:36:50 2014 +0200
+++ b/src/hdalab/static/hdalab/js/renkan-manual-save.js Wed Aug 20 16:09:56 2014 +0200
@@ -38,7 +38,7 @@
contentType: "application/json",
data: JSON.stringify(_data),
success: function(data, textStatus, jqXHR) {
- console.log("RMS success !", data);
+ //console.log("save success !", data);
$(window).off("beforeunload", _onLeave);
_saveWarn = false;
if(data.substr(0,6)=="rk_id="){
@@ -70,7 +70,7 @@
_checkLeave();
});
_renkan.renderer.save = function() {
- console.log("RMS _renkan.renderer.save _opts.user_authenticated = ", _opts.user_authenticated);
+ //console.log("manual save _opts.user_authenticated = ", _opts.user_authenticated);
if(_opts.user_authenticated==true){
if ($(".Rk-Save-Button").hasClass("disabled")) {
if (!_proj.get("title")) {
@@ -81,7 +81,6 @@
}
}
else{
- //$(".Rk-Notifications").text("Connecte-toi bordel !").fadeIn().delay(2000).fadeOut();
dialog.dialog( "open" );
}
};
--- a/src/hdalab/templates/renkan_edit.html Wed Aug 20 15:36:50 2014 +0200
+++ b/src/hdalab/templates/renkan_edit.html Wed Aug 20 16:09:56 2014 +0200
@@ -6,23 +6,8 @@
{% block css_import %}
{{block.super}}
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/ui-lightness/jquery-ui-1.10.4.min.css' %}" />
+ <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 'renkanmanager/lib/renkan/css/renkan.css' %}" />
- <style type="text/css">
- .rnk-wrapper, .rnk-container{
- width: 100%;
- }
- .rnk-container{
- height: 100%;
- width: 100%;
- }
- .rnk-wrapper{
- height: 100%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- }
- </style>
{% endblock %}
{% block js_import %}
--- a/src/hdalab/views/profile.py Wed Aug 20 15:36:50 2014 +0200
+++ b/src/hdalab/views/profile.py Wed Aug 20 16:09:56 2014 +0200
@@ -230,18 +230,6 @@
response = json.dumps(content)
-# if request.user.is_authenticated():
-# rk = Renkan()
-# rk.rk_id = unicode(uuid.uuid1())
-# rk.title = title
-# rk.content = response
-# rk.owner = request.user
-# rk.save()
-# hr = HdalabRenkan()
-# hr.renkan = rk
-# hr.state = HdalabRenkan.EDITION
-# hr.save()
-
return HttpResponse(response, content_type="application/json")
@@ -249,7 +237,6 @@
rk_id = request.GET.get("rk_id", "")
#data = json.loads(request.body)
- logger.debug("YEAH !")
#logger.debug(data["edges"])
#logger.debug(data["nodes"])
#logger.debug(request.user.is_authenticated())
@@ -265,22 +252,12 @@
rk.save()
return HttpResponse("SAVED")
else:
- logger.debug("1")
# if rk_id was not a get parameter AND if it is set in json data AND if user is authenticated
# Then we can save the renkan
data = json.loads(request.body)
- logger.debug("2")
if "id" in data:
- logger.debug("3")
rk_id = data["id"]
- logger.debug("4")
- logger.debug(rk_id)
- logger.debug(Renkan.objects.filter(rk_id=rk_id))
- logger.debug(Renkan.objects.filter(rk_id=rk_id).count())
- logger.debug(request.user.is_authenticated())
- logger.debug(request.user)
if rk_id != "" and Renkan.objects.filter(rk_id=rk_id).count()==0 and request.user.is_authenticated():
- logger.debug("5")
rk = Renkan()
rk.rk_id = rk_id
rk.title = data["title"] if "title" in data else ""
@@ -291,7 +268,6 @@
hr.renkan = rk
hr.state = HdalabRenkan.EDITION
hr.save()
- logger.debug("6")
return HttpResponse("rk_id=" + rk_id)