Updated code with recent changes

14 files changed, 614 insertions, 105 deletions

diff --git a/gstudio/templates/gstudio/_header.html b/gstudio/templates/gstudio/_header.html
index 123b05d..6523fcf 100644
--- a/gstudio/templates/gstudio/_header.html
+++ b/gstudio/templates/gstudio/_header.html
@@ -18,8 +18,10 @@
 	| <a href="{{  get_absolute_url }}/gstudio/resources/documents" title="My Documents">Documents</a>
         | <a href="{{  get_absolute_url }}/gstudio/resources/images" title="Images">Images</a>
         | <a href="{{  get_absolute_url }}/gstudio/resources/videos" title="My Videos">Videos</a>
+<!--
         | <a href="{{  get_absolute_url }}/nodetypes" title="Nodes">Node Types</a>
         | <a href="{{  get_absolute_url }}/objects" title="Objects">Node Objects</a>
+-->
    {% if user.is_authenticated %}
 	{% if user.is_staff %}
  
diff --git a/gstudio/templates/gstudio/addingtag.html b/gstudio/templates/gstudio/addingtag.html
new file mode 100644
index 0000000..2e50501
--- /dev/null
+++ b/gstudio/templates/gstudio/addingtag.html
@@ -0,0 +1,82 @@
+{% load gstudio_tags %}
+{% load tagging_tags comments i18n %}
+
+<script type="text/javascript" >
+var availableTags = [];
+$.merge(availableTags, {% get_add_tag %})
+
+
+jQuery(document).ready(function($) { 
+$(".tag{{objectid}}").click(function(){
+data = $("#tags{{objectid}}").attr('value');
+$.ajax({
+url: '/gstudio/resources/images/addtag/',
+//type: 'POST',
+data: {objectid:{{objectid}},data:data},
+success: function(data){
+$('.tags{{objectid}}').html(data);
+
+}
+});  
+$("#tags{{objectid}}").val("");
+});
+
+/*$(".deletetags").click(function(){
+tagname = $(this).attr('value');
+
+$.ajax({
+url: '/gstudio/resources/images/deletetag/',
+//type: 'POST',
+data: {objectid:{{objectid}},data:tagname},
+success: function(data){
+$('.tags{{objectid}}').html(data);
+}
+});  
+
+});*/
+});
+function tagfunction(arr,id){
+tagname = arr;
+$.ajax({
+url: '/gstudio/resources/images/deletetag/',
+//type: 'POST',
+data: {objectid:id,data:tagname},
+success: function(data){
+$('.tags'+id).html(data);
+}
+});  
+
+}
+</script>	
+
+<div class="tags{{objectid}}">
+       	 <!-- <p class="gbobject-tags span-16 last"> -->
+       	   <strong>{% trans "Tags" %}</strong> :
+       	   {% tags_for_object viewtag as tag_list %}
+       	   {% for tag in tag_list %}
+       	   <a href="{% url objectapp_tag_detail tag %}"
+              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
+{% if user.is_authenticated %}
+	   <a class="deletetags" value="{{tag}}" title="delete {{tag}}" onclick='tagfunction("{{tag}}","{{objectid}}");' ><img src="/static/gstudio/js/orgitdown/orgitdown/sets/org/images/close.jpeg" width = 8px; style="vertical-align: super;"/></a>
+{% endif %}
+   	   {% if not forloop.last %},{% endif %}
+       	   {% empty %}
+       	   <span>{% trans "No tags" %}</span>
+       	   {% endfor %}
+<!--       	 </p> -->
+       </div>
+	{% if user.is_authenticated %}
+	<script type="text/javascript" >
+	$(document).ready(function(){
+        $( "#tags{{objectid}}" ).autocomplete({
+            source: availableTags
+        });
+ 	});
+	</script>
+{% csrf_token %}
+       	 <input type="hidden" name="docid" value={{objectid}}>
+       	<!-- <input type="text" class="tagtext" value="" name="texttags"  />-->
+	<input id="tags{{objectid}}"  class="tagtext" name="texttags">
+       	 <input type="button" class="tag{{objectid}}" value="Add Tags" name="addtags" />
+	 <br>
+	{% endif %}
diff --git a/gstudio/templates/gstudio/addreln.html b/gstudio/templates/gstudio/addreln.html
new file mode 100644
index 0000000..b484b8b
--- /dev/null
+++ b/gstudio/templates/gstudio/addreln.html
@@ -0,0 +1,76 @@
+{% load gstudio_tags %}
+<script type="text/javascript">
+var availableobjs = [];
+$.merge(availableobjs, {% get_available_objects %})
+var availablerts=[]
+$.merge(availablerts, {% get_available_rts %})
+$(document).ready(function(){
+        $("#res_relation").autocomplete({
+            source: availablerts
+        });
+        $("#res_object").autocomplete({
+            source: availableobjs
+        });
+$("#addreln").click(function(){
+alert("Please wait till the relation is shown in the existing relations...");
+var ajurl ="/gstudio/resources/addreln/thread/"+{{meetingob.id}}
+
+var res_reln = $("#res_relation").val()
+var res_obj= $("#res_object").val()
+if (res_reln == "" || res_obj == "" )
+{  alert("Please select relation and right object");
+}
+else
+{
+$.ajax({
+       url: ajurl,
+       data: {relnobj:res_reln,obobject:res_obj},
+       success: function(data){
+
+                $('#res_relation').val("");
+                $('#res_object').val("");
+                alert("Added relation");
+	        $('#relndiv').html(data);
+
+			   }
+});
+}
+});
+});
+function target_popup(form) {
+    window.open('', 'formpopup', 'left=360,width=500,height=300,resizeable,scro\
+llbars');
+    form.target = 'formpopup';
+
+
+           }
+
+</script>
+<div id="relndiv">
+<br/>
+
+<b>Existing Relations for this page: </b>
+        {% if not meetingob.get_relations_for_view.items %}
+            No relations
+        {% endif %}
+        {% for key,value in meetingob.get_relations_for_view.items %}
+        {{key}} -
+        {% for rel in value %}
+        {{rel}};
+        {% endfor %}
+        {% endfor %}
+
+</div>
+<form method="post" action=""> {% csrf_token %}
+Select/Add a Relationtype: <nbsp>
+<input value="" name="textreln" id="res_relation">
+<!--
+<a href="/admin/gstudio/relationtype/add" class="add-another" id="add_id_{{ field }}" onclick="return showAddAnotherPopup(this);">
+-->
+<a href="/gstudio/resources/addreln/form/{{meetingob.id}}" class="add-another" id="addrel" onclick="target_popup(this)">
+<img width="10" height="10" alt="Add Another" src="/static/grappelli/img/admin/icon_addlink.gif">
+</a>
+Select an object: <nbsp>
+<input value="" name="textobj" id="res_object">
+<input type="button" id="addreln" name="" value="Add Relation">
+</form>
diff --git a/gstudio/templates/gstudio/addrelnform.html b/gstudio/templates/gstudio/addrelnform.html
new file mode 100644
index 0000000..113a450
--- /dev/null
+++ b/gstudio/templates/gstudio/addrelnform.html
@@ -0,0 +1,51 @@
+{% load gstudio_tags %}
+{% load adminmedia grp_tags %}
+<script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript">
+
+</script>
+<script>
+function close_window()
+{ window.close()
+}
+
+
+function saverelnform()
+{
+var reln=$("#res_relation").val();
+var obj=$("#res_object").val();
+var slug=$("#res_slug").val();
+
+$.ajax({
+       method:'POST',
+       url: '/gstudio/resources/addreln/form/{{meetob}}',
+       data: {reln:reln,obj:obj,slug:slug},
+       success: function(){
+             window.close()
+       }
+     });
+}
+
+</script>
+<html> <body bgcolor="#E6E6FA">
+<form method="post" name="addrelnfrm" action="."> {% csrf_token %}
+<h1>Add Relation(link) name</h1>
+<h2>Title: &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp
+<input value="" name="reln" id="res_relation">
+<br/></h2>
+<h2>Inverse Name:  &nbsp
+<input value="" name="obj" id="res_object">
+<br/></h2>
+<h2>Slug:  &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp
+<input value="" name="slug" id="res_slug">
+<br/></h2>
+<br/> &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp  &nbsp &nbsp &nbsp &nbsp &nbsp  &nbsp &nbsp &nbsp
+<!--                                                                            
+<input type="submit" id="addsavereln" name="" value="Save" ><nbsp>              
+-->
+&nbsp &nbsp &nbsp  &nbsp
+<input type="button" id="addrel" value="Save" onclick="saverelnform()">
+
+<input type="submit" id="addcancelreln" name="" value="Cancel" onclick="close_window()">
+</form>
+</body>
+</html>
diff --git a/gstudio/templates/gstudio/addrelnform_refresh.html b/gstudio/templates/gstudio/addrelnform_refresh.html
new file mode 100644
index 0000000..f959235
--- /dev/null
+++ b/gstudio/templates/gstudio/addrelnform_refresh.html
@@ -0,0 +1,15 @@
+{% load gstudio_tags %}
+
+<div id="relndiv">
+<br/>
+<b>Existing Relations for this page: </b>
+        {% if not meetobj.get_relations_for_view.items %}
+            No relations
+        {% endif %}
+        {% for key,value in meetobj.get_relations_for_view.items %}
+        {{key}} -
+        {% for rel in value %}
+        {{rel}};
+        {% endfor %}
+        {% endfor %}
+</div>
diff --git a/gstudio/templates/gstudio/edittitle.html b/gstudio/templates/gstudio/edittitle.html
new file mode 100644
index 0000000..b8207e9
--- /dev/null
+++ b/gstudio/templates/gstudio/edittitle.html
@@ -0,0 +1,37 @@
+<script type="text/javascript" >
+jQuery(document).ready(function($) { 
+$("#titleeditcontent").click(function(){
+document.getElementById('texttagtitle').style.visibility="visible";
+$("#texttagtitle").val($("#titleeditortext").val());
+document.getElementById('titlesave').style.visibility="visible";
+$("#titleeditcontent").hide();
+});
+$("#titlesave").click(function(){
+var org_data = $("#texttagtitle").val();       
+var encode_data = encodeURIComponent(org_data);
+var decode_data = decodeURIComponent(encode_data.replace(/\+/g, " "));
+$("#titlecommenttext").val(decode_data);	 
+
+$.ajax({
+url: '/gstudio/resources/images/edittitle/',
+<!-- type:"POST", -->
+data: {title:decode_data,titleid:{{objectid}}},
+success: function(){
+document.location.reload(true)
+}
+});  
+
+});
+});
+</script>
+
+
+<!-- <form method="get" action=""> -->{% csrf_token %}
+<input type="hidden" name="imgid" value={{objectid}}>
+<input type="button" id="titleeditcontent" name="" value="Edit title"/>
+<input type="text" value="" name="texttags" id="texttagtitle" style="visibility:hidden" /> 
+<input type="button" class="titlecommentsavecontent" id="titlesave" value="Save" style="visibility:hidden" />
+<input type="hidden" name="titlecontenttext" id="titlecommenttext" style="visibility:hidden" />
+<input type="hidden" id="titleeditortext" style="visibility:hidden" value="{{ objecttitle }}">
+<!-- </form> -->
+
diff --git a/gstudio/templates/gstudio/home.html b/gstudio/templates/gstudio/home.html
index f1e7a02..44dd468 100644
--- a/gstudio/templates/gstudio/home.html
+++ b/gstudio/templates/gstudio/home.html
@@ -90,7 +90,8 @@
     </style>   
     
     <script src="http://code.jquery.com/jquery-latest.js"></script>
-    <script type="text/javascript" >
+   <scipt src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
+ <script type="text/javascript" >
       
       
       $(window).load(function() {
@@ -123,6 +124,10 @@
     <div id="header" >
       {% include "gstudio/_header.html" %}
     </div>
+{% put_home_title as home_content %}
+{%with home_content|safe as home %}
+{{home}}
+{% endwith %}
     <div class="tags" align="center" id="tag">
 	<!--<h2>{% trans "Tag Cloud" %}</h2>-->
   	{% get_tag_cloud %}
@@ -138,7 +143,12 @@
       </form>
     </div><br/><br/><br/>
 <link rel="stylesheet" type="text/css" media="screen, projection" href="/static/gstudio/css/screen.css" />
-<center><p style = " font-size : 19px ; color : #4d659e"><b>The site provides a loom (place to exchange views from the members of the site on a topic, or seek responses from members); collaboratively construct wikipages; share electronic documents, images and videos and use them in your discussions or wikipages; and create semantic networks. We will soon provide a link on how to use the site prominently on the home page.  All resources are released under creative commons license. <a href="/more/"><font color="red">more</font></a></b></p></center>
+<center><p style = " font-size : 19px ; color : #4d659e"><b>
+{% put_home_content as home_content %}
+{% with home_content|safe as home %}
+{{home}}
+{% endwith %}
+<a href="/more/"><font color="red">more</font></a></b></p></center>
     <div class="homebottom">
       <div class="authors">
 	<h3>{% trans "Recents Authors" %}</h3>
@@ -147,7 +157,7 @@
 	
 <div class="recentsnodetype">
 <h3>{% trans "Recent Objects" %}</h3>
-{% get_recent_gbobjects 12%}
+{% get_random_gbobjects 12%}
 </div>
 <div class="comments">
   <h3>{% trans "Recent Comments" %}</h3>
diff --git a/gstudio/templates/gstudio/priorpost.html b/gstudio/templates/gstudio/priorpost.html
new file mode 100644
index 0000000..49e4a8a
--- /dev/null
+++ b/gstudio/templates/gstudio/priorpost.html
@@ -0,0 +1,68 @@
+{% load gstudio_tags %}
+{% load i18n %}
+<script type="text/javascript" >
+
+var availableObjects = [];
+$.merge(availableObjects, {% get_pri_post_page %})
+
+jQuery(document).ready(function($) { 
+$("#addpriorpost").click(function(){
+     
+var data 
+data = $("#priorpage").attr('value');
+$.ajax({
+url: '/gstudio/resources/images/addpriorpost/',
+//type:"POST",
+data: {title:data,titleid:{{objectid}}},
+success: function(data){
+$('#priorpostpages').html(data);
+
+}
+});  
+$("#priorpage").val("");
+});
+});
+
+$(document).ready(function(){
+$( "#priorpage" ).autocomplete({
+source: availableObjects
+});
+});
+
+</script>
+
+<div id = "priorpostpages">
+<br/>
+<strong>Prior Pages:</strong>
+{% for each in priorgbobject %}
+<a href="{{each.get_view_object_url}}">{{each}}</a>
+{% if not forloop.last %},{% endif %}
+{% empty %}
+ <span>No prior page</span>
+{% endfor %}
+<br/>
+<strong>Posterior Pages:</strong>
+{% for each in posteriorgbobject %}
+<a href="{{each.get_view_object_url}}">{{each}}</a>
+{% if not forloop.last %},{% endif %}
+{% empty %}
+ <span>No Posterior Page</span>
+{% endfor %}
+<br/>
+</div>
+
+{% if user.is_authenticated %}
+<!-- <form method="get" action=""> -->{% csrf_token %}
+
+<input type="hidden" name="docid" value={{objectid}}>
+<input id="priorpage"  class="tagpriorpage" name="textpriorpage">
+<input type="button" class="priorpost" id="addpriorpost" value="Add Prior Page" name="addtags" />
+<br/><br/>
+<!-- <input type="button" id="titleeditcontent" name="" value="Edit a title"/>
+<input type="text" value="" name="texttags" id="texttagtitle" style="visibility:hidden" /> 
+<input type="button" class="titlecommentsavecontent" id="titlesave" value="Save" style="visibility:hidden" />
+<input type="hidden" name="titlecontenttext" id="titlecommenttext" style="visibility:hidden" />
+<input type="hidden" id="titleeditortext" style="visibility:hidden" value="{{ objecttitle }}">
+<!-- </form> -->
+{% endif %}
+
diff --git a/gstudio/templates/gstudio/repriorpost.html b/gstudio/templates/gstudio/repriorpost.html
new file mode 100644
index 0000000..3499db0
--- /dev/null
+++ b/gstudio/templates/gstudio/repriorpost.html
@@ -0,0 +1,34 @@
+{% load tagging_tags comments i18n %}
+{% ifequal optionpriorpost "priorpost" %}
+<br/>
+<strong>Prior Pages:</strong>
+{% for each in priorgbobject %}
+<a href="{{each.get_view_object_url}}">{{each}}</a>
+{% if not forloop.last %},{% endif %}
+{% empty %}
+ <span>No prior page</span>
+{% endfor %}
+<br/>
+<strong>Posterior Pages:</strong>
+{% for each in posteriorgbobject %}
+<a href="{{each.get_view_object_url}}">{{each}}</a>
+{% if not forloop.last %},{% endif %}
+{% empty %}
+ <span>No Posterior Pages</span>
+{% endfor %}
+<br/>
+{% endifequal %}
+{% ifequal optiontag "tag" %}
+	<strong>{% trans "Tags" %}</strong> :
+	{% tags_for_object viewtag as tag_list %}
+	{% for tag in tag_list %}
+	<a href="{% url objectapp_tag_detail tag %}"
+	   title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
+	<a  class="deletetags" value="{{tag}}" title="delete {{tag}}" onclick='tagfunction("{{tag}}","{{objectid}}");'><img src="/static/gstudio/js/orgitdown/orgitdown/sets/org/images/close.jpeg" width = 8px; style="vertical-align: super;"/></a>
+	{% if not forloop.last %},{% endif %}
+	{% empty %}
+	<span>{% trans "No tags" %}</span>
+	{% endfor %}
+	
+{% endifequal %}
+
diff --git a/gstudio/templates/gstudio/tags/comment.html b/gstudio/templates/gstudio/tags/comment.html
index efb462f..423fc93 100644
--- a/gstudio/templates/gstudio/tags/comment.html
+++ b/gstudio/templates/gstudio/tags/comment.html
@@ -6,6 +6,12 @@ $(window).load(function() {
 $(".commentsavecontent").hide();
 $(".postreply").hide();
 });
+function deleteclick(delobj)
+{
+ activity ='deleted_response'
+ not_obj=delobj
+notifedtdel();
+}
 </script>
 {% if comment.posterior_nodes.count %}
 <!--<ul style="display: none;">-->
@@ -26,7 +32,12 @@ else
 {
 document.getElementById("divchange").setAttribute("id","div2");
 }
+function submtfrm()
+{
+alert("form to post");
+document.forms["response"].submit();
 
+}
 </script>
 
 
@@ -35,7 +46,7 @@ document.getElementById("divchange").setAttribute("id","div2");
 <h5>Current rating is {{ child.rating.get_rating }}<h5/>
 {% endif %}
 <font style = "color:red;" size = 3>{{child.content}}</font>
-   <form method="post" action=".">{% csrf_token %}
+   <form method="post" name="response" action=".">{% csrf_token %}
                                 <input type="hidden" class="commentreptext" id="text{{child.id}}" name="reply" style="visibility:hidden">
                                 <input type="hidden" id="hidden{{child.id}}" value={{child.id}} name="parentid">
                                 <input type="hidden" value={{idusr}} name="idusr">
@@ -45,8 +56,10 @@ document.getElementById("divchange").setAttribute("id","div2");
 				 <input type="button" class="commenteditor" id="{{ child.id }}"  value="Add a Response">
                                  <input type="button" class="commentsavecontent" id="save{{child.id}}" value="Save" onclick="saveclick(document.getElementById('hidden{{child.id}}').value)">
                                 <input type="submit" class="postreply" id="submit{{child.id}}" value="Submit">
+
                                 <input type="checkbox" class="chkdel" id="chk{{child.id}}" name="del_comment" value="delete_comment">
                                 <input type="submit" class="submitdelete" id="delete{{child.id}}" value="Delete" onclick="deleteclick(document.getElementById('hidden{{child.id}}').value)">
+
 <br/>
 <div class="rating">
      Rate the response </br>
@@ -87,7 +100,7 @@ Current rating is {{ child.rating.get_rating }}<br/>
 {% endif %}
                         <font style = "color:red;" size ="3">{{child.content}}</font>
 
-			<form method="post" action="">{% csrf_token %}
+			<form method="post" name="response" action="">{% csrf_token %}
                                 <input type="hidden" class="commentreptext" id="text{{child.id}}" name="reply" style="visibility:hidden">
                                 <input type="hidden" id="hidden{{child.id}}" value={{child.id}} name="parentid">
                                 <input type="hidden" value={{idusr}} name="idusr">
@@ -97,6 +110,9 @@ Current rating is {{ child.rating.get_rating }}<br/>
 				 <input type="button" class="commenteditor" id="{{ child.id }}"  value="Add a Response">
                                  <input type="button" class="commentsavecontent" id="save{{child.id}}" value="Save" onclick="saveclick(document.getElementById('hidden{{child.id}}').value)">
                                 <input type="submit" class="postreply" id="submit{{child.id}}" value="Submit">
+
+
+
                                 <input type="checkbox" class="chkdel" id="chk{{child.id}}" name="del_comment" value="delete_comment">
                                 <input type="submit" class="submitdelete" id="delete{{child.id}}" value="Delete" onclick="deleteclick(document.getElementById('hidden{{child.id}}').value)">
 
@@ -138,7 +154,7 @@ Current rating is {{ child.rating.get_rating }}<br/>
 {% endif %}
                         <font style = "color:red;" size = 3>{{child.content}}</font>
 
-			<form method="post" action=".">{% csrf_token %}
+			<form method="post" name="response" action=".">{% csrf_token %}
                               <input type="hidden" class="commentreptext" id="text{{child.id}}" name="reply" style="visibility:hidden">
                                <input type="hidden" id="hidden{{child.id}}" value={{child.id}} name="parentid">
                                <input type="hidden" value={{idusr}} name="idusr">
@@ -148,8 +164,25 @@ Current rating is {{ child.rating.get_rating }}<br/>
 			     <input type="button" class="commenteditor" id="{{ child.id }}"  value="Add a Response">
                                  <input type="button" class="commentsavecontent" id="save{{child.id}}" value="Save" onclick="saveclick(document.getElementById('hidden{{child.id}}').value)">
                                 <input type="submit" class="postreply" id="submit{{child.id}}" value="Submit">
+
+{% check_user_admin idusr as admin_usercheck %}
+{% if admin_usercheck %}
+
                                 <input type="checkbox" class="chkdel" id="chk{{child.id}}" name="del_comment" value="delete_comment">
-                                <input type="submit" class="submitdelete" id="delete{{child.id}}" value="Delete" onclick="deleteclick(document.getElementById('hidden{{child.id}}').value)">                                                <br/>       
+                                <input type="submit" class="submitdelete" id="delete{{child.id}}" value="Delete" onclick="deleteclick(document.getElementById('hidden{{child.id}}').value)">                                                
+
+<br/>
+{% endif %}
+{% for author in child.authors.all %}
+{% ifequal author.id idusr  %}
+
+                                <input type="checkbox" class="chkdel" id="chk{{child.id}}" name="del_comment" value="delete_comment">
+                                <input type="submit" class="submitdelete" id="delete{{child.id}}" value="Delete" onclick="deleteclick(document.getElementById('hidden{{child.id}}').value)">                                                
+
+<br/>
+{% endifequal %}
+{% endfor %}
+
 <div class="rating">                                                                                                                       
      Rate this response </br>                                                                                                        
                                 <input name="star1" type="radio" value=1 class="star"/>                                              
diff --git a/gstudio/templates/gstudio/video.html b/gstudio/templates/gstudio/video.html
index c50b6df..201a335 100644
--- a/gstudio/templates/gstudio/video.html
+++ b/gstudio/templates/gstudio/video.html
@@ -80,7 +80,7 @@ background: green;
 {% autopaginate vids 10 %}
 
 
-<h2 style="color: teal;">Video Library</h2>
+<h2 style="">Video Library</h2>
 <br/>
 <div id="upperdiv">
 
@@ -173,9 +173,9 @@ document.getElementById('headvideo').style.visibility="visible";
 
 
 {% if fav %}
-<h2 style="color: teal;">Favourite Videos</h2><br/>
+<h2 style="">Favourite Videos</h2><br/>
 {% else %}
-<h2 style="color: teal;">List of Videos in the library </h2><br/>
+<h2 style="">List of Videos in the library </h2><br/>
 {% endif %}
 
 <div id="listvideo">
@@ -195,7 +195,7 @@ document.getElementById("divvideo").setAttribute("id","div2");
 }
 
 </script>
-<font size="4">{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}</font>
+<font size="4">{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}[ <a href="{{ video.get_absolute_url }}" title="{{ video.title }}" rel="bookmark">Show Graph</a> ]</font>
 <form enctype="multipart/form-data" method="post" action="" target="_blank">
 {% csrf_token %}
 <input type="hidden" name = "full" value ={{video.slug}}>
diff --git a/gstudio/templates/metadashboard/grpdashboard.html b/gstudio/templates/metadashboard/grpdashboard.html
index 6ad36ac..8a1b335 100644
--- a/gstudio/templates/metadashboard/grpdashboard.html
+++ b/gstudio/templates/metadashboard/grpdashboard.html
@@ -4,7 +4,7 @@
 {% load adminmedia grp_tags %}
 {% load i18n comments gstudio_tags %} 
 {% load tagging_tags comments i18n %}
-
+ {% block title %}{{meet_ob.title}}{% endblock %}
 {% block content %}
 <script src="http://code.jquery.com/jquery-latest.js"></script>
     <script type="text/javascript" >
@@ -21,6 +21,120 @@ $(".submitresponse").hide();
 $("#editthreadsave").hide();
   });
 var i=0;
+var availableTags = [];
+$.merge(availableTags, {% get_add_tag %})
+
+function notifedtdel()
+{
+
+
+urlnot="/gstudio/group/notify/"+activity+"/"+not_obj+"/{{user.id}}"
+
+subactivity(urlnot,activity);
+}
+
+function subactivity(urlnot,activity)
+{
+      if(activity=='added_response')
+      {
+        submitform(activity);
+      }
+
+      if (activity != 'undefined')
+      {
+
+      $.ajax({
+       url: urlnot,
+       type:'GET',
+       success: function(){
+
+            submitform(activity);
+       }
+     });
+      }
+      else
+      {
+      submitform(activity);
+      }
+}
+
+function submitform(activity)
+{
+
+
+if (activity=='edited_thread')
+{
+
+document.forms["threadform"].submit();
+}
+if(activity=='edited_twist')
+{
+
+
+$("#topicsubmit"+submtobj).trigger('click');
+}
+if(activity=='added_response')
+{
+
+$("#topicsubmit"+submtobj).trigger('click');
+}
+if(activity=='deleted_response')
+{
+
+ document.forms["response"].submit();
+}
+}
+
+
+
+
+
+
+
+
+function Subscribeuser()
+{
+if (confirm("{{user.username}},Do you want to Subscribe to get all alerts in  your mail for this page"))
+{
+
+url = "/gstudio/group/notify/{{meet_ob.id}}/{{user.id}}"
+
+<!--alert(url);-->
+<!-- $.get(url,function(){ -->
+<!-- alert("notified user"); -->
+<!-- }); -->
+$.ajax({
+       url: '/gstudio/group/notify/{{meet_ob.id}}/{{user.id}}',
+       success: function(){
+              <!--alert('notified user');-->
+       }
+     }); 
+$("#sub2").val("UnSubscribe");
+$("#sub2").attr("onclick","UnSubscribeuser()");
+}
+}
+
+
+
+
+
+function UnSubscribeuser()
+{
+url = "/gstudio/group/notify/unsubscribe/{{meet_ob.id}}/{{user.id}}"
+
+<!--alert(url);-->
+<!-- $.get(url,function(){ -->
+<!-- alert("notified user"); -->
+<!-- }); -->
+$.ajax({
+       url: '/gstudio/group/notify/unsubscribe/{{meet_ob.id}}/{{user.id}}',
+       success: function(){
+              <!--alert('notified user');-->
+       }
+     }); 
+$("#sub1").val("Subscribe");
+$("#sub1").attr("onclick","Subscribeuser()");
+}
 </script>
 <style type="text/css">
 #div2
@@ -36,17 +150,25 @@ var i=0;
 
 <!--   <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/{{user.username}}');">
   <h>Hello Welcome to the {{ meet_ob.title }}</h></br> -->
-	<font size ="3" > {{admin_m.username}}'s initial twist to the thread</font>
 
-  <!--  <h>You are logged in as <font color="blue">{{user.username}}</font></h> -->
-         </br>
   
-<h2>{{meet_ob.title}}</h2>
+<h2 style="line-height:1">{{meet_ob.title}}{% if user.is_authenticated %} {% edit_title meet_ob.id meet_ob.title %} {% endif %}</h2>
+<font size ="3" > {{admin_m.username}}'s initial twist to the thread  &nbsp;[ <a href="{{ meet_ob.get_absolute_url }}" title="{{ meet_ob.title }}" rel="bookmark">Show Graph</a> ] &nbsp;</font>
+</br>
+{% if user.is_authenticated %}
+
+{% check_subscribe meet_ob user as subscribe %}
+{%if subscribe %}
+<input type="button" id="sub1" value="UnSubscribe" name="edittitle" onclick="UnSubscribeuser()">
+{% else %}
+<input type="button" id="sub2" value="Subscribe" name="edittitle" onclick="Subscribeuser()">
+{% endif %}
+{% endif %}
 {% with meet_ob.html_content|safe as meet_ob_content %}
 <font size ="3" >{{meet_ob_content}} </font>
 {% endwith %}
 {% if user.is_authenticated %}
-<form method="post" action=".">{% csrf_token %}
+<form method="post" name="threadform" action=".">{% csrf_token %}
 <input type="hidden" id="threadid" value={{meet_ob.id}} style="visibility:hidden;" name="editiden">
 <input type="hidden" id="threadedit{{meet_ob.id}}" style="visibility:hidden;" name="editval">
 <input type="hidden" id="threadcontent{{meet_ob.id}}" value="{{meet_ob.content_org}}" style="visibility:hidden;" name="editcont">
@@ -54,7 +176,8 @@ var i=0;
 <br/>
 <input type="button" id="threadedit" value="Edit">
 <input type="button" id="editthreadsave" value="Save">
-<input type="submit" id="subeditresp" value=Submit" style="visibility:hidden;"></br>
+<input type="button" id="subeditresp" value="Submit" style="visibility:hidden;">
+
 </form>
 
 
@@ -77,28 +200,13 @@ var i=0;
    {% endif %}
    </br>
 {% endif %}
+{% endif %}
 
- <form method="post" action="">{% csrf_token %}
-       	 <input type="hidden" name="docid" value={{meet_ob.id}}>
-       	 <input type="text" class="tagtext" value="" name="texttags"  />
-       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
-       </form>
-	
-       <br>
-       <div class="tags">
-       	 <p class="gbobject-tags span-16 last">
-       	   <strong>{% trans "Tags" %}</strong> :
-       	   {% tags_for_object ot as tag_list %}
-       	   {% for tag in tag_list %}
-       	   <a href="{% url objectapp_tag_detail tag %}"
-              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
-       	   {% empty %}
-       	   <span>{% trans "No tags" %}</span>
-       	   {% endfor %}
-       	 </p>
-       </div>
+<!--ADDING AND DISPLAY TAG-->
+{% addtag ot meet_ob.id user %}
 
 	<br/>
+{% if user.is_authenticated %}
 	<form method="post" action=".">{% csrf_token %}
       <!--  <input type="hidden" value="{{meet_ob.id}}" name = "meetid">-->
 	<input type="button" id="twistaddbtn" value="Add your twist" onClick="location.href=parseURL('topicadd1/{{meet_ob.id}}');">
@@ -119,7 +227,7 @@ var i=0;
 -->
 </br>   {% autoescape off %}
    {% for each in topic %}
-      	<h4><font size="5" >{{each.title}}</font></h4>
+      	<h4><font size="5" >{{each.title}}</font>&nbsp;[ <a href="{{ each.get_absolute_url }}" title="{{ each.title }}" rel="bookmark">Show Graph</a> ]</h4>
       		Posted on : {{each.creation_date}}
 		by : 
    		{% for author in each.authors.all %} 
@@ -141,10 +249,11 @@ var i=0;
     		<input type="hidden" value="{{each.id}}" name = "iden">
 	    	<input type="hidden" value="{{user.id}}" name = "idusr">
 <br/>			{% if user.is_authenticated %}
+		 <input type="button" class="editcontent" name="{{each.content_org}}"  id="{{each.id}}" value="Edit">
 		 <input type="button" class="editor" id="{{ each.id }}" value="Add Response"/>
 		 <input type="hidden" class="editval" id="edit{{each.id}}" name="edit" value="empty">
                 <input type="button" class="savecontent" id="save{{ each.id }}" value="Save" onclick="topicsaveclick(document.getElementById('hidden{{ each.id }}').value)"><br/>
-               <input type="button" class="editcontent" name="{{each.content_org}}"  id="{{each.id}}" value="Edit">
+              
 	        <input type="submit" class="submitresponse" id="topicsubmit{{ each.id }}" value="Submit"></br>
 			{% endif %}
 		{% ifequal user.id admin_id %}		
@@ -171,27 +280,10 @@ var i=0;
 		<input type="submit" value="Rate it!!!">  -->
          </form>
 	</div>   
-	{% if user.is_authenticated %}
- <form method="post" action="">{% csrf_token %}
-       	 <input type="hidden" name="docid" value={{each.id}}>
-       	 <input type="text" class="tagtext" value="" name="texttags"  />
-       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
-       </form>
-	
-       <br>
-       <div class="tags">
-       	 <p class="gbobject-tags span-16 last">
-       	   <strong>{% trans "Tags" %}</strong> :
-       	   {% tags_for_object each as tag_list %}
-       	   {% for tag in tag_list %}
-       	   <a href="{% url objectapp_tag_detail tag %}"
-              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
-       	   {% empty %}
-       	   <span>{% trans "No tags" %}</span>
-       	   {% endfor %}
-       	 </p>
-       </div>
-	{% endif %}
+
+<!--ADDING AND DISPLAY TAG-->
+{% addtag each each.id user %}
+
 	<br/>
         <p>
 	 Responses :
diff --git a/gstudio/templates/metadashboard/pgedashboard.html b/gstudio/templates/metadashboard/pgedashboard.html
index 1e48755..e20b93a 100644
--- a/gstudio/templates/metadashboard/pgedashboard.html
+++ b/gstudio/templates/metadashboard/pgedashboard.html
@@ -5,7 +5,7 @@
 {% load pagination_tags %}
 {% load i18n objectapp_tags %}
 {% load tagging_tags comments i18n %}
-
+{% block title %}{{ page_ob.title }}{% endblock %}
 <!-- {% load i18n %} -->
 {% block content %}
 <style>
@@ -14,6 +14,8 @@
 </style>
 <script src="http://code.jquery.com/jquery-latest.js"></script>
     <script type="text/javascript" >
+var availableTags = [];
+$.merge(availableTags, {% get_add_tag %})
       $(window).load(function() {
       $("#content").css({
     "width": "1000px",});});
@@ -43,11 +45,11 @@ $(".savesubsec1").hide();
 
 {% autopaginate section 1 %}
    <!-- <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/wikipage/{{user.username}}');"> -->
-   <h1>{{ page_ob.title }}</h1> 
+   <h1 style="line-height:0.5">{{ page_ob.title }}  {% if user.is_authenticated %} {% edit_title page_ob.id page_ob.title %} {% endif %}</h1> 
   Wikipage posted on : {{page_ob.creation_date}}
 		by {% for author in page_ob.authors.all %} 
    			{{author}}
-   		{% endfor %}</br></br>
+   		{% endfor %} &nbsp;[ <a href="{{ page_ob.get_absolute_url }}" title="{{ page_ob.title }}" rel="bookmark">Show Graph</a> ] &nbsp;</br></br>
 
    {% with page_ob.html_content|safe as page_ob_content %}
    <font size="3"> 
@@ -64,37 +66,51 @@ $(".savesubsec1").hide();
 	<input type="button" class="savepagecontent" name="{{page_ob.id}}" value="Save"/></br>
 	<input type="submit" class="pagedit" value="Submit"/>
        </form>
+        {% endif %}
+	<!-- Add relations for a page -->
+        
+	{% add_res_relation page_ob %}
+	<br/>
 	
-       <form method="post" action="">{% csrf_token %}
-       	 <input type="hidden" name="docid" value={{page_ob.id}}>
-       	 <input type="text" class="tagtext" value="" name="texttags"  />
-       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
-       </form>
-	{% endif %}
-       <br>
-       <div class="tags">
-       	 <p class="gbobject-tags span-16 last">
-       	   <strong>{% trans "Tags" %}</strong> :
-       	   {% tags_for_object ot as tag_list %}
-       	   {% for tag in tag_list %}
-       	   <a href="{% url objectapp_tag_detail tag %}"
-              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
-       	   {% empty %}
-       	   <span>{% trans "No tags" %}</span>
-       	   {% endfor %}
-       	 </p>
-       </div>
-	</br>
+
+	<!--ADDING PRIOR PAGE-->
+	{% addpriorpost page_ob.id user %}
+	<!--ADDING AND DISPLAY TAG-->
+	{% addtag ot page_ob.id user %}
+
+	 {% ifequal document.rating.get_rating 0 %}
+
+	 <font color = 'black'>Current rating is: &nbsp;<font > No rating yet </font></font>
+	 {% else %}
+	 <font color = 'black'>Average Current rating is: </font><h4>{{ page_ob.rating.get_rating }}</h4>
+	 <font color = 'black'>Total Number of votes is:  &nbsp;<font ><b>{{ page_ob.rating_votes }}</b></font> </font>
+	 {% endifequal %}
+	 <br>
+	 {% if user.is_authenticated %}
+	 <form method="post" action="">
+	   {% csrf_token %}
+	   <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"/>
+     </br>
+     <input type="hidden" name="iden" value={{page_ob.id}}>
+     <input type="submit" value="Rate it!!!">
+	 </form><br>
+	 {% endif %}
+      
+
 		{% if user.is_authenticated %}
 	<form method="post" action=".">{% csrf_token %}
-	<input type="button" id="newsection1"  value="Add a new Section" onClick="location.href=parseURL('sectionadd1/{{page_ob.id}}');">
+	<!--<input type="button" id="newsection1"  value="Add a new Section" onClick="location.href=parseURL('sectionadd1/{{page_ob.id}}');">-->
 	<input type="hidden" id="pageid1" value="{{page_ob.id}}"/>
         </form>
 	{% endif %}
 </br>   {% autoescape off %}
 
    {% for each in section %}
-      	<h4><font size="6">{{each.title}}</h4></font>
+      	<h4><font size="6">{{each.title}} &nbsp;[ <a href="{{ each.get_absolute_url }}" title="{{ each.title }}" rel="bookmark">Show Graph</a> ]</h4></font>
 	  Posted on : {{each.creation_date}}
 	  by {% for author in each.authors.all %} 
 	  {{author}}
@@ -121,33 +137,21 @@ $(".savesubsec1").hide();
 	<input type="button" class="saveseccontent" name="{{each.id}}" value="Save"/>
 	<input type="submit" class="submitresponse" value="Submit"/>
        </form>
-       <form method="post" action="">{% csrf_token %}
-	 <input type="hidden" name="docid" value={{each.id}}>
-	 <input type="text" class="tagtext" value="" name="texttags"  />
-	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
-       </form>
 	{% endif %}
-       <br>
-       <div class="tags">
-	 <p class="gbobject-tags span-16 last">
-	   <strong>{% trans "Tags" %}</strong> :
-	   {% tags_for_object each as tag_list %}
-	   {% for tag in tag_list %}
-	   <a href="{% url objectapp_tag_detail tag %}"
-              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
-	   {% empty %}
-	   <span>{% trans "No tags" %}</span>
-	   {% endfor %}
-	 </p>
-       </div>
+	  <br>
+	
+	<!--ADDING AND DISPLAY TAG-->
+	{% addtag each each.id user %}
+     
+
 		{% if user.is_authenticated %}
 	<form method="post" action=".">{% csrf_token %}<br/>
-        	 Create Subsection:
+        	<!-- Create Subsection:-->
 	        <input type="hidden" name = "replytosection" class="reptext" style="visibility:hidden;"/></br>
     		<input type="hidden" value="{{each.id}}" name = "iden">
 		<input type="hidden" value="{{user.username}}" name ="usr">
 	    	<input type="hidden" value="{{user.id}}" name = "idusr">
-		<input type="button" value="Create Subsection" class="createsubsection">
+		<!--<input type="button" value="Create Subsection" class="createsubsection">-->
  		<input type="hidden" value="empty" name = "edit" class="editval"/>
 
 		<input type="button" value="save" class="savesubsec" name="{{each.id}}">
diff --git a/gstudio/templates/metadashboard/wikidashboard.html b/gstudio/templates/metadashboard/wikidashboard.html
index 1af53ce..75382f2 100644
--- a/gstudio/templates/metadashboard/wikidashboard.html
+++ b/gstudio/templates/metadashboard/wikidashboard.html
@@ -1,6 +1,7 @@
 {% extends "gstudio/base.html" %}
 {% load gstudio_tags %}
 {% load i18n %}
+{% block title %}Wikipages{% endblock %}
 {% block content %}
 
 
@@ -8,6 +9,10 @@
   
 <p> Here is a list of all the pages:</p>
 </br>
+	{% if user.is_authenticated %}
+    <input type="button" value="Create a new page" onClick="location.href=parseURL('pageadd/');">
+	<br/>
+	{% endif %}
     {% for each in pages.member_systems.all %}
     <a href="/gstudio/page/gnowsys-page/{{each.id}}/">{{each.title}}</a></br>
     {% endfor %}