diff options
author | gnowgi <nagarjun@gnowledge.org> | 2012-08-09 07:56:10 -0700 |
---|---|---|
committer | gnowgi <nagarjun@gnowledge.org> | 2012-08-09 07:56:10 -0700 |
commit | 1b253158044231e206429779758c30067803b17e (patch) | |
tree | d49de61f85ce1c6bc68c5b851d9a2754b653e4a3 /gstudio | |
parent | 1a2ce999facc219c6fe3d2a64e8a39ff09ec9e01 (diff) | |
parent | b1f71c5439e3bdf7a3c0fb2c1730d6242c6356d9 (diff) | |
download | gnowsys-1b253158044231e206429779758c30067803b17e.tar.gz |
Merge pull request #79 from anujag/master
loom studio basics added
Diffstat (limited to 'gstudio')
-rw-r--r-- | gstudio/methods.py | 46 | ||||
-rw-r--r-- | gstudio/static/gstudio/js/replycomment.js | 32 | ||||
-rw-r--r-- | gstudio/static/gstudio/js/replytotopic.js | 30 | ||||
-rw-r--r-- | gstudio/static/gstudio/js/topiccomment.js | 17 | ||||
-rw-r--r-- | gstudio/templates/gstudio/NewTopic1.html | 24 | ||||
-rw-r--r-- | gstudio/templates/gstudio/_header.html | 2 | ||||
-rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 10 | ||||
-rw-r--r-- | gstudio/templates/gstudio/tags/comment.html | 204 | ||||
-rw-r--r-- | gstudio/templates/metadashboard/grpdashboard.html | 62 | ||||
-rw-r--r-- | gstudio/templates/metadashboard/userdashboard.html | 10 | ||||
-rw-r--r-- | gstudio/views/group.py | 3 |
11 files changed, 357 insertions, 83 deletions
diff --git a/gstudio/methods.py b/gstudio/methods.py index 70407168..2b6e0ee4 100644 --- a/gstudio/methods.py +++ b/gstudio/methods.py @@ -13,10 +13,28 @@ def delete(idnum): def make_rep_object(title,auth_id): new_ob = Gbobject() - new_ob.title = title + new_ob.content_org=title + myfile = open('/tmp/file.org', 'w') + myfile.write(new_ob.content_org) + myfile.close() + myfile = open('/tmp/file.org', 'r') + myfile.readline() + myfile = open('/tmp/file.org', 'a') + myfile.write("\n#+OPTIONS: timestamp:nil author:nil creator:nil H:3 num:nil toc:nil @:t ::t |:t ^:t -:t f:t *:t <:t") + myfile.write("\n#+TITLE: ") + myfile = open('/tmp/file.org', 'r') + stdout = os.popen(PYSCRIPT_URL_GSTUDIO) + output = stdout.read() + data = open("/tmp/file.html") + data1 = data.readlines() + data2 = data1[67:] + newdata="" + for line in data2: + newdata += line.lstrip() + new_ob.content = newdata + new_ob.title = "Re: " +title new_ob.status = 2 new_ob.slug = slugify(title) - new_ob.content = "" new_ob.save() new_ob.objecttypes.add(Objecttype.objects.get(title="Reply")) new_ob.authors.add(Author.objects.get(id=auth_id)) @@ -24,11 +42,31 @@ def make_rep_object(title,auth_id): return new_ob def make_topic_object(title,auth_id,content): + print "save" new_ob = Gbobject() - new_ob.title = title + new_ob.title = "Query: " + title + new_ob.content_org = content + myfile = open('/tmp/file.org', 'w') + myfile.write(new_ob.content_org) + myfile.close() + myfile = open('/tmp/file.org', 'r') + myfile.readline() + myfile = open('/tmp/file.org', 'a') + myfile.write("\n#+OPTIONS: timestamp:nil author:nil creator:nil H:3 num:nil toc:nil @:t ::t |:t ^:t -:t f:t *:t <:t") + myfile.write("\n#+TITLE: ") + myfile = open('/tmp/file.org', 'r') + stdout = os.popen(PYSCRIPT_URL_GSTUDIO) + output = stdout.read() + data = open("/tmp/file.html") + data1 = data.readlines() + data2 = data1[67:] + newdata="" + for line in data2: + newdata += line.lstrip() + new_ob.content = newdata new_ob.status = 2 new_ob.slug = slugify(title) - new_ob.content = content + new_ob.save() new_ob.objecttypes.add(Objecttype.objects.get(title="Topic")) new_ob.authors.add(Author.objects.get(id=auth_id)) diff --git a/gstudio/static/gstudio/js/replycomment.js b/gstudio/static/gstudio/js/replycomment.js new file mode 100644 index 00000000..8e33eba4 --- /dev/null +++ b/gstudio/static/gstudio/js/replycomment.js @@ -0,0 +1,32 @@ +$.noConflict(); +jQuery(document).ready(function($) { + $(".commenteditor").one("click",function() { + $("#chart").hide(); + $("#content").css({"width": "300px",}) + document.getElementById('gnoweditor').style.visibility="visible"; + $("#gnoweditor").orgitdown(mySettings); + var screentop=$(document).scrollTop(); + $(".orgitdownContainer").css({"margin-top":screentop,}); + }); + + $(".commentsavecontent").one("click",function(){ + var org_data = $("#gnoweditor").val(); + + +// document.getElementByClass("commentreptext").setAttribute("value",org_data); + var elmts = document.getElementsByClassName ("commentreptext"); + for (var i = 0; i < elmts.length; i++) { + elmts[i].setAttribute("value",org_data); + } + alert(org_data); + + }); + $(".deleteresponse").one("click",function() { + var elmts=document.getElementsByClassName("deleteresponse"); + alert("hai"); + alert(elmts.length); + + + + }); +}); diff --git a/gstudio/static/gstudio/js/replytotopic.js b/gstudio/static/gstudio/js/replytotopic.js new file mode 100644 index 00000000..7f14b31d --- /dev/null +++ b/gstudio/static/gstudio/js/replytotopic.js @@ -0,0 +1,30 @@ + $.noConflict(); + jQuery(document).ready(function($) { + $(".editor").one("click",function() { + $("#chart").hide(); + $("#content").css({"width": "300px",}) + document.getElementById('gnoweditor').style.visibility="visible"; + $("#gnoweditor").orgitdown(mySettings); + var screentop=$(document).scrollTop(); + $(".orgitdownContainer").css({"margin-top":screentop,}); + + }); + + + $(".savecontent").one("click",function() { + alert("Please click on Submit"); + var org_data = $("#gnoweditor").val(); + + // alert(org_data); + // document.getElementsByClassName("reptext").value = org_data; + + var elmts = document.getElementsByClassName ("reptext"); + for (var i = 0; i < elmts.length; i++) { + elmts[i].setAttribute("value",org_data); + } + + }); + + + + }); diff --git a/gstudio/static/gstudio/js/topiccomment.js b/gstudio/static/gstudio/js/topiccomment.js new file mode 100644 index 00000000..611b9d1a --- /dev/null +++ b/gstudio/static/gstudio/js/topiccomment.js @@ -0,0 +1,17 @@ + $.noConflict(); + jQuery(document).ready(function($) { + $("#topicaddcontent").one("click",function() { + $("#chart").hide(); + $("#content").css({"width": "300px",}) + document.getElementById('gnoweditor').style.visibility="visible"; + $("#gnoweditor").orgitdown(mySettings); + var screentop=$(document).scrollTop(); + $(".orgitdownContainer").css({"margin-top":screentop,}); + }); + + $("#topicaddsave").one("click",function(){ + var org_data = $("#gnoweditor").val(); + $("#contenttext").val(org_data); + $('#topicsubmit').trigger('click'); + }); + }); diff --git a/gstudio/templates/gstudio/NewTopic1.html b/gstudio/templates/gstudio/NewTopic1.html index 38a61c5b..5f2db824 100644 --- a/gstudio/templates/gstudio/NewTopic1.html +++ b/gstudio/templates/gstudio/NewTopic1.html @@ -1,7 +1,20 @@ {% extends "gstudio/base.html" %} {% block content %} -<h1>Add a new Topic</h1> +<script src="http://code.jquery.com/jquery-latest.js"></script> + <script type="text/javascript" > + $(window).load(function() { + $("#content").css({ + "width": "1000px",});}); +$(window).load(function() { + $("#chart").hide();}); +$(window).load(function() { + + $("#graphcss").hide(); + }); +</script> + +<h1>Add a new Twist</h1> {% if errors %} <ul> {% for error in errors %} @@ -12,9 +25,14 @@ <form action="" method="post">{% csrf_token %} <p>Title: <input type="text" name="subject"></p> -<p>Description: <textarea name="message" rows="10" cols="50"></textarea></p> +<p>Description: <textarea name="message" id="contenttext" rows="10" cols="50" style="display:none" ></textarea></p> +<!-- style="display:none;" --> + +<input type="button" id="topicaddcontent" name="content" value="Add Description"> +<input type="button" id="topicaddsave" name="savecontent" value="Save"> + <input type="hidden" value={{user.id}} name = "idusr"> -<input type="submit" value="Submit"> +<input type="submit" id="topicsubmit" value="Submit" style="display:none"> </form> {% endblock %} diff --git a/gstudio/templates/gstudio/_header.html b/gstudio/templates/gstudio/_header.html index 4b2b0753..1a5de328 100644 --- a/gstudio/templates/gstudio/_header.html +++ b/gstudio/templates/gstudio/_header.html @@ -15,7 +15,7 @@ {% if user.is_authenticated %} {% if user.is_staff %} - | <a href="{{ get_absolute_url }}/gstudio/user/{{user.username}}" title="MyBoard">Gnowledge Studio</a> + | <a href="{{ get_absolute_url }}/gstudio/user/{{user.username}}" title="My Loom Studio">Loom Studio</a> | <a href="{{ get_absolute_url }}/gstudio/resources/documents" title="My Documents">Documents</a> | <a href="{{ get_absolute_url }}/gstudio/user/wikipage/{{user.username}}" title="MyWiki">Wikipage</a> | <a href="{{ get_absolute_url }}/gstudio/resources/images" title="Images">Images</a> diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 9ce61885..e5086d63 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -283,6 +283,16 @@ <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script> <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/replytotopic.js"></script> + + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/replycomment.js"></script> + <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script> + + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script> + + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/topiccomment.js"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/savedata.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> diff --git a/gstudio/templates/gstudio/tags/comment.html b/gstudio/templates/gstudio/tags/comment.html index cf446fe0..8e1d4806 100644 --- a/gstudio/templates/gstudio/tags/comment.html +++ b/gstudio/templates/gstudio/tags/comment.html @@ -15,54 +15,166 @@ <!-- Flag1 outside {{flag}}--> {% for each in child.authors.all %} {% ifequal idusr admin_id %} - <li>{{each}} says <font style = "color:red;" size = 3>{{child.title}}</font> - <form method="post" action=".">{% csrf_token %} - <input type="text" name = "reply"> - <input type="hidden" value={{child.id}} name = "parentid"> - <input type="hidden" value={{idusr}} name="idusr"> - <input type="submit" value="Post a Reply"> - <input type="checkbox" name="del_comment" value="delete_comment"> - <input type="submit" value="delete this comment"> - </form> - {% show_comment child idusr flag admin_id attribute%} - </li> - {% else %} - {% ifequal idusr each.id %} - <li>{{each}} says <font style = "color:red;" size = 3>{{child.title}}</font> - <form method="post" action=".">{% csrf_token %} - <input type="text" name = "reply"> - <input type="hidden" value={{child.id}} name = "parentid"> - <input type="hidden" value={{idusr}} name="idusr"> - <input type="submit" value="Post a Reply"> - <input type="checkbox" name="del_comment" value="delete_comment"> - <input type="submit" value="delete this comment"> - </form> - {% show_comment child idusr flag admin_id attribute%} - </li> - {% else %} - {% ifequal attribute "true" %} - - <li>{{each}} says <font style = "color:red;" size = 3>{{child.title}}</font> - <form method="post" action=".">{% csrf_token %} - <input type="text" name = "reply"> - <input type="hidden" value={{child.id}} name = "parentid"> - <input type="hidden" value={{idusr}} name="idusr"> - <input type="submit" value="Post a Reply"> - <input type="checkbox" name="del_comment" value="delete_comment"> - <input type="submit" value="delete this comment"> - </form> - {% show_comment child idusr flag admin_id attribute%} - </li> - {% endifequal %} - {% endifequal %} - {% endifequal %} - {% endfor %} - - -{% endfor %} -</ul> +<!-- If user is admin --> +<div class="response_change" id="divchange"> +<script type="text/javascript"> +i = i+1; +if (i%2 == 0) +{ +document.getElementById("divchange").setAttribute("id","div1"); +} +else +{ +document.getElementById("divchange").setAttribute("id","div2"); +} +</script> + + + <li>{{each}}'s fabric +{% if child.rating.get_rating %} +Current rating is {{ child.rating.get_rating }}<br/> {% endif %} +<font style = "color:red;" size = 3>{{child.content}}</font> + <form method="post" action=".">{% csrf_token %} + <input type="text" class="commentreptext"id="{{child.id}}" name = "reply" style="visibility:hidden"> + <input type="hidden" value={{child.id}} name = "parentid"> + <input type="hidden" value={{idusr}} name="idusr"> + <!-- <input type="hidden" value="{{child.id}}" name = "iden"> --> + <!-- <input type="text" id="commentreptext" name = "reply" style="visibility:hidden"> --> + + + <br/><br/><br/><br/> + + <input type="button" class="commenteditor" id="{{ child.id }}" value="Reply"> + <input type="button" class="commentsavecontent" id="{{child.id}}" value="Save"> + <input type="submit" id="postreply" value="Post a Reply"> + <input type="checkbox" id="chk" name="del_comment" value="delete_comment"> + <input type="submit" value="delete" onclick="setcheck()"> +<br/> + Do you wanna rate it ? </br> + <input name="star1" type="radio" value=1 class="star"/> + <input name="star1" type="radio" value=2 class="star"/> + <input name="star1" type="radio" value=3 class="star"/> + <input name="star1" type="radio" value=4 class="star"/> + <input name="star1" type="radio" value=5 class="star"/> + <!--topic id and user id hidden fields--> + </br> + <input type="submit" value="Rate Response"> + </form> +</div> + + + {% show_comment child idusr flag admin_id attribute%} + + + {% else %} + {% ifequal idusr each.id %} + +<div class="response_change" id="divchange"> +<script type="text/javascript"> +i = i+1; +if (i%2 == 0) +{ +document.getElementById("divchange").setAttribute("id","div1"); +} +else +{ +document.getElementById("divchange").setAttribute("id","div2"); +} +</script> +{{each}}'s Response <br/> +{% if child.rating.get_rating %} +Current rating is {{ child.rating.get_rating }}<br/> +{% endif %} + <font style = "color:red;" size ="3"></font>{{child.content}} + <form method="post" action="">{% csrf_token %} + <input type="text" class="commentreptext" id="{{child.id}}" name="reply" style="visibility:hidden"> + <input type="hidden" class="parent" value="{{child.id}}" name="parentid"> + <input type="hidden" value="{{idusr}}" name="idusr"> +<!-- <input type="hidden" value="{{child.id}}" name="iden"> --> + <!-- <input type="text" id="commentreptext" name = "reply" style="visibility:hidden"> --> + <br/><br/><br/><br/> + + <input type="button" class="commenteditor" id="{{ child.id }}" value="Reply"> + <input type="button" class="commentsavecontent" id="{{child.id}}" value="Save"> + <input type="submit" class="postreply" value="Post a Reply"> + <input type="checkbox" class="chk" name="del_comment" value="delete_comment"> + <input type="button" class="deleteresponse" value="delete" style="display:none"> + <input type="submit" class="deleteresp" value="delete"> + + +<br/> + Do you wanna rate it ? </br> + <input name="star1" type="radio" value=1 class="star"/> +<input name="star1" type="radio" value=2 class="star"/> + <input name="star1" type="radio" value=3 class="star"/> + <input name="star1" type="radio" value=4 class="star"/> + <input name="star1" type="radio" value=5 class="star"/> + <!--topic id and user id hidden fields--> + </br> + <input type="submit" value="Rate Response"> + + </form> +</div> + {% show_comment child idusr flag admin_id attribute%} + + + {% else %} + {% ifequal attribute "true" %} + +<div class="response_change" id="divchange"> +<script type="text/javascript"> +i = i+1; +if (i%2 == 0) +{ +document.getElementById("divchange").setAttribute("id","div1"); +} +else +{ +document.getElementById("divchange").setAttribute("id","div2"); +} +</script> + {{each}}'s Response <br/> +{% if child.rating.get_rating %} +Current rating is {{ child.rating.get_rating }}<br/> +{% endif %} + <font style = "color:red;" size = 3></font>{{child.content}} + + <form method="post" action=".">{% csrf_token %} + <input type="text" class="commentreptext"id="{{child.id}}" name = "reply" style="visibility:hidden"> + <input type="hidden" value="{{child.id}}" name = "parentid"> + <input type="hidden" value="{{idusr}}" name="idusr"> + <input type="hidden" value="{{child.id}}" name = "iden"> + <!-- <input type="text" id="commentreptext" name = "reply" style="visibility:hidden"> --> +<br/><br/><br/><br/> + + <input type="button" class="commenteditor" id="{{ child.id }}" value="Reply"> + <input type="button" class="commentsavecontent" id="{{child.id}}" value="Save"> + <input type="submit" id="postreply" value="Post a Reply" style="display:none"> + <input type="checkbox" id="chk" name="del_comment" value="delete_comment"> + <input type="submit" value="delete this comment""> <br/> + Rate this response </br> + <input name="star1" type="radio" value=1 class="star"/> + <input name="star1" type="radio" value=2 class="star"/> + <input name="star1" type="radio" value=3 class="star"/> + <input name="star1" type="radio" value=4 class="star"/> + <input name="star1" type="radio" value=5 class="star"/> + <!--topic id and user id hidden fields--> + </br> + <input type="submit" value="Rate Response"> + + </form> + +</div> + + {% show_comment child idusr flag admin_id attribute%} {% endifequal %} + {% endifequal %} + {% endifequal %} + {% endfor %} + {% endfor %} +</ul> +{% endif %} diff --git a/gstudio/templates/metadashboard/grpdashboard.html b/gstudio/templates/metadashboard/grpdashboard.html index e92f616c..f6cb6c09 100644 --- a/gstudio/templates/metadashboard/grpdashboard.html +++ b/gstudio/templates/metadashboard/grpdashboard.html @@ -14,14 +14,25 @@ $(window).load(function() { $("#graphcss").hide(); }); +var i=0; </script> +<style type="text/css"> +#div2 +{ + background-color:#E8E8E8 ; +} +#div1 +{ + background-color:#F4F4F4; +} +</style> {% if user.is_authenticated %} - <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/{{user.username}}');"> - <h>Hello Welcome to the {{ meet_ob.title }}</h></br> - <h3> This Discussion was initiated by {{admin_m.username}}</h3> +<!-- <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/{{user.username}}');"> + <h>Hello Welcome to the {{ meet_ob.title }}</h></br> --> + <h3> {{admin_m.username}}'s initial twist to the thread</h3> - <h>You are logged in as <font color="blue">{{user.username}}</font></h> + <!-- <h>You are logged in as <font color="blue">{{user.username}}</font></h> --> </br> {%if flag %} <div id="Release"> @@ -42,55 +53,60 @@ $(window).load(function() { <form method="post" action=".">{% csrf_token %} <!-- <input type="hidden" value="{{meet_ob.id}}" name = "meetid">--> - <input type="button" value="Add a new Topic" onClick="location.href=parseURL('topicadd1/{{meet_ob.id}}');"> + <input type="button" value="Add your twist" onClick="location.href=parseURL('topicadd1/{{meet_ob.id}}');"> </form> - -<!--direct link to identica--> +<!-- direct link to identica <a href="http://www.addtoany.com/add_to/identi_ca?linkurl=ur url&linkname={{post}} via" ><img src="http://www.tildehash.com/identishare/share.png" ></img></a> -<!-- Twitter syndicating button --> +<!-- Twitter syndicating button <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://127.0.0.1:8000/chat/" data-via="{{user.title}}" data-lang="en" data-text="{{post}}" data-related="anywhereTheJavascriptAPI" data-count="none">Tweet</a> -<!-- Diaspora syndicating button --> +<!-- Diaspora syndicating button <script type="text/javascript" src="https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael-min.js"></script> <input id="diasporacontent" value="{{post}}" type="hidden" name="diaspora"></input> <div id="R-button" style="width:44px;height:44px;cursor:pointer;"> <img id="asterisk" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAYAAACN1PRVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQ1JREFUeNpi/P//PwO9ACMJajuA2BiL+FkgriDGABYSLANZ5EKJz5gY6AhGLaO6ZaAEoERl85WQUzCyZeVAfBeIz0DZShRYUA41B2ReGjZF/7FgZIt341CzG80CdPl36BaF4jCIWjgUORhdaJw2UMx/R2OfgYOSGYgFgfgoED8HYikon1rgHhDPAuJOIH6PqwzEFdnEYFiiMiYnGc8k0pIOSkNFiYT4fEepZbtJDMJV5FpUTmaclZNqkTER8YMvOIlOHIIEUmIHET4/Q0pb4z+echAZrCLCUXiLFVJSmyC0ZMelh2AxGIojubuQEL/vYIUvsflrNwkprBxLlUNW8ic276wi5ChGeraIAQIMAFUG5PAQfeaJAAAAAElFTkSuQmCC" width="26" height="26"> </div> - +--> </br> {% autoescape off %} {% for each in topic %} <h4><font size="5" color="red">{{each.title}}</font></h4> Posted on : {{each.creation_date}} - Posted by : + by : {% for author in each.authors.all %} {{author}} {% endfor %}</br> - Current rating is <h5>{{ each.rating.get_rating }}</h5> + <!-- Current rating is <h5>{{ each.rating.get_rating }}</h5> --> {%autoescape on%} - <font color="green">{{each.content}}</font> + {% with each.html_content|safe as each_content %} + <font color="green"> {{each_content}} </font> + {% endwith %} {% endautoescape%} <form method="post" action=".">{% csrf_token %} - Reply to the main thread : - <input type="text" name = "reply"> + + <input type="text" class="reptext" name = "reply" style="display:none"> <input type="hidden" value="{{each.id}}" name = "iden"> <input type="hidden" value="{{user.id}}" name = "idusr"> - <input type="submit" value="Reply to Topic"></br> - <!--<input name="del_topic" type="checkbox" value="delete_topic"/>Delete topic - <input type="submit" value="Delete the topic"></br> ---> - Do you wanna rate it ? </br> +<br/><br/><br/> + <input type="button" class="editor" id="{{each.id}}" value="Add a Fiber"> + <input type="button" class="savecontent" id="{{each.id}}" value="Save"> + + <input type="submit" value="Submit"></br> + <input name="del_topic" type="checkbox" value="delete_topic"/> + <input type="submit" value="Delete the twist"></br> + + <!-- Rate this ? </br> <input name="star1" type="radio" value=1 class="star"/> <input name="star1" type="radio" value=2 class="star"/> <input name="star1" type="radio" value=3 class="star"/> <input name="star1" type="radio" value=4 class="star"/> <input name="star1" type="radio" value=5 class="star"/> - <!--topic id and user id hidden fields--> + <!--topic id and user id hidden fields </br> - <input type="submit" value="Rate it!!!"> + <input type="submit" value="Rate it!!!"> --> </form> <p> - Replies : + Fibers : <!-- <div id="main"> <div id="sidetree"> <div class="treeheader"> </div> diff --git a/gstudio/templates/metadashboard/userdashboard.html b/gstudio/templates/metadashboard/userdashboard.html index e02f4ba1..a8342b1f 100644 --- a/gstudio/templates/metadashboard/userdashboard.html +++ b/gstudio/templates/metadashboard/userdashboard.html @@ -5,20 +5,20 @@ {% if user.is_authenticated %} - <h> Welcome to the GnowledgeStudio</h></br> +<!-- <h> Welcome to the GnowledgeStudio</h></br> <h>You are logged in as <font color="blue">{{user.username}}</font></h> - <p></br> -<p> Here is a list of all the groups:</p> + <p></br> --> +<p> On the loom now:</p> </br> {% for each in meetings.member_systems.all %} <a href="/gstudio/group/gnowsys-grp/{{each.id}}/">{{each.title}}</a></br> {% endfor %} - <input type="button" value="Create a new meeting" onClick="location.href=parseURL('groupadd/');"> + <input type="button" value="Want to weave a thread?" onClick="location.href=parseURL('groupadd/');"> </p> <p> </br> {% else %} - <h1> <p style = "color :black;">OOPS!!! Login Please!</p></h1> + <h1> <p style = "color :black;">Please Login</p></h1> {% endif %} diff --git a/gstudio/views/group.py b/gstudio/views/group.py index 157e276b..d38b5aef 100644 --- a/gstudio/views/group.py +++ b/gstudio/views/group.py @@ -54,7 +54,8 @@ def groupdashboard(request,grpid): rep = request.POST.get("reply",'') id_no = request.POST.get("iden",'') id_no1 = request.POST.get("parentid","") - idusr = request.POST.get("idusr",'') + print "topicid",id_no,"replyid",id_no1,"reply",rep + idusr = request.POST.get("idusr",'') rating = request.POST.get("star1","") flag1=request.POST.get("release","") block = request.POST.get("block","") |