From effc9ec794486e4551890f62e710b88843abfc00 Mon Sep 17 00:00:00 2001
From: supriya
Date: Fri, 10 Aug 2012 12:29:36 +0530
Subject: submit button removed
---
gstudio/methods.py | 3 +--
gstudio/static/gstudio/js/addcontent.js | 32 +++++++++++++++--------
gstudio/templates/gstudio/NewPage.html | 4 +--
gstudio/templates/gstudio/NewSection1.html | 2 +-
gstudio/templates/gstudio/skeleton.html | 2 +-
gstudio/templates/gstudio/tags/commentpage.html | 5 ++--
gstudio/templates/metadashboard/pgedashboard.html | 16 ++++++------
gstudio/views/page.py | 4 ++-
8 files changed, 40 insertions(+), 28 deletions(-)
(limited to 'gstudio')
diff --git a/gstudio/methods.py b/gstudio/methods.py
index 2b6e0ee..ad4bcee 100644
--- a/gstudio/methods.py
+++ b/gstudio/methods.py
@@ -319,8 +319,7 @@ def get_time(sys_id):
def del_comment(comment_id):
ob = Gbobject.objects.get(id=int(comment_id))
for each in ob.posterior_nodes.all():
- a= each.id
- del_comment(a)
+ del_comment(each.id)
ob.delete()
return True
diff --git a/gstudio/static/gstudio/js/addcontent.js b/gstudio/static/gstudio/js/addcontent.js
index 9581aeb..fe4f51c 100644
--- a/gstudio/static/gstudio/js/addcontent.js
+++ b/gstudio/static/gstudio/js/addcontent.js
@@ -19,6 +19,8 @@
var org_data = $("#gnoweditor").val();
document.getElementById("orgpage").value = org_data;
var encode_data = encodeURIComponent(org_data);
+ $('#submitsec').trigger('click');
+
});
$("#pagecontent1").one("click",function() {
@@ -26,10 +28,12 @@
document.getElementById('gnoweditor').style.visibility="visible";
$("#gnoweditor").orgitdown(mySettings);
});
- $("#save").one("click",function() {
- var org_data = $("#gnoweditor").val();
+ $("#save1").one("click",function() {
+ var org_data = $("#gnoweditor").val();
document.getElementById("orgpage1").value = org_data;
var encode_data = encodeURIComponent(org_data);
+ $('#submitpage').trigger('click');
+
});
$("#editseccontent").one("click",function(){
$("#chart").hide();
@@ -40,6 +44,9 @@
var screenTop = $(document).scrollTop();
$(".orgitdownContainer").css({
"margin-top":screenTop,});
+ $("#savesubsec").hide();
+ $("#savesubsec1").hide();
+ $("#savepagecontent").hide();
});
$("#saveseccontent").one("click",function(){
@@ -86,6 +93,9 @@
var screenTop = $(document).scrollTop();
$(".orgitdownContainer").css({
"margin-top":screenTop,});
+ $("#savesubsec").hide();
+ $("#saveseccontent").hide();
+ $("#savepagecontent").hide();
});
$("#savesubsec1").one("click",function(){
@@ -125,22 +135,19 @@
});
$("#editpagecontent").one("click",function(){
- //var abc = document.getElementById('pageid1').value;
- //window.location.replace('sectionadd1/'+abc);
- $("#chart").hide();
- // var orgdata = document.getElementById('orgcontent').value;
+ $("#chart").hide();
document.getElementById('gnoweditor').style.visibility="visible";
$("#gnoweditor").orgitdown(mySettings);
-
- // var org_data = $("#gnoweditor").val();
-
var a = document.getElementById('pageorg').value;
$("#gnoweditor").val(a);
var screenTop = $(document).scrollTop();
$(".orgitdownContainer").css({
"margin-top":screenTop,});
-
+ $("#saveseccontent").hide();
+ $("#savesubsec").hide();
+ $("#savesubsec1").hide();
+
});
$("#savepagecontent").one("click",function(){
@@ -189,12 +196,15 @@
var screenTop = $(document).scrollTop();
$(".orgitdownContainer").css({
"margin-top":screenTop,});
+ $("#savesubsec1").hide();
+ $("#saveseccontent").hide();
+ $("#savepagecontent").hide();
});
$("#savesubsec").one("click",function() {
var org_data = $("#gnoweditor").val();
document.getElementById("sectionreply").value = org_data;
var encode_data = encodeURIComponent(org_data);
- alert(org_data);});
+ $('#submitsubsec').trigger('click');});
$("#savecontent").one("click",function() {
var org_data = $("#gnoweditor").val();
diff --git a/gstudio/templates/gstudio/NewPage.html b/gstudio/templates/gstudio/NewPage.html
index 541554b..ac87a10 100644
--- a/gstudio/templates/gstudio/NewPage.html
+++ b/gstudio/templates/gstudio/NewPage.html
@@ -17,10 +17,10 @@
-
+
-
+
{%else%}
Sorry! Login To proceed
diff --git a/gstudio/templates/gstudio/NewSection1.html b/gstudio/templates/gstudio/NewSection1.html
index 75db8a2..01cd3d9 100644
--- a/gstudio/templates/gstudio/NewSection1.html
+++ b/gstudio/templates/gstudio/NewSection1.html
@@ -20,7 +20,7 @@
-
+
{% endblock %}
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index e5086d6..3e0de7f 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -101,7 +101,7 @@
}
.orgitdownContainer {
border:1px solid #3C769D;
- background:#FFF url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-container.png) repeat-x top left;
+
padding:5px 5px 2px 5px;
font:11px Verdana, Arial, Helvetica, sans-serif;
margin-left:640px;
diff --git a/gstudio/templates/gstudio/tags/commentpage.html b/gstudio/templates/gstudio/tags/commentpage.html
index a998a7f..1b5a0ca 100644
--- a/gstudio/templates/gstudio/tags/commentpage.html
+++ b/gstudio/templates/gstudio/tags/commentpage.html
@@ -20,8 +20,9 @@
-
-
+
+
+
diff --git a/gstudio/templates/metadashboard/pgedashboard.html b/gstudio/templates/metadashboard/pgedashboard.html
index 2c24cc6..c46cc07 100644
--- a/gstudio/templates/metadashboard/pgedashboard.html
+++ b/gstudio/templates/metadashboard/pgedashboard.html
@@ -38,7 +38,7 @@ $(window).load(function() {
{% endwith %}
-
+
@@ -72,13 +72,12 @@ $(window).load(function() {
{% autoescape off %}
{% for each in section %}
- {{each.title}}
+ {{each.title}}
Posted on : {{each.creation_date}}
by {% for author in each.authors.all %}
{{author}}
{% endfor %}
-
- {% ifequal each.rating.get_rating 0 %}
+ {% ifequal each.rating.get_rating 0 %}
Not yet rated
{% else %}
Current rating is {{ each.rating.get_rating }}
@@ -92,15 +91,16 @@ $(window).load(function() {
-