From 94535d4adc3a4960795d22e3b229a8375de10b74 Mon Sep 17 00:00:00 2001
From: supriya <supriya@dragbox.(none)>
Date: Wed, 26 Sep 2012 15:49:52 +0530
Subject: all modules integrated

---
 gstudio/templates/gstudio/NewGroup.html         |  90 ++++++++--
 gstudio/templates/gstudio/NewPage.html          |   1 +
 gstudio/templates/gstudio/NewSection1.html      |   2 +
 gstudio/templates/gstudio/NewTopic1.html        |  11 +-
 gstudio/templates/gstudio/_header.html          |  17 +-
 gstudio/templates/gstudio/_nodetype_detail.html | 100 +++++++++++-
 gstudio/templates/gstudio/docu.html             |  43 +++--
 gstudio/templates/gstudio/fulldocument.html     | 177 ++++++++++++++++++++
 gstudio/templates/gstudio/fullscreen.html       |  26 +--
 gstudio/templates/gstudio/home.html             |  70 +++++---
 gstudio/templates/gstudio/image.html            |  28 ++--
 gstudio/templates/gstudio/more.html             | 209 +++++++-----------------
 gstudio/templates/gstudio/nodes_search.html     |   7 +
 gstudio/templates/gstudio/nodetype_detail.html  |  55 +++++--
 gstudio/templates/gstudio/nodetype_search.html  |   9 +
 gstudio/templates/gstudio/skeleton.html         |  53 +++---
 gstudio/templates/gstudio/tags/comment.html     | 113 ++++++-------
 gstudio/templates/gstudio/tags/commentpage.html |  69 ++------
 gstudio/templates/gstudio/transcript.html       |  62 ++++++-
 gstudio/templates/gstudio/version_diff.html     |   4 +-
 gstudio/templates/gstudio/video.html            |  31 ++--
 21 files changed, 766 insertions(+), 411 deletions(-)
 create mode 100644 gstudio/templates/gstudio/fulldocument.html

(limited to 'gstudio/templates/gstudio')

diff --git a/gstudio/templates/gstudio/NewGroup.html b/gstudio/templates/gstudio/NewGroup.html
index 829c4fa..df0009d 100644
--- a/gstudio/templates/gstudio/NewGroup.html
+++ b/gstudio/templates/gstudio/NewGroup.html
@@ -1,4 +1,5 @@
 {%extends "gstudio/base.html"%}
+{% load gstudio_tags %}
 {%load i18n %}
 {%block extrahead%}
         <script type="text/javascript">
@@ -7,9 +8,51 @@
         $('#id_value_1').datepicker();
         $('#id_value_2').datepicker();
         });
+	function slnchange()
+	{
+	   var a= document.getElementById("opt");
+	   var b=a.options[a.selectedIndex].value;
+           var currentDate = new Date();
+           var endd=new Date();
+           var dat=parseInt(currentDate.getMonth(),10)+1
+           var d=dat+"/"+currentDate.getDate()+"/"+currentDate.getFullYear()
+	   $('#id_value_1').datepicker().val(d);
+	   $('#id_hr1').val('0');
+	   $('#id_hr2').val('0');
+	   $('#id_min1').val('0');
+	   $('#id_min2').val('0');
+	if (b=='Quiz'){
+	   endd.setDate(currentDate.getDate()+5);
+           var d=dat+"/"+endd.getDate()+"/"+endd.getFullYear();
+	   $('#id_value_2').datepicker().val(d);
+        }
+	else if(b=='Online Meeting')
+	{
+           endd.setHours(currentDate.getHours()+6);
+	   var d=dat+"/"+endd.getDate()+"/"+endd.getFullYear()
+	   $('#id_value_2').datepicker().val(d);
+	}
+	else if(b=='Discussion Forum')
+	{
+	   var y=parseInt(currentDate.getFullYear(),10)+100;
+           var d =dat+"/"+endd.getDate()+"/"+y;
+	   $('#id_value_2').datepicker().val(d)
+	}
+	else
+	{
+       	   obj = document.getElementById('opt');
+	   obj.value ="";
+	}
+	}
         </script>
 {%endblock%}
 {% block content  %}
+<style type="text/css">
+#content
+{
+ width:1000px;
+}
+</style>
 {%if user.is_authenticated%}
 {% if errors %}
 <ul>
@@ -20,32 +63,47 @@
 {% endif %}
 <form action="" method="post">
 {% csrf_token %}
-<p>Name of the Group: <input type="text" name="subject"></p>
-<p>Brief Description: <textarea name="message" rows="10" cols="50"></textarea></p>
+<p><font size ="3" >Name of the Thread:</font> <input type="text" name="subject"></p>
+<p><font size ="3" >Substance:</font> </p> 
+<textarea id="threadcontent" name="message" rows="10" cols="50" style="display:none"></textarea>
+
+<input type="button" id="addthreadcontent"  name="content" value="Add Description">
+<input type="button" id="threadsave" name="savecontent" value="Save" style="display:none">
 </br>
-<p>If you want to leave any instructions for the participants you may mention them above as well </p>
-Please Set the time 
+
+{% get_factory_looms as abc %}
+
+<p><font size ="3" >Type:</font></p>
+<select id="opt" onchange="slnchange()" >
+ {% for each in abc %}
+ <option value="{{each}}" >{{each}}</option> 
+{% endfor %}
+</select>
+<br/>
+
+<font size ="3" >Please Set the time 
+<p>Creating a thread will require to schedule it for an indefinite period of time. So in this case, please enter end time of say 50 years from now</p></font>
 </br>
-Starts at time:
+<font size ="3" >Start time:</font>
 </br>
         <span class="datetimeshortcuts">
         	<a href="javascript:DateTimeShortcuts.openCalendar(0);"id = "calendarlink0"></a>
         </span>
-        Date: <input id="id_value_1" type="text" class="vTimeField hasTimepicker" name="stDate" size ="8">
-        Hours:<input type = "text" name = "hours1">
-        Minutes:<input type = "text" name = "minutes1">  <hr>
-	<p><b>Note</b>The group will be accessible to members (except the creator)only after the scheduled start time</p>
-        Ends at time:   </br>
-        Date: <input id="id_value_2" type="text" class="vTimeField hasTimepicker" name="endDate" size ="8">
-        Hours:<input type = "text" name = "hours2">
-        Minutes:<input type = "text" name = "minutes2">
-<p>After this time the group posts remain but the activity is frozen<p>
+       <font size ="2" > Date:</font> <input id="id_value_1" type="text" class="vTimeField hasTimepicker" name="stDate" size ="8">
+        <font size ="2" >Hours:</font><input id = "id_hr1" type = "text" name = "hours1">
+        <font size ="2" >Minutes:</font><input id = "id_min1" type = "text" name = "minutes1"><br/>
+	<font size ="3" ><p><b>Note</b>&nbsp;The thread will be accessible to members (except the creator)only after the scheduled start time</p></font>
+       <font size ="3" > End time:  </font> </br>
+        <font size ="2" >Date: </font><input id="id_value_2" type="text" class="vTimeField hasTimepicker" name="endDate" size ="8">
+        <font size ="2" >Hours:</font><input id = "id_hr2"  type = "text" name = "hours2">
+        <font size ="2" >Minutes:</font><input id = "id_min2"  type = "text" name = "minutes2">
+<font size ="3" ><p>After this time the threads remain but it will be inactive<p></font>
 <input type="hidden" value={{user.id}} name = "idusr">
+<input type="hidden" value={{user.username}} name = "usr">
 <input type="submit" value="Submit">
 </form>
-<p>Creating a group will require to schedule it for an indefinite period of time. So in this case, please enter end time of say 50 years from now</p>
 {%else%}
-<p> Sorry! Login To proceed </p>
+<font size ="3" ><p> Please Login </p></font>
 
 {%endif%}
 {% endblock %}
diff --git a/gstudio/templates/gstudio/NewPage.html b/gstudio/templates/gstudio/NewPage.html
index b73b0dc..9d4caa5 100644
--- a/gstudio/templates/gstudio/NewPage.html
+++ b/gstudio/templates/gstudio/NewPage.html
@@ -26,6 +26,7 @@
 <input type="button" name="savepage" id="save1" value="Save Page"></p>
 </br>
 <input type="hidden" value={{user.id}} name = "idusr">
+<input type="hidden" value={{user.username}} name = "usr">
 <input type="submit" id="submitpage" value="Submit" style="display:none;"/>
 </form>
 {%else%}
diff --git a/gstudio/templates/gstudio/NewSection1.html b/gstudio/templates/gstudio/NewSection1.html
index daf29bc..a9c59ff 100644
--- a/gstudio/templates/gstudio/NewSection1.html
+++ b/gstudio/templates/gstudio/NewSection1.html
@@ -6,6 +6,7 @@
       $(window).load(function() {
       $("#save").hide();});
 </script>
+
 <h1>Add a new Section</h1>
 {% if errors %}
 <ul>
@@ -25,6 +26,7 @@
 <input type="button" name="savepage" id="save" value="Save Page"></p></br>
 <input type="hidden" value={{pageid}} id="sectionid">
 <input type="hidden" value={{user.id}} name = "idusr">
+<input type="hidden" value={{user.username}} name = "usr">
 <input type="submit" id="submitsec" value="Submit" style="display:none;"/>
 </form>
 
diff --git a/gstudio/templates/gstudio/NewTopic1.html b/gstudio/templates/gstudio/NewTopic1.html
index 5f2db82..7974cc5 100644
--- a/gstudio/templates/gstudio/NewTopic1.html
+++ b/gstudio/templates/gstudio/NewTopic1.html
@@ -12,6 +12,8 @@ $(window).load(function() {
 
  $("#graphcss").hide();
   });
+$("#topicaddsave").hide();
+$("#topicsubmit").hide();
 </script>
 
 <h1>Add a new Twist</h1>
@@ -24,14 +26,15 @@ $(window).load(function() {
 {% endif %}
 
 <form action="" method="post">{% csrf_token %}
-<p>Title: <input type="text" name="subject"></p>
-<p>Description: <textarea name="message" id="contenttext" rows="10" cols="50" style="display:none" ></textarea></p>
+<p>Name : <input type="text" name="subject"></p>
+<p>Substance: <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="button" id="topicaddcontent"  name="content" value="Add Substance">
+<input type="button" id="topicaddsave" name="savecontent" value="Save" style="display:none">
 
 <input type="hidden" value={{user.id}} name = "idusr">
+<input type="hidden" value={{user.username}} name = "usr">
 <input type="submit" id="topicsubmit" value="Submit" style="display:none">
 </form>
 
diff --git a/gstudio/templates/gstudio/_header.html b/gstudio/templates/gstudio/_header.html
index 1a5de32..123b05d 100644
--- a/gstudio/templates/gstudio/_header.html
+++ b/gstudio/templates/gstudio/_header.html
@@ -13,14 +13,17 @@
   -->
 <!--    | <a href="{{ get_absolute_url }}/objects" title="Objects">Objects</a>-->
 
-    {% if user.is_authenticated %}
-	{% if user.is_staff %}
-        | <a href="{{  get_absolute_url }}/gstudio/user/{{user.username}}" title="My Loom Studio">Loom Studio</a>
+        | <a href="{{  get_absolute_url }}/gstudio/user" title="Loom Studio">Loom</a>
+        | <a href="{{  get_absolute_url }}/gstudio/user/wikipage" title="Wikipages">Wikipages</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>
         | <a href="{{  get_absolute_url }}/gstudio/resources/videos" title="My Videos">Videos</a>
-        | <a href="{{  get_absolute_url }}/admin" title="Admin Dashboard">Admin Dashboard</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 %}
+ 
+        | <a href="{{  get_absolute_url }}/admin" title="Admin Dashboard">Dashboard</a>
 
        {% endif %}
     {% endif %}
@@ -58,9 +61,9 @@
                 <!-- Documentation -->
                 {% url django-admindocs-docroot as docsroot %}
                 {% if docsroot %}
-                    <li><a href="{{ docsroot }}" title="Documentation">{% trans 'Documentation' %}</a></li>
+                 <!--   <li><a href="{{ docsroot }}" title="Documentation">{% trans 'Documentation' %}</a></li>-->
                 {% endif %}
-                <li><a href="http://github.com/gnowgi/django-gstudio" title="Code">Code</a></li>
+                <li><a href="https://gitorious.org/gnowsys-studio" title="Code">Code</a></li>
             {% endblock %}
         </ul>
     {% else %}
diff --git a/gstudio/templates/gstudio/_nodetype_detail.html b/gstudio/templates/gstudio/_nodetype_detail.html
index 7f56f40..fc5d95f 100644
--- a/gstudio/templates/gstudio/_nodetype_detail.html
+++ b/gstudio/templates/gstudio/_nodetype_detail.html
@@ -1,20 +1,106 @@
 {% load tagging_tags comments i18n %}
+{% load i18n gstudio_tags %}
 <div id="nodetype-{{ object.pk }}" class="hnodetype{% if object.featured %} featured{% endif %} span-16 last">
   <div class="nodetype-header span-16 last">
-    <h2 class="nodetype-title">
-      <a href="{{ object.get_absolute_url }}" title="{{ object.title }}" rel="bookmark">
-        {{ object.title }}
-	 </a>
-	<a href="{{ object.ref.get_edit_url }}" target="_blank" >[edit]</a>     
+ <h2 class="nodetype-title">
+    {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-document'  %}
+      <a href="/gstudio/resources/documents/show/{{object.id}}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is a Document</font>
 
+      {% else %}
+      {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-image'  %}
+      <a href="/gstudio/resources/images/show/{{object.id}}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is an Image</font>
+
+      {% else %}
+      {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-video'  %}
+      <a href="/gstudio/resources/videos/show/{{object.id}}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is a Video</font>
+      {% else %}
+      {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-topic'  %}
+	  <a href="/gstudio/{% show_nodesystem  object.id  %}">{{object.title}}</a>&nbsp; <font size="2" color="black">is a Topic of a Loom-thread</font>
+	 {% else %}
+     {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-section'  %}
+	 <a href="/gstudio/{% show_nodesystem  object.id  %}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is a Section of a wiki-page</font>
+	{% else %}
+    {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-reply'  %}
+
+	{% for eachobject in object.ref.prior_nodes.all %}
+		{% if eachobject.ref.prior_nodes.all %}
+			{% for eachobject1 in eachobject.ref.prior_nodes.all %}
+				{% if eachobject1.ref.prior_nodes.all %}
+					{% for eachobject2 in eachobject1.ref.prior_nodes.all %}
+						 <a href="/gstudio/{% show_nodesystem  eachobject2.id  %}">{{object.title}}</a>&nbsp; <font size="2" color="black">is a Reply</font>
+					{% endfor %}
+				{% else %}
+					 <a href="/gstudio/{% show_nodesystem  eachobject1.id  %}">{{object.title}}</a>&nbsp; <font size="2" color="black">is a Reply </font>
+				{% endif %}
+			{% endfor %}
+		{% else %}
+		 <a href="/gstudio/{% show_nodesystem  eachobject.id  %}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is a Reply </font>
+		{% endif %}
+
+	{% endfor %}
+	{% else %}
+     {% ifequal object.ref.get_nbh.member_of|slugify  'nodetype-ot-subsection'  %}
+	{% for eachobject in object.ref.prior_nodes.all %}
+	 <a href="/gstudio/{% show_nodesystem  eachobject.id  %}">{{object.title}}</a>&nbsp;<font size="2" color="black"> is a Subsection of a Section wiki-page</font>
+	{% endfor %}
+	{% else %}
+<a href="{{ object.get_absolute_url }}" title="{{ object.title }}" rel="bookmark" id = "{{object.id}}awikiloom"> {{ object.title }} </a><font size="2" color="black">
+<script type="text/javascript" >
+var a = "{% show_nodesystem  object.id %}"
+if (a != "")
+{
+document.getElementById("{{object.id}}awikiloom").setAttribute("href","/gstudio/"+a);
+space = a.replace( "/", " " );
+b = space.match("group")
+c = space.match("page")
+if(b == "group"){
+document.write("is a Loom thread" );
+}
+if(c == "page"){
+document.write("is a Wiki page" );
+}
+
+}
+else
+{
+var e;
+e = "{{ object.nodemodel}}";
+if(e == "Gbobject")
+{document.write("is an Object");
+}
+else
+{
+document.write("is a {{object.nodemodel}}");
+}
+}
+</script>
+</font>
+	
+      
+
+{% endifequal %}
+{% endifequal %}
+{% endifequal %}
+	{% endifequal %}
+       {% endifequal %}
+       {% endifequal %}
+       {% endifequal %}
+
+
+     
+<!--	<a href="{{ object.ref.get_edit_url }}" target="_blank" >[edit]</a>     -->
+		
     </h2>
 
+
+
+
     <p class="nodetype-info">
 	
 
-      {% if object.authors.count %}
+      {% if object.ref.authors.count %}
       {% trans "Contributed by" %}
-      {% for author in object.authors.all %}
+      {% for author in object.ref.authors.all %}
       <span class="vcard author">
         <a href="{% url gstudio_author_detail author %}" class="fn nickname url" rel="author"
            title="{% blocktrans with author as author %}Show {{ author }} nodetypes{% endblocktrans %}">{{ author }}</a>
diff --git a/gstudio/templates/gstudio/docu.html b/gstudio/templates/gstudio/docu.html
index bb66363..8519321 100644
--- a/gstudio/templates/gstudio/docu.html
+++ b/gstudio/templates/gstudio/docu.html
@@ -3,12 +3,14 @@
 {% load adminmedia grp_tags %}
 {% load i18n comments gstudio_tags %}
 {% load i18n objectapp_tags %}
+ {% block title %}Documents{% endblock %}
 {% block content %}
 {% load tagging_tags comments i18n %}
 <script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></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" >
+      var isVideotitle=false;
       $(window).load(function() {
       $("#content").css({
     "width": "600px",});});
@@ -20,10 +22,11 @@ $(window).load(function() {
   });
 var i = 0;
 jQuery(document).ready(function($) {
+      isImage=true;
     $("#commenteditor").click(function(){
         document.getElementById('gnoweditor').style.visibility="visible";
         $("#gnoweditor").orgitdown(mySettings);
-	document.getElementById('descriptionsave').style.visibility="visible";
+	<!--document.getElementById('descriptionsave').style.visibility="visible";-->
 	$("#commenteditor").hide();
 		
 	});
@@ -36,14 +39,17 @@ jQuery(document).ready(function($) {
 	});
 });
 jQuery(document).ready(function($) {
-    $(".editcontent").click(function(){
+    $(".doceditcontent").click(function(){
+	isImage=true;
+	
 	var a = $(this).attr("id");
+	objid=a;
         document.getElementById('gnoweditor').style.visibility="visible";
 	 $("#gnoweditor").val($("#editortext"+a).val());
         $("#gnoweditor").orgitdown(mySettings);
         var screentop=$(document).scrollTop();
         $(".orgitdownContainer").css({"margin-top":screentop,});
-	document.getElementById('save'+a).style.visibility="visible";
+<!--	document.getElementById('save'+a).style.visibility="visible";-->
 	$("#"+a).hide();
 	});
      $(".commentsavecontent").click(function(){
@@ -71,7 +77,7 @@ position:absolute;
 margin-left:52%;
 }
 </style> 
-{% if user.is_authenticated %}
+
 {% autopaginate documents 8 %}
 <h2 style="color: teal;">Document Library</h2>
 <br>
@@ -94,12 +100,13 @@ margin-left:52%;
 <input type="submit" value="Search">
 </form>
 </div>
-
+{% if user.is_authenticated %}
 <div id="divpost">
 <form enctype="multipart/form-data" method="post" action="">{% csrf_token %}
 <br/>
 <h4 style="color: black;">Post File:</h4>
-<font size="3">File:</font>&nbsp;<input type=file name="doc[]" multiple="multiple" /><br><br>
+<font size="2">Title:</font>&nbsp; <input type="text" name="title1"><br/>
+<font size="2">File:</font>&nbsp;&nbsp;&nbsp;<input type=file name="doc[]" multiple="multiple" /><br><br>
 Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Content" >
 <input type="button" class="commentsavecontent" id="descriptionsave" value="Save" style="visibility:hidden" />
 <input type=text name="contenttext" id="descriptioncommenttext" style="visibility:hidden" />
@@ -108,13 +115,17 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
 <input type="submit" value="Post">
 </form>
 </div>
-
+{% endif %}
 </div>
 <br>
 <br>
 <br>
 <br>
 <h4 style="color: teal;">Documents Listing</h4>
+{% if reportid %}
+<h2><font color="red">this document is already uploaded on this site</font></h2>
+<a href="/gstudio/resources/documents/show/{{ reportid }}/"> <font size="4">to see this image click here</font></a><br/><br/><br/>
+{% endif %}
 
 {% for document in documents %}
 
@@ -136,18 +147,16 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
      {{document_content}}
 {% endwith %}
 {% endautoescape%}</font>
-{% for author in image.authors.all %}
-	{% ifequal author.username user.username %}
+{% if user.is_authenticated %}
 <input type="hidden" name="docid" value={{document.id}}>
-<input type="button" class="editcontent" id="{{document.id}}"  value="Edit"/>
+<input type="button" class="doceditcontent" id="{{document.id}}"  value="Edit"/>
 <input type="submit" class="commentsavecontent" id="save{{document.id}}" value="Save" style="visibility:hidden" />
 <input type="hidden" name="commenttext" class="commenttext" id="commenttext{{document.id}}" style="visibility:hidden" />
 <input type="hidden" id="editortext{{document.id}}" style="visibility:hidden" value="{{document.content_org}}">
-	{% endifequal %}
-{% endfor %}
+{% endif %}
 </form>
 <br>
-<font color = 'black'>Download: </font><a href="{% admin_media_prefix %}img/{{document.title}}">Click to download!!</a>
+<font color = 'black'>Download: </font><a href="{% admin_media_prefix %}img/{{document.altnames}}">Click to download!!</a>
 <br>
 {% for author in document.authors.all %}
 	{% ifequal author.username user.username %} 
@@ -177,6 +186,7 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
 <font color = 'black'>Total Number of votes is:  &nbsp;<font color='teal'><b>{{ document.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"/>
@@ -193,6 +203,7 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
 <input type="text" value="" name="texttags"  />
 <input type="submit" value="Add Tags" name="addtags" />
 </form>
+{% endif %}
 <br>
 <div class="tags">
     <p class="gbobject-tags span-16 last">
@@ -212,11 +223,7 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
 {% endfor %}<br>
 
 
-{% else %}
- 
-<h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
- 
-{% endif %}
+
  
  <h2>
 {% paginate %}</h2>
diff --git a/gstudio/templates/gstudio/fulldocument.html b/gstudio/templates/gstudio/fulldocument.html
new file mode 100644
index 0000000..b4d5d43
--- /dev/null
+++ b/gstudio/templates/gstudio/fulldocument.html
@@ -0,0 +1,177 @@
+{% extends "gstudio/base.html" %}
+{% load adminmedia grp_tags %}
+{% load i18n comments gstudio_tags %} 
+{% load tagging_tags comments i18n %}
+ {% block title %}{{ doc.title }}{% endblock %}
+{% block content %}
+<script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></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" >
+      $(window).load(function() {
+      $("#content").css({
+    "width": "600px",});});
+$(window).load(function() {
+ $("#chart").hide();});
+$(window).load(function() {
+ 
+ $("#graphcss").hide();   
+  });
+jQuery(document).ready(function($) {
+    $("#editcontent").click(function(){
+        isImage=true;
+        document.getElementById('gnoweditor').style.visibility="visible";
+	 $("#gnoweditor").val($("#editortext").val());
+	$("#content img").css({"max-width":"600px",})
+	   
+        
+        $("#gnoweditor").orgitdown(mySettings);
+	<!--document.getElementById('save').style.visibility="visible";-->
+	$("#editcontent").hide();
+		
+	});
+     $("#save").click(function(){
+            var org_data = $("#gnoweditor").val();       
+	    var encode_data = encodeURIComponent(org_data);
+	    var decode_data = decodeURIComponent(encode_data.replace(/\+/g, " "));
+ 	    $("#commenttext").val(decode_data);
+			   
+	});
+});
+</script>
+</script>
+<link href="{% admin_media_prefix %}css/base.css" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" type="text/css" media="screen, projection" href="{{ STATIC_URL }}gstudio/css/screen.css" />
+<link rel="shortcut icon" href="{{ STATIC_URL }}gstudio/img/favicon.ico" />
+
+
+<br/>
+<form method="post" action="">{% csrf_token %}
+<h2><font color = 'teal'>{{doc.title}}</font></h2>
+<br/>
+<font color = 'black'>Posted By : </font>
+{% for author in doc.authors.all %}
+  <font color = 'teal'>{{author}}</font>
+{% endfor %}
+<br>
+
+<font color = 'black'>Posted At : </font><font color = 'teal'>{{doc.creation_date}}</font>
+<br/>
+<font color = 'black'>Download: </font><a href="{% admin_media_prefix %}img/{{doc.title}}">Click to download!!</a>
+<br>
+<font color = 'black'>Description:</font>
+{%autoescape on%}
+{% with doc.html_content|safe as doc_content %}
+     {{doc_content}}
+{% endwith %}
+{% endautoescape%}
+
+
+
+{% if user.is_authenticated %}
+<input type="hidden" name="docid" value={{doc.id}}>
+<input type="button" id="editcontent" value="Edit"/>
+
+<input type="submit" class="commentsavecontent" id="save" value="Save" style="visibility:hidden" />
+<input type="hidden" name="contenttext" id="commenttext" style="visibility:hidden" />
+<input type="hidden" id="editortext" style="visibility:hidden" value="{{doc.content_org}}">
+{% endif %}
+</form>
+
+<br/>
+{% ifequal doc.rating.get_rating 0 %}
+
+<font color = 'black'>Current rating is: &nbsp;<font color = 'teal'> No rating yet </font></font>
+{% else %}
+<font color = 'black'>Average Current rating is: &nbsp; <font color = 'teal'> {{ doc.rating.get_rating }} </font></font><br/>
+<font color = 'black'>Total Number of votes is:  &nbsp;<font color='teal'><b>{{ doc.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="docid" value={{doc.id}}>
+<input type="submit" value="Rate it!!!">
+</form>
+<br/>
+
+<form method="post" action="">{% csrf_token %}
+<input type="hidden" name="docid" value={{doc.id}}>
+<input type="text" value="" name="texttags"  />
+<input type="submit" 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 doc 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/><br/>
+{% block nodetype-comments %}
+<div id="comments" class="">
+  <h5>{% trans "Comments" %}</h5>
+  {% with doc.comments as comment_list %}
+  {% if comment_list.count %}
+  <ol id="comment-list" class="span-15 last">
+    {% for comment in comment_list %}
+    <li id="comment_{{ comment.pk }}" class="comment vcard {% cycle box1,box2 %}{% if comment.user in doc.authors.all %} post-author{% endif %} span-15 last">
+      <div class="span-2">
+	<img src="{% get_gravatar comment.email 60 "G" %}" class="gravatar photo" alt="{{ comment.user_name }}"/>
+      </div>
+      <div class="comment-body span-13 last">
+	<div class="comment-author span-13 last">
+	  {% if comment.url %}
+	  <a href="{{ comment.url }}" class="fn url" title = "{{ comment.user_name }}">{{ comment.user_name }}</a>
+	  {% else %}
+	  {{ comment.user_name }}
+	  {% endif %}
+	  {% trans "on" %} {{ comment.submit_date|date:"SHORT_DATETIME_FORMAT" }}
+	</div>
+	<div class="span-13 last">
+	  {{ comment.comment|linebreaks }}
+	</div>
+      </div>
+    </li>
+    {% endfor %}
+  </ol>
+    {% if not doc.comments_are_open %}
+  <p>{% trans "Comments are closed." %}</p>
+    {% endif %}
+  {% else %}
+    {% if doc.comments_are_open %}
+  <p>{% trans "No comments yet." %}</p>
+    {% else %}
+  <p>{% trans "Comments are closed." %}</p>
+    {% endif %}
+  {% endif %}
+  {% endwith %}
+</div>
+{% endblock %}
+
+
+<div class="commentForm span-16 last">
+  {% render_comment_form for doc %}
+</div>
+
+
+
+
+<br>
+<hr width="100%" style="height:5px;" color="black"/>
+<br>
+
+{% endblock %}
diff --git a/gstudio/templates/gstudio/fullscreen.html b/gstudio/templates/gstudio/fullscreen.html
index e08a09d..7090c96 100644
--- a/gstudio/templates/gstudio/fullscreen.html
+++ b/gstudio/templates/gstudio/fullscreen.html
@@ -2,6 +2,7 @@
 {% load adminmedia grp_tags %}
 {% load i18n comments gstudio_tags %} 
 {% load tagging_tags comments i18n %}
+ {% block title %}{{ image.title }}{% endblock %}
 {% block content %}
 <script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
 <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script>
@@ -9,19 +10,24 @@
     <script type="text/javascript" >
       $(window).load(function() {
       $("#content").css({
-    "width": "600px",});});
+    "width": "600px",});
+	$("img").css({"max-width":"1000px",})
+	});
 $(window).load(function() {
  $("#chart").hide();});
 $(window).load(function() {
  
  $("#graphcss").hide();   
   });
+var editImage=false;
 jQuery(document).ready(function($) {
     $("#editcontent").click(function(){
+        editImage=true;
         document.getElementById('gnoweditor').style.visibility="visible";
 	 $("#gnoweditor").val($("#editortext").val());
         $("#gnoweditor").orgitdown(mySettings);
-	document.getElementById('save').style.visibility="visible";
+	$("#content img").css({"max-width":"600px",})
+	<!--document.getElementById('save').style.visibility="visible";-->
 	$("#editcontent").hide();
 		
 	});
@@ -38,8 +44,8 @@ jQuery(document).ready(function($) {
 <link href="{% admin_media_prefix %}css/base.css" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" type="text/css" media="screen, projection" href="{{ STATIC_URL }}gstudio/css/screen.css" />
 <link rel="shortcut icon" href="{{ STATIC_URL }}gstudio/img/favicon.ico" />
-
-<img src="{% admin_media_prefix %}img/{{image.image}}" >
+<a href="{% admin_media_prefix %}img/{{image.image}}">
+<img src="{% admin_media_prefix %}img/{{image.image|cut:'.jpg'|cut:'.png'|cut:'.JPG'|cut:'.JPEG'|cut:'.svg'|cut:'.tif'|cut:'.gif'|cut:'.ogv'}}_display_1024"></a>
 <br/>
 <form method="post" action="">{% csrf_token %}
 <font color = 'black'>Name : </font><font color = 'teal'>{{image.title}}</font>
@@ -52,25 +58,23 @@ jQuery(document).ready(function($) {
 
 <font color = 'black'>Posted At : </font><font color = 'teal'>{{image.creation_date}}</font>
 <br/>
-<font color = 'black'>Description:</font><font color = 'teal'>
+<font color = 'black'>Description:</font>
 {%autoescape on%}
 {% with image.html_content|safe as image_content %}
      {{image_content}}
 {% endwith %}
 {% endautoescape%}
-</font>
 
 
-{% for author in image.authors.all %}
-	{% ifequal author.username user.username %}
+
+{% if user.is_authenticated %}
 <input type="hidden" name="imgid" value={{image.id}}>
 <input type="button" id="editcontent" value="Edit"/>
 
 <input type="submit" class="commentsavecontent" id="save" value="Save" style="visibility:hidden" />
 <input type="hidden" name="contenttext" id="commenttext" style="visibility:hidden" />
 <input type="hidden" id="editortext" style="visibility:hidden" value="{{image.content_org}}">
-	{% endifequal %}
-{% endfor %}
+{% endif %}
 </form>
 
 <br/>
@@ -82,6 +86,7 @@ jQuery(document).ready(function($) {
 <font color = 'black'>Total Number of votes is:  &nbsp;<font color='teal'><b>{{ image.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"/>
@@ -100,6 +105,7 @@ jQuery(document).ready(function($) {
 <input type="text" value="" name="texttags"  />
 <input type="submit" value="Add Tags" name="addtags" />
 </form>
+{% endif %}
 <br/>
 <div class="tags">
     <p class="gbobject-tags span-16 last">
diff --git a/gstudio/templates/gstudio/home.html b/gstudio/templates/gstudio/home.html
index 44680fd..f1e7a02 100644
--- a/gstudio/templates/gstudio/home.html
+++ b/gstudio/templates/gstudio/home.html
@@ -44,7 +44,7 @@
       margin-left: 75%;
       }
       
-      .bottom h3 {
+      .homebottom h3 {
       background-color: #C4EBF4;
       padding: 0.5em;
       font-size: 1em;
@@ -55,28 +55,29 @@
       font-weight: normal;
       }
       
-      .bottom{
+      .homebottom{
       margin-top:9%;
       margin-left:11%;
+      height: 212px;
       }
+
       .authors {
-      width: 20%;
-      position:absolute;
-      margin-left: 3%;
-      }	
-      
-      .recentsnodetype{
-      width:22%;
-      position:absolute;
-      margin-left:24%;
+      margin-left: 0;
+      position: absolute;
+      width: 300px;
       }
-      
-      
-      .comments{
-      width:22%;
-      position:absolute;
-      margin-left:47%;
+      .recentsnodetype {
+      margin-left: 314px;
+      position: absolute;
+      width: 400px;
       }
+      .comments {
+      margin-left: 729px;
+      position: absolute;
+      width: 300px;
+      }
+
+
 	.tags .tag_1 { font-size: 1em; color: #001e2d; }
 	.tags .tag_2 { font-size: 1.125em; color: #00334c; }
 	.tags .tag_3 { font-size: 2em; color: #005b89; }
@@ -123,12 +124,12 @@
       {% include "gstudio/_header.html" %}
     </div>
     <div class="tags" align="center" id="tag">
-	<h2>{% trans "Tag Cloud" %}</h2>
+	<!--<h2>{% trans "Tag Cloud" %}</h2>-->
   	{% get_tag_cloud %}
    </div>
    </center>
     <div id="main">
-      <center><font size="23" color="#4d659e"><b>{{ site }}</b></font></center>
+      <center><font size="23" color="#4d659e"><b>{{ site }}</b></font><br/><span id="tagline">a project of <a href="http://lab.gnowledge.org/" target="_blank">gnowledge lab</a>, <a href="http://www.hbcse.tifr.res.in" target="_blank">Homi Bhabha Centre for Science Education</a>, <a href="http://www.tifr.res.in" target="_blank"> TIFR</a></span></center>
       <form action="{% url gstudio_nodetype_search %}" method="get">
 	<input id="searchtext" class="classtext" type="text" value="{{ pattern }}" name="pattern"  onfocus="this.value=''"   style="border: 5; padding: 0pt; margin: 0pt; height: 30px; width: 40%; margin-left:30%; margin-bottom:18px; margin-top:4%" />
 	<input class="searchbutton" type="submit" value="Search" title="Search" />
@@ -138,22 +139,43 @@
     </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>
-    <div class="bottom">
+    <div class="homebottom">
       <div class="authors">
-	<h3>{% trans "Recent Authors" %}</h3>
-	{% get_authors %}
+	<h3>{% trans "Recents Authors" %}</h3>
+	{% get_authors 12 %}
       </div>
 	
 <div class="recentsnodetype">
 <h3>{% trans "Recent Objects" %}</h3>
-{% get_recent_gbobjects %}
+{% get_recent_gbobjects 12%}
 </div>
 <div class="comments">
   <h3>{% trans "Recent Comments" %}</h3>
-  {% get_recent_comments 5 %}
+  {% get_recent_comments 12 %}
 </div>
     </div>
 
+	<div id="footer" align="center" style="margin-top:100px">
+				<p>
+  
+    a project of <a href="http://lab.gnowledge.org/" target="_blank">gnowledge lab</a>,<a href="http://www.hbcse.tifr.res.in" target="_blank">Homi Bhabha Centre for Science Education</a>, <a href="http://www.tifr.res.in" target="_blank">TIFR</a><br> 
+        
+</p>
+					<p> 
+
+						<a rel="license"
+						href="http://creativecommons.org/licenses/by-sa/3.0/" title="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative
+						Commons License" style="border-width:0"	src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"/></a> All material is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/" title = "http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a> unless mentioned otherwise.
+						<br/>
+						Powered	by <a href="http://www.djangoproject.com" title="https://www.djangoproject.com/">Django</a>
+						and <a href="https://gitorious.org/gnowsys-studio" title="https://gitorious.org/gnowsys-studio">Gstudio
+						{{ GSTUDIO_VERSION }}</a>.
+					</p>
+					<center>
+				      <a href="http://atlas.gnowledge.org/softwares"><img src="/static/gstudio/img/community.png"></a></center>
+				</div>
+		
+
   </body>
 </html>
       
diff --git a/gstudio/templates/gstudio/image.html b/gstudio/templates/gstudio/image.html
index fa6ccbd..c8ba9b2 100644
--- a/gstudio/templates/gstudio/image.html
+++ b/gstudio/templates/gstudio/image.html
@@ -4,17 +4,18 @@
 {% load pagination_tags %}
 {% load adminmedia grp_tags %}
 {% load i18n %}
+ {% block title %}Images{% endblock %}
 {% block content %}
 <script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></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" >
 $(window).load(function(){ 
+var isImage=false;
 $("#content").css({"width": "600px"});});
 $(window).load(function() {
  $("#chart").hide();});
 $(window).load(function() {
- 
  $("#graphcss").hide();   
   });
 
@@ -22,9 +23,10 @@ var i = 0;
 
 jQuery(document).ready(function($) {
     $("#commenteditor").click(function(){
+        isImage=true;
         document.getElementById('gnoweditor').style.visibility="visible";
         $("#gnoweditor").orgitdown(mySettings);
-	document.getElementById('save').style.visibility="visible";
+	<!--document.getElementById('save').style.visibility="visible";-->
 	$("#commenteditor").hide();
 		
 	});
@@ -63,7 +65,7 @@ margin-left:52%;
 }
 
 </style>
-{% if user.is_authenticated %}
+
 {% autopaginate images 10 %}
 
 <h2 style="color: teal;">Image Library</h2>
@@ -86,7 +88,7 @@ margin-left:52%;
 <input type="submit" value="Search">
 </form>
 </div>
-
+{% if user.is_authenticated %}
 <div id="divpost">
 <form enctype="multipart/form-data" method="post" action="">
 {% csrf_token %}
@@ -103,8 +105,13 @@ Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Con
 
 </form>
 </div>
+{% endif %}
 </div>
 <br>
+{% if reportid %}
+<h2><font color="red">this image is already uploaded on this site</font></h2>
+<a href="/gstudio/resources/images/show/{{ reportid }}/"> <font size="4">to see this image click here</font></a><br/><br/><br/>
+{% endif %}
  <div>
 <h4 style="color: teal;">IMAGES</h4>
 {% for image in images %}
@@ -129,8 +136,13 @@ document.getElementById("divimage").setAttribute("id","div2");
        <input type="hidden" name="fulid" value={{image.id}}>
      <!--  <input type="submit" value="Show" name="Show">-->
 
-	<a href="/gstudio/resources/images/show/{{image.id}}/"><font size="4"><u>Show</u></font></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="/gstudio/resources/images/show/{{image.id}}/">&nbsp;
+{% for author in image.authors.all %}
 
+	<img src="{% admin_media_prefix %}img/{{image.image|cut:'.jpg'|cut:'.png'|cut:'.JPG'|cut:'.JPEG'|cut:'.svg'|cut:'.tif'|cut:'.gif'|cut:'.ogv'}}-thumbnail">
+
+{% endfor %}
+</a>
     <!--   <p> -->
 <!-- <img src="{% admin_media_prefix %}img/{{image.title}}" width="300" height="225" alt="{{ image.title }}" > -->
        
@@ -206,11 +218,7 @@ document.getElementById("divimage").setAttribute("id","div2");
 
 {% endfor %}
 </div>
-{% else %}
- 
-<h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
- 
-{% endif %}
+
  <h2>
 {% paginate %}</h2>
 
diff --git a/gstudio/templates/gstudio/more.html b/gstudio/templates/gstudio/more.html
index 3b4f034..1ddffb2 100644
--- a/gstudio/templates/gstudio/more.html
+++ b/gstudio/templates/gstudio/more.html
@@ -8,7 +8,7 @@
     
     <style type="text/css">
       #more_body{
-      background: #B3B3B3;
+      background: white;
       }
       #header {
       background: none repeat scroll 0 0 #2B3959;
@@ -52,155 +52,67 @@
         <tbody>
             <tr>
 	     
-               <h1 class="documentFirstHeading"> 
-		<center><span id="parent-fieldname-title" class=""><font size="23px">
-		      Welcome to Gnowledge Network! </font>
-		</span></center>
-	      </h1><br/><br/><br/>
-	      <h2><font size="6px">Introduction </font></h2><br/>
-	      <ul><li>This site is based on a simple idea that we 
-		  can build collaboratively a road map of knowledge by specifying the 
-		  prerequisites of concepts, activities, experiences and statements.&nbsp; The resulting road map can be used as a&nbsp; scaffolding to describe each node network by linking the node to other nodes in terms of relations and attributes.
-		  <br/>
-		</li>
-		<li>Look at <a href="http://atlas.gnowledge.org/Data/display/12675_depmap.svg" class="external-link">this map to get an idea of a dependency map based on prerequisites.</a></li>
-		<li>Look at this one to get an idea of how a node can be described as a map (Link required??). <br></li>
-		<li>You will agree that such maps will be very useful to teachers and 
-		  students.  Over a period of time, with your collaboration, we can build a
-		  complete roadmap of all knowledge which will help to generate a non-linear curriculum framework.</li>
-		<li>Read <a href="http://atlas.gnowledge.org/help">Help Document</a> to begin contributing.</li>
-		</ul>
-		<br/><br/><br/>
-		
-		<h2><font size="6px">What you can do?</font></h2><br/>
-		<ul><li>You can specify the prerequisites for any concept or an activity
-		      at this  site.  Or view the existing prerequisites that are already 
-		    defined by the community.    <br>
-		  </li>
-		  <li>We simply add a concept as a 
-		      node (if it does not exist already) and specify a semantic dependency 
-		      (meaning dependency) relation between one node and another.</li>
-		  <li>Ask yourself the following set of questions:</li>
-		    <ul><li>To understand a concept what do you expect the learner must already know?</li>
-		      <li>To understand a concept what do you expect the learner must do?</li>
-		      <li>To impart a skill what what other activities the learner must do?</li><li>To impart a skill what other concepts the learner must already know?</li></ul>
-		  </ul>
-		  <p>Answers to these questions can be specified in this community portal by establishing links between concepts and activities.</p>
-		  <br/><br/><br/>
-		  <h2><font size="6px">What we will get out of this?</font></h2><br/>
-		  <ul><li>a globally useful resource for teachers and students to know the learning track (learning path) for any concept or skill.  <br></li>
-		    <li>teachers and authors of textbooks can use these maps to prepare course materials or sequence their curriculum.</li>
-		    <li>students get to know what they need to know in order to learn something.</li><li>researchers can use the data for analyzing the properties of knowledge structures.<br></li>
-		    <li>a network of concepts and activities that can be used, modified, published and shared  by the entire community.</li><li>a visual map of knowledge and a road map for learning and teaching.</li>
-		    <li>a knowledge base that can be used to profile different domains of knowledge.</li><li>the
-		      resulting map will show us, as it were, the 'cities' (on which we 
-		      depend on most), 'towns' (on which we depend but not as much as the 
-		      cities), 'villages' (on which we depend least), continents (domains that
-		      contain inter-related cities, towns and villages), etc.  <br></li><li>a sequence to automatically guide learners in a machine guided online tutoring system, for example.</li>
-		    <li>a
-		      network analysis linking the number of nodes and links, plots, 
-		      analyses, statistics, distribution properties etc. (very soon as the 
-		      data set increases, we will publish the results on this site.&nbsp; You can access the data dumps (sans privacy information) very soon, so that you can analyze the data yourself.)<br></li>
-		    <li>and we are sure it will have many other uses as well.&nbsp; If you foresee some please discuss with us in the list community@gnowledge.org.&nbsp; Or write or upload a document in the sandbox fodler (follow the link) and send us an email in the list.<br></li></ul>
-		    <br/><br/><br/>
-		    <h2><font size="6px">Yes! You do not have to write essays here.</font></h2><br/>
-		    <ul><li>We can get all the above mentioned goodies without writing any 
-			essays or do so much of research. We do not define concepts either! Just
-			ask yourself the questions mentioned above and provide the answer if 
-			you have them.  We simply make the dependency relations explicit for all
-			concepts that all of us know.  Soon we will be able to do this in all 
-			languages of the world (Our software developers are working on this.).</li></ul>
-		    <br/><br/><br/>
-		    <h2><font size="6px">So, how to get it going? </font></h2><br/>
-		    <ol><li>Join as a member.  Use the join link on the right corner of the site.<br></li>
-		      <li>Use the 'Login' link if you are already a member.<br></li>
-		      <li>Search for a concept or activity using the search form present on the right side of the header or the "<a href="http://localhost:8081/depmap/viewall?val=1">view or edit</a>"
-			link. (We started this site recently and data set is very small, so 
-			don't be surprised if your favorite concepts and activities are not 
-			found here.)<br></li>
-		      <li>Add a non-existing node.  By default it will be
-			  taken as a concept, but if you want it to be an activity, use the check
-			  box.  If a node already exists, you will see a message: "Object already
-			  exists". Then you can visit that node and then decide what more you can
-			  do. <br></li>
-		      <li>Then add appropriate dependency links.  For adding 
-			    dependency link, click on the "Add" button below the relation names 
-			    "Depends on" or its inverse name "Required for".</li>
-		      <li>If you think 
-			that the existing relation is not accurate, you can remove the link 
-			using the "Delete" tab.  Or discuss in the mailing list on the issue and
-			resolve the conflict.<br></li>
-		      <li>Remember!  You cannot add a relation 
-			unless a concept node already exists.  So, if you don't find the node 
-			you are looking for, add one and link it.<br></li>
-		      <li>Remember, all of 
-			us are making only one single map collaboratively.  All contributions 
-			are recorded against your login name with date and time of contribution.
-			<br></li>
-		      <li>Please see below the ownership and license information to know who owns the data made by you.</li></ol>
-	      
-		      <br/><br/><br/>
-		      <h2><font size="6px">Spread the word around the world! </font></h2><br/>
-		      <ul><li>Well!  The site is meant for you.  We made this simplest web 
-			  application so that the whole world gets the benefit.  The outcome of 
-			  this simplest exercise will be a very useful semantic dependency map for
-			  learning and teaching any topic.  The knowledge base built on this site
-			  is available for every one.  For making the maps in other languages we 
-			  have to only add translations to each node.  We will soon add this 
-			  function to have the map in all languages.  However, if you want to add 
-			  concepts in your own language, you can build them right away, and may 
-			  add the translation links latter when the feature is made available.<br></li></ul>
-			<br/><br/><br/>
-			<h2><font size="6px">License</font></h2><br/>
-			The network and the content produced is published under <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License" class="external-link">Creative Commons Attribution ShareAlike 3.0</a>
-			<p>&nbsp;</p>
-			<ul><li>  What does this license imply?</li>
-			  <ul><li>you have the freedom to use the maps for any purpose.</li>
-			    <li>you can make modifications to them.<br></li><li>you
-				can distribute or publish or sell them provided you grant the same 
-				freedoms to others as well, i.e., release them again under the terms of 
-				the same license.&nbsp; Please write to us if you have any query on your rights to use them.
-			    </li></ul>
-			  </ul>
-			  <br/><br/><br/>
-			  <h2><font size="6px">We are slowly adding more features!</font></h2><br/>
-			  <p>After depMap (dependency map) we will soon have other kinds of maps as follows:</p>
-			  <ul><li>typeMap (what is a type of what, what is a sub-type of what) for taxonomy<br></li>
-			    <li>partMap (what is a part of what, and what consists of what) for part-whole relation<br></li>
-			    <li>reactionMap (what is a product of what, and what is a reactant of what) for how matter changes<br></li>
-			    <li>causeMap (what is a cause of what, and what is an effect of what) for cause-effect map<br></li>
-			    <li>testsMap (what is a preTest and what is a postTest of each node in the map) for assessment<br></li>
-			    <li>and so on.  If you have another good suggestion tell us, we will try to add that in future.&nbsp; So, write to us or upload your suggestion in the sandbox (you need to register to do this.).<br></li></ul>
-			    <br/><br/><br/>
-			    <h2><font size="6px">Tell us if you have any feedback!</font></h2><br/>
-			    <ul><li>We will make improvements to the user interface to make the 
-				process easy.  If you have good ideas you can tell us, or if you have 
-				skills or willing to contribute you can collaborate in building the 
-				software of this portal as well.&nbsp; If you know how to help us build the site, you are welcome.&nbsp; Send us
-				a patch and if it works and gels with the rest of the site your 
-				contribution will be in.<br></li></ul>
-			      <blockquote>
-				<blockquote>join the room glab@conference.jabber.org to talk to other developers.</blockquote>
-			      </blockquote>
-			      <ul><li>
-				  <div id="text-6">
-				    <ul><li>
-					join the mailing list atlas-dev@gnowledge.org at
-					<a href="http://gnowledge.org/cgi-bin/mailman/listinfo/atlas-dev">http://gnowledge.org/cgi-bin/mailman/listinfo/atlas-dev</a>
-				      </li>
+
+<p>This site is an initiative of
+the <a href="http://www.hbcse.tifr.res.in/">Homi Bhabha Centre for
+Science Education, TIFR</a> , Mumbai, India for establishing
+collaboration among students, teachers, researchers or anyone else
+interested, to shape education and research in strikingly different
+ways.  Why is the platform called "metaStudio" is described in another
+article.  However, if you join at this portal as a registered user, it
+does not imply that you endorse the idea of <a href="/groups/studio"
+target="_self" title="studio based education">studio based
+education.</a> Please read the <a href="/about/terms" target="_self"
+title="terms">terms</a> of using the site before registration at the
+site. Please do read the articles in the <a href="/about"
+target="_self" title="about">About section</a> from the menu, as well.
+If you have any queries, please do not hesitate to write to us.
+
+<h1>What facilities does this platform offer?</h1>
+
+<p>The site offers a few simple ways of collaboration</p>
+
+<ul>
+
+<li>a wiki: you can create wiki style pages collaboratively on topics and subjects of your choice. </li>
+
+<li>a loom studio: to form a thread and discuss, seek responses from members. </li>
+
+
+<li>upload useful resources such as lessons, documents, pictures, videos, articles, software etc (You will get points for your contributions). </li>
+
+
+<li>start collaborative research projects on any area of interest under the<a> Creative Commons license.</a></li>
+
+</ul>
+
+<h1>Our Protocol: Creative Commons using open standards</h1>
+
+<p>As a project inspired by <a href="http://www.gnu.org/philosophy/" target="_blank" title="free software philosophy">free software philosophy</a> , this site encourages the members to adhere to the principles that <strong>protect freedom, sharing, collaboration and socially acceptable protocols.</strong></p>
+
+<ul>
+
+<li>when you upload resources (digital documents and software) please ensure that you are uploading them under the  <a href="/content/article/13" target="_self" title="creative commons">Creative Commons license or other copy left license or public domain. <br /></a></li>
+
+<li>ensure that the documents uploaded are encoded in <a href="http://en.wikipedia.org/wiki/Open_standard" target="_self" title="open standards">open standards (non-proprietary).</a></li>
+
+</ul>
+
+<h1>Join Us</h1>
+
+<p>Explore our web site and see how you can use our infrastructure to further your own research and educational activities. <a href="/register" title="Sign up!">Create your own account</a>.  <a href="/contribute">Become a contributor</a> by sharing your work, message, criticism, questions, responses, tools, or anything you seem useful and interesting to the community.</p>
+
+<ul>
+
 				      <li>
-					see our code at svn co  <a href="https://svn.gnowledge.org/svn/repo/labcode/atlasv2/atlas">https://svn.gnowledge.org/svn/repo/labcode/atlasv2/atlas</a></li></ul>
+					see our code
+					at <a href="http://savannah.gnu.org/projects/gnowsys/">Savannah
+					or gitorious or
+					github</a></li></ul>
 				  </div>
 				  <p>The site uses <a href="http://www.gnu.org/software/gnowsys/" class="external-link">GNOWSYS (Gnowledge Networking and Organizing System)</a>
-				    as a backend.&nbsp; GNOWSYS uses gnowql (gnowledge query library) as API.&nbsp; 
-				    Some documentation about how you can learn gnowql is available <a href="http://lab.gnowledge.org/Software/gnowsys_rc1/documentation-of-new-gnowql" class="external-link">here</a>.</p>
-				</li><li>Use the 'contact' link above to write to us.  If you have any feature request, we will try to add the feature.&nbsp;&nbsp;</li><li><a href="http://gnowledge.org/cgi-bin/mailman/listinfo/community" class="external-link">Join the mailing list here </a> to be in touch with other contributors where you can<br></li>
-				  <ul><li>discuss with them pertaining to the activities on this portal<br></li><li>resolve conflicts if any</li><li>schedule periodic online workshops though collaborative online conferences</li><li>share your experiences <br></li><li>and so on.</li></ul>
-				    </ul>
-				    This site is made and maintained by the <a href="http://trac.gnowledge.org/trac">gnowledge.org lab</a> of Homi Bhabha Centre for Science Educatioin, TIFR.<a href="http://localhost:8081/depmap/" class="external-link"><br></a>
-				      <p>&nbsp;</p>
-				      
-				      
+				    as a backend.</p>
+				</li>
 				   
 			  
                             </tr>
@@ -211,12 +123,11 @@
 
 			      <p>A project of <a href="http://www.hbcse.tifr.res.in" target="_blank">Homi Bhabha Centre for Science Education</a>,
 				<a href="http://www.tifr.res.in" target="_blank">TIFR</a><br>
-				  <!--Plone and its visual design is Copyright 2000 - 2006 by Alexander Limi, Alan Runyan, Vidar Andersen.-->
         
 				</p>
 
 			      <p>
-				All text is available under the terms of the <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License" class="external-link">Creative Commons Attribution ShareAlike 3.0</a>.
+				All resources are available under the terms of the <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License" class="external-link">Creative Commons Attribution ShareAlike 3.0</a> unless otherwise mentioned.
 			      </p>
 			      
 			      <p>
diff --git a/gstudio/templates/gstudio/nodes_search.html b/gstudio/templates/gstudio/nodes_search.html
index 7fbc53d..87c9e16 100644
--- a/gstudio/templates/gstudio/nodes_search.html
+++ b/gstudio/templates/gstudio/nodes_search.html
@@ -24,9 +24,16 @@
 {% endif %}
 
 {% for object in object_list %}
+	{% ifequal object.title|truncatewords:"3" 'page box of ...' %}
+	
+	{% else %}
+	{% ifequal object.title|truncatewords:"3" 'message box of ...' %}
+	{% else %}
   {% with object.html_content|truncatewords_html:100|safe as object_content %}
   {% include "gstudio/_nodetype_detail.html" %}
   {% endwith %}
+{% endifequal %}
+{% endifequal %}
 {% empty %}
 <p class="notice">{% trans "Nothing found." %}</p>
 {% endfor %}
diff --git a/gstudio/templates/gstudio/nodetype_detail.html b/gstudio/templates/gstudio/nodetype_detail.html
index 73db903..d3a31e0 100644
--- a/gstudio/templates/gstudio/nodetype_detail.html
+++ b/gstudio/templates/gstudio/nodetype_detail.html
@@ -28,6 +28,15 @@
   <link rel="alternate" type="application/rss+xml" title="{% trans "RSS Feed of trackbacks on" %} '{{ object.title }}'"
         href="{% url gstudio_nodetype_trackback_feed year month day object.slug %}" />
   {% endwith %}
+<script type="text/javascript" >
+$(window).load(function() {
+ 
+ $("#savenodecontent").hide();
+ $("#nodedit").hide();
+
+});
+</script>
+
 {% endblock %}
 
 
@@ -38,14 +47,14 @@
       <a href="{{ object.get_absolute_url }}" title="{{ object.title }}" rel="bookmark">
         {{ object.title }}
 	 </a>
-	<a href="{{ object.ref.get_edit_url }}" target="_blank"  title = "edit">[edit]</a>     
+<!--	<a href="{{ object.ref.get_edit_url }}" target="_blank"  title = "edit">[edit]</a>     -->
 
     </h2>
 <div class="History">
      
       					 
        					 <table border="1" cellspacing="0">
-						
+						<b>Versions:&nbsp;</b>
         					{% for sid in object.ref.get_ssid  %}
 	   
 	      
@@ -212,25 +221,39 @@
 <!-- <\!-- Content -\->                            -->
 			    {% if object.content %}
                             <b>
-					Content:<nbsp>
+					Content:<nbsp></b>
+				      <div id="nodetype">
+					<form method="post" action="/gstudio/{{object.id}}/">{% csrf_token %}
+					  <input type="hidden" id="reptext" name="replytosection" id="sectionreply" style="visibility:hidden;"/></br>
+					  <input type="hidden" id="editval" name="edit" value="edited"/>
+					  <input type="hidden" value="{{object.id}}" name = "iden">
+					  <input type="hidden" value="{{user.username}}" name ="usr">
+					  <input type="hidden" value="{{user.id}}" name = "idusr">
+					  <input type="button" id="editnodecontent" name="{{object.content_org}}" value="Edit"/>
+					  <input type="button" id="savenodecontent" name="{{object.id}}" value="Save"/></br>
+					  <input type="submit" id="nodedit" value="Submit"/>
+					</form>
+					</div>
 				
-				         <input type="button" id="editdata" value="Edit Content"/>					  	                     <input type="button" id="savecontent" value="Save Content"/><ndsp><nbsp>
-					  <input type="hidden" id="objectid" value="{{object.id}}"/>
-		         		  <input type="hidden" id="title" value="{{object.title}}"/>
-					  <input type="hidden" id="orgcontent" value="{{object.content_org}}"/>
-					</b>
+				        
 				   	{{object_content}}<br/>
 
 					{% else %}
 						<b>
-					Content:<nbsp> 
-				         <input type="button"id="editdata" value="Edit Content"/>
-					 <input type="button" id="savecontent" value="Save Content"/><ndsp><nbsp>
-					 <input type="hidden" id="objectid" value="{{object.id}}"/>
-		
-					  <input type="hidden" id="title" value="{{object.title}}"/>
-					  <input type="hidden" id="orgcontent" value="{{object.content_org}}"/>
-					 </b>
+					Content:<nbsp> </b>
+					<div id="nodetype">
+					<form method="post" action="/gstudio/{{object.id}}/">{% csrf_token %}
+					  <input type="hidden" id="reptext" name="replytosection" id="sectionreply" style="visibility:hidden;"/></br>
+					  <input type="hidden" id="editval" name="edit" value="edited"/>
+					  <input type="hidden" value="{{object.id}}" name = "iden">
+					  <input type="hidden" value="{{user.username}}" name ="usr">
+					  <input type="hidden" value="{{user.id}}" name = "idusr">
+					  <input type="button" id="editnodecontent" name="{{object.content_org}}" value="Edit"/>
+					  <input type="button" id="savenodecontent" name="{{object.id}}" value="Save"/></br>
+					  <input type="submit" id="nodedit" value="Submit"/>
+					</form>
+					</div>
+				         
 				   	{{object_content}}<br/>
 					
                           {% endif %}
diff --git a/gstudio/templates/gstudio/nodetype_search.html b/gstudio/templates/gstudio/nodetype_search.html
index 7fbc53d..08d2d4b 100644
--- a/gstudio/templates/gstudio/nodetype_search.html
+++ b/gstudio/templates/gstudio/nodetype_search.html
@@ -24,9 +24,18 @@
 {% endif %}
 
 {% for object in object_list %}
+	{% ifequal object.title|truncatewords:"3" 'page box of ...' %}
+	
+	{% else %}
+	{% ifequal object.title|truncatewords:"3" 'message box of ...' %}
+	{% else %}
+	
   {% with object.html_content|truncatewords_html:100|safe as object_content %}
   {% include "gstudio/_nodetype_detail.html" %}
   {% endwith %}
+{% endifequal %}
+{% endifequal %}
+
 {% empty %}
 <p class="notice">{% trans "Nothing found." %}</p>
 {% endfor %}
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index cddc112..60bb4a1 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -51,9 +51,12 @@
 				display: block;
 				position: absolute;
 			}
-<!-- .orgitdown .orgitdownButton1 a { -->
-<!-- 	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/save.jpeg); -->
-<!-- } -->
+.orgitdown .orgitdownButton1 a {
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/save.jpeg);
+	margin-left:10px;
+	margin-top:1px;
+}
+
 .orgitdown .orgitdownButton2 a {
 	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/bold.png);
 }
@@ -79,11 +82,12 @@
 }
 
 .orgitdown .orgitdownButton9 a {
-	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/clean.png);
+	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/org/images/close.jpeg);
 }
-.orgitdown .preview a {
+
+<!--.orgitdown .preview a {
 	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/preview.png);
-}
+}-->
 
 .orgitdown * {
 	margin:0px; padding:0px;
@@ -108,6 +112,11 @@
         width:450px;
         margin-top:30px;
 }
+
+<!-- #content img { -->
+<!--  max-width:600px; -->
+<!-- } -->
+
 .orgitdownEditor {
 	font:12px 'Courier New', Courier, monospace;
 	padding:5px 5px 5px 35px;
@@ -240,7 +249,7 @@
 		{% block stylesheets %}
 		<link href="{% admin_media_prefix %}css/base.css" rel="stylesheet" type="text/css" />
 		{% if LANGUAGE_BIDI %}
-		<link href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" rel="stylesheet" type="text/css" />
+	<link href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" rel="stylesheet" type="text/css" />
 		{% endif %}
 		<link href="{% admin_media_prefix %}jquery/ui/css/custom-theme/jquery-ui-1.8.custom.css" rel="stylesheet" type="text/css" media="screen" title="no title" charset="utf-8" />
 		<link href="{% admin_media_prefix %}css/jquery-ui-grappelli-extensions.css" rel="stylesheet" type="text/css" />
@@ -249,7 +258,12 @@
 		{% block javascripts %}
 		<script type="text/javascript">
 			// GLOBALS
+			var isImage=false;
+			var editImage=false;
+			var objid;
 			var grappelli = {},
+			
+
 			// TODO: klemens: drop ADMIN_URL
 			ADMIN_URL = "{% url admin:index %}",
 			MODEL_URL_ARRAY = {% get_content_types %}, DATE_FORMAT = "{% get_date_format %}", TIME_FORMAT = "{% get_time_format %}", DATETIME_FORMAT = "{% get_datetime_format %}";
@@ -283,20 +297,13 @@
 	<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="{{STATIC_URL}}gstudio/js/loomscripts.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="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/orgitdown/orgitdown/sets/savedata.js"></script>
 	 <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
@@ -305,6 +312,7 @@
 	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script>
 	
 	<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/addcontent.js"></script>
+	<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.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> -->
 	
@@ -377,8 +385,7 @@
 					{% endblock %}
 				</div>
 
-				<textarea id="gnoweditor" style="visibility:hidden;">
-				</textarea>
+				<textarea id="gnoweditor" style="visibility:hidden;"></textarea>
 				
 				{% block graph %}
 				<div id="graphcss">
@@ -816,7 +823,12 @@ return relations;
 		</div>
 				
 				
-				<div id="footer">
+				<div id="footer" align="center">
+				<p>
+  
+    A project of  <a href="http://lab.gnowledge.org/" target="_blank">gnowledge lab</a>,<a href="http://www.hbcse.tifr.res.in" target="_blank">Homi Bhabha Centre for Science Education</a>, <a href="http://www.tifr.res.in" target="_blank">TIFR</a><br> 
+        
+</p>
 					<p> 
 
 						<a rel="license"
@@ -824,12 +836,13 @@ return relations;
 						Commons License" style="border-width:0"	src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"/></a> All material is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/" title = "http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a> unless mentioned otherwise.
 						<br/>
 						Powered	by <a href="http://www.djangoproject.com" title="https://www.djangoproject.com/">Django</a>
-						and <a href="https://github.com/gnowgi/gnowsys-studio" title="https://github.com/gnowgi/gnowsys-studio">Gstudio
+						and <a href="https://gitorious.org/gnowsys-studio" title="https://gitorious.org/gnowsys-studio">Gstudio
 						{{ GSTUDIO_VERSION }}</a>.
 					</p>
+					<center>
+				      <a href="http://atlas.gnowledge.org/softwares"><img src="/static/gstudio/img/community.png"></a></center>
 				</div>
 		
 	
 	</body>
 </html>
-
diff --git a/gstudio/templates/gstudio/tags/comment.html b/gstudio/templates/gstudio/tags/comment.html
index 8e1d480..efb462f 100644
--- a/gstudio/templates/gstudio/tags/comment.html
+++ b/gstudio/templates/gstudio/tags/comment.html
@@ -1,13 +1,12 @@
-
-
-
-
-
 {% load gstudio_tags %}
 {% load i18n %}
 
-
-
+<script type="text/javascript">
+$(window).load(function() {
+$(".commentsavecontent").hide();
+$(".postreply").hide();
+});
+</script>
 {% if comment.posterior_nodes.count %}
 <!--<ul style="display: none;">-->
 <ul>
@@ -27,32 +26,31 @@ else
 {
 document.getElementById("divchange").setAttribute("id","div2");
 }
+
 </script>
 
 
-			<li>{{each}}'s fabric 
+			<li>{{each}}'s Response 
 {% if child.rating.get_rating %}
-Current rating is {{ child.rating.get_rating }}<br/>
+<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 %}
-                                <input type="text" class="commentreptext"id="{{child.id}}" name = "reply" style="visibility:hidden">
-                                <input type="hidden" value={{child.id}} name = "parentid">
+                                <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">
-       <!--      <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/>	
+				 <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/>
-     Do you wanna rate it ? </br>
-                                <input name="star1" type="radio" value=1 class="star"/>
+<div class="rating">
+     Rate the 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"/>
@@ -60,7 +58,7 @@ Current rating is {{ child.rating.get_rating }}<br/>
   <!--topic id and user id hidden fields-->
                 </br>
                 <input type="submit" value="Rate Response">
-
+</div>
                                 </form>
 </div>
 
@@ -87,28 +85,24 @@ document.getElementById("divchange").setAttribute("id","div2");
 {% if child.rating.get_rating %}
 Current rating is {{ child.rating.get_rating }}<br/>
 {% endif %}
-                        <font style = "color:red;" size ="3"></font>{{child.content}}
+                        <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" 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">
+                                <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">
 
+                                <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)">
 
 <br/>
-     Do you wanna rate it ? </br>
+<div class="rating">
+     Rate the 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"/>
@@ -117,7 +111,7 @@ Current rating is {{ child.rating.get_rating }}<br/>
                 <!--topic id and user id hidden fields-->
                 </br>
                 <input type="submit" value="Rate Response">
-
+</div>
                                 </form>
 </div>
                                 {% show_comment child idusr flag admin_id attribute%}
@@ -138,25 +132,25 @@ else
 document.getElementById("divchange").setAttribute("id","div2");
 }
 </script>
-                                {{each}}'s Response <br/>
+{{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}}
+                        <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" style="display:none">
-                                <input type="checkbox" id="chk" name="del_comment" value="delete_comment">
-                                <input type="submit" value="delete this comment"">                                                   <br/>                                                                                                                              
+                              <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">
+
+                                <br/>
+					{% if idusr %}
+			     <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 this response </br>                                                                                                        
                                 <input name="star1" type="radio" value=1 class="star"/>                                              
                 <input name="star1" type="radio" value=2 class="star"/>                                                              
@@ -166,12 +160,13 @@ Current rating is {{ child.rating.get_rating }}<br/>
                 <!--topic id and user id hidden fields-->                                                                            
                 </br>                                       
  <input type="submit" value="Rate Response">                                                                          
-                                                                                                                                     
+</div>            
+           {% endif %}                                                                                                  
       </form>                                                                          
-                    
+                 
 </div>                                                                                                                               
                                                                                                                                
-               {% show_comment child idusr flag admin_id attribute%}                           {% endifequal %}                                                                                 
+               {% show_comment child idusr flag admin_id attribute%}    {% endifequal %}                                                                                 
                          {% endifequal %}                                                                                            
                {% endifequal %}                                                                                                      
        {% endfor %}                                                                                                                  
diff --git a/gstudio/templates/gstudio/tags/commentpage.html b/gstudio/templates/gstudio/tags/commentpage.html
index a55f4ed..c5bb1f1 100644
--- a/gstudio/templates/gstudio/tags/commentpage.html
+++ b/gstudio/templates/gstudio/tags/commentpage.html
@@ -8,38 +8,34 @@
 
 
 
-
 {% if comment.posterior_nodes.count %}
 <!--<ul style="display: none;">-->
 <ul>
 {% for child in comment.posterior_nodes.all %}
        <!-- Flag1 outside {{flag}}-->
         {% for each in child.authors.all %}
-        	{% ifequal idusr admin_id %}
-			<font style = "color:red;" size = 3><li>{{child.title}}</font></br> {{child.content}}
+        	
+			</br><h3><font size="5"><li>{{child.title}}</font></h3></br>
+			<font size="3"> {{child.content}}</font>
+			{% if idusr %}
 			<form method="post" action=".">{% csrf_token %}
-			<!-- <textarea name = "replytosection" id="replytosection" rows="10" cols="50"></textarea> -->
-			<!-- <p>org -->
-			<!-- <textarea name = "orgreply" id="orgreplysection" rows="10" cols="50"></textarea> -->
-			<!-- </p> -->
-		  	<!-- <input type="hidden" value="{{child.id}}" name ="parentid"> -->
-			<input type="hidden" value="{{idusr}}" name="idusr">
-			<input type="hidden" value="{{child.id}}" name="parentid">
-			<!-- <input type="button"  id="createsubsection" value="Create Sub"> -->
-		    	<!-- <input type="submit" value="Create Subsection"> -->
-			<!-- <input type="button" value="Reply" id="reply"></br> -->
-			<!-- <input type="button" name="savereply" id="savereply" value="Save Reply"></p></br> -->
-			<input type="button" id="editsubsec" value="Edit"/>
-			<input type="button" id="savesubsec1" value="Save"/>
-			<input type="button" id="subsecorg" value="{{child.content_org}}" style="visibility:hidden;"/>
+			  <input type="hidden" class="reptext" name = "replytosection" id="sectionreply{{child.id}}" style="visibility:hidden;"/></br>
+			  <input type="hidden" value="{{idusr}}" name="idusr">
+			<input type="hidden" value="{{child.id}}" id="hidden{{child.id}}" name="parentid">
+			<input type="button" class="editsubsec" name="{{child.content_org}}" id="{{child.id}}" value="Edit"/>
+			<input type="button" class="savesubsec1" name="{{each.id}}" id="save{{child.id}}"  value="Save" onclick="subsecsave(document.getElementById('hidden{{child.id}}').value)"/>
+			<input type="button" id="subsec{{child.id}}" value="{{child.content_org}}" style="visibility:hidden;"/>
 			<input type="button" id="subsecid" value="{{child.id}}" style="visibility:hidden;"/>	
-			<input type="checkbox" name="del_comment" value="delete_comment">
-        		<input type="submit" value="Delete this Subsection"></br>
+			<input type="hidden" class="editval" id="edit{{child.id}}" name="edit" value="empty"/>
+			<!-- <input type="checkbox" name="del_comment" value="delete_comment"> -->
+        		<!--<input type="submit" value="Delete this Subsection">-->
+			<input type="submit" class="submitsubsec1" id="subsecsubmit{{child.id}}" value="Submit">
 			<form method="post" action="">{% csrf_token %}
 			  <input type="hidden" name="docid" value={{child.id}}>
-			  <input type="text" value="" name="texttags"  />
-			  <input type="submit" value="Add Tags" name="addtags" />
+			  <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">
@@ -57,36 +53,7 @@
 			</form>
 			{% show_commentpage 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 = "replytosection">
-			  	<input type="hidden" value={{child.id}} name = "parentid">
-				<input type="hidden" value={{idusr}} name="idusr">
-			    	<input type="submit" value="Reply to section">
-				<input type="checkbox" name="del_comment" value="delete_comment">
-        			<input type="submit" value="delete this comment">
-				</form>
-				{% show_commentpage 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 = "replytosection">
-			  	<input type="hidden" value={{child.id}} name = "parentid">
-				<input type="hidden" value={{idusr}} name="idusr">
-			    	<input type="submit" value="Reply to section">
-				<input type="checkbox" name="del_comment" value="delete_comment">
-        			<input type="submit" value="delete this comment">
-				</form>
-				{% show_commentpage child idusr flag admin_id attribute%}
-				</li>
-	       	 		{% endifequal %}
-                         {% endifequal %}
-               {% endifequal %}
+        	
        {% endfor %}
 	
 	
diff --git a/gstudio/templates/gstudio/transcript.html b/gstudio/templates/gstudio/transcript.html
index d86810e..d13074f 100644
--- a/gstudio/templates/gstudio/transcript.html
+++ b/gstudio/templates/gstudio/transcript.html
@@ -11,6 +11,7 @@
 <script type="text/javascript">
 			// GLOBALS
 			var grappelli = {},
+
 			// TODO: klemens: drop ADMIN_URL
 			ADMIN_URL = "{% url admin:index %}",
 			MODEL_URL_ARRAY = {% get_content_types %}, DATE_FORMAT = "{% get_date_format %}", TIME_FORMAT = "{% get_time_format %}", DATETIME_FORMAT = "{% get_datetime_format %}";
@@ -31,6 +32,22 @@
 
 
  <script type="text/javascript" >
+			var isWikipage=false;
+			var isSection=false;
+			var isSubsection=false;
+			var editSubsection=false;
+			var editSection=false;
+			var editWikipage=false;
+			var isTwist=false;
+			var isThread=false;
+			var isResponse=false;
+			var editTwist=false;
+			var editThread=false;
+			var editResponse=false;
+			var editImage=false;
+			var isImage=false;
+			var isVideotitle=false;
+			var isNode=false;
       $(window).load(function() {
       $("#content").css({
     "width": "600px"});});
@@ -44,19 +61,40 @@ $(window).load(function() {
 var i = 0;
 jQuery(document).ready(function($) {
     $("#editcontent").click(function(){
+        isImage=true;
         document.getElementById('gnoweditor').style.visibility="visible";
 	 $("#gnoweditor").val($("#editortext").val());
         $("#gnoweditor").orgitdown(mySettings);
-	document.getElementById('save').style.visibility="visible";
+	$("#content img").css({"max-width":"600px",})
+	   
+        
+	<!--document.getElementById('save').style.visibility="visible";-->
 	$("#editcontent").hide();
+        
 		
 	});
+	
      $("#save").click(function(){
             var org_data = $("#gnoweditor").val();       
 	    var encode_data = encodeURIComponent(org_data);
 	    var decode_data = decodeURIComponent(encode_data.replace(/\+/g, " "));
  	    $("#commenttext").val(decode_data);	   
 	});
+    $("#titleeditcontent").click(function(){
+	isVideotitle=true;
+        document.getElementById('gnoweditor').style.visibility="visible";
+	 $("#gnoweditor").val($("#titleeditortext").val());
+        $("#gnoweditor").orgitdown(mySettings);
+	<!--document.getElementById('titlesave').style.visibility="visible";-->
+	$("#titleeditcontent").hide();
+		
+	});
+      $("#titlesave").click(function(){
+      var org_data = $("#gnoweditor").val();       
+      var encode_data = encodeURIComponent(org_data);
+      var decode_data = decodeURIComponent(encode_data.replace(/\+/g, " "));
+      $("#titlecommenttext").val(decode_data);	   
+      })
 });
 </script>
 <script type="text/javascript">
@@ -78,7 +116,15 @@ $('#pandoravideo').pandoravideo();
 <b>Download:</b>&nbsp;&nbsp;<a href={{video.rurl}} target="_blank">Right click to download</a><br/>
 <form method="post" action="">{% csrf_token %}
 <font color='black'>Name:</font>
-<font color='teal'>{{ video.title }}</font><br/>
+<font color='teal'>{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}</font>
+{% if user.is_authenticated %}
+<input type="hidden" name="vidid" value={{video.id}}>
+<input type="button" id="titleeditcontent" name="{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}" value="Edit a title"/>
+<input type="submit" 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="{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}">
+{% endif %}
+<br/>
 <font color = 'black'>Posted By : </font>
 {% for author in video.get_nbh.posted_by %}
   <font color = 'teal'>{{ author }}</font>
@@ -106,22 +152,20 @@ $('#pandoravideo').pandoravideo();
 <br>
  <input type="hidden" name="contentname" value="{{ video.content }}" />
  <input type="hidden" name="ratename" value="{{ video.rating.get_rating }}" />
-<font color = 'black'>Description:</font><font color = 'teal'>
+<font color = 'black'>Description:</font>
 {%autoescape on%}
 {% with video.html_content|safe as video_content %}
      {{video_content}}
 {% endwith %}
-{% endautoescape%}</font>
+{% endautoescape%}
 
-{% for author in video.get_nbh.posted_by %}
-	{% ifequal author user.username %}
+{% if user.is_authenticated %}
 <input type="hidden" name="vidid" value={{video.id}}>
 <input type="button" id="editcontent" name="{{video.content}}" value="Edit"/>
 <input type="submit" class="commentsavecontent" id="save" value="Save" style="visibility:hidden" />
 <input type="hidden" name="contenttext" id="commenttext" style="visibility:hidden" />
 <input type="hidden" id="editortext" style="visibility:hidden" value="{{video.content_org}}">
-	{% endifequal %}
-{% endfor %}
+{% endif %}
 </form>
 <br/>
 
@@ -133,6 +177,7 @@ $('#pandoravideo').pandoravideo();
 <font color = 'black'>Total Number of votes is:  &nbsp;<font color='teal'><b>{{ video.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"/>
@@ -156,6 +201,7 @@ $('#pandoravideo').pandoravideo();
 <input type="text" value="" name="texttags"  />
 <input type="submit" value="Add Tags" name="addtags" />
 </form>
+{% endif %}
 <br/>
 <br/>
 <div class="tags">
diff --git a/gstudio/templates/gstudio/version_diff.html b/gstudio/templates/gstudio/version_diff.html
index 843c3ad..82086e8 100644
--- a/gstudio/templates/gstudio/version_diff.html
+++ b/gstudio/templates/gstudio/version_diff.html
@@ -378,8 +378,8 @@
 </tr>
 <tr><td>
 <form method="get" action="/nodetypes/display/revert" >
-<input type="submit" value="Revert" name="{{ ssid1 }}"></input></td>
-<td><input type="submit" value="Revert" name="{{ ssid2 }}"></input></td>
+<input type="submit" value="Revert to {{ nt.id }}.{{ version_no1 }}" name="{{ ssid1 }}"></input></td>
+<td><input type="submit" value="Revert to {{ nt.id }}.{{ version_no2 }}" name="{{ ssid2 }}"></input></td>
 </form></tr>
 </table>						
 </body>
diff --git a/gstudio/templates/gstudio/video.html b/gstudio/templates/gstudio/video.html
index f88572b..c50b6df 100644
--- a/gstudio/templates/gstudio/video.html
+++ b/gstudio/templates/gstudio/video.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load adminmedia grp_tags %}
 {% load i18n comments gstudio_tags %}
-
+ {% block title %}Videos{% endblock %}
 {% block content %}
 <script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
 <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script>
@@ -21,9 +21,10 @@ $(window).load(function() {
 var i = 0;
 jQuery(document).ready(function($) {
     $("#commenteditor").click(function(){
+        isImage=true;
         document.getElementById('gnoweditor').style.visibility="visible";
         $("#gnoweditor").orgitdown(mySettings);
-	document.getElementById('save').style.visibility="visible";
+	<!--document.getElementById('save').style.visibility="visible";-->
 	$("#commenteditor").hide();
 		
 	});
@@ -74,7 +75,7 @@ background: green;
 }
 </style>
 
-{% if user.is_authenticated %}
+
 
 {% autopaginate vids 10 %}
 
@@ -99,16 +100,22 @@ background: green;
 <input type="submit" name="spe" value="Search by User">
 </form>
 <br>
+{% if user.is_authenticated %}
 <form method="post" action="/gstudio/resources/videos/">
 {% csrf_token %}
 <input type="hidden" name="user" value={{user.username}}>
 <input type="submit" name="fav" value="View Favourites">
 </form>
+{% endif %}
 </div>
+
+{% if user.is_authenticated %}
 <div id="divpost">
 <form enctype="multipart/form-data" method="post" action="">
 {% csrf_token %}
-<p><h4 style="color: black;">Submit Videos:</h4>Video:&nbsp;<input type="file" name="clip" multiple="multiple" /></p><br/>
+<p><h4 style="color: black;">Submit Videos:</h4>
+Title:&nbsp; <input type="text" name="title1"><br/><br/>
+Video:&nbsp;<input type="file" name="clip" multiple="multiple" /></p><br/>
 Description:&nbsp;&nbsp;<input type="button"  id="commenteditor"  value="Add Content" >
 <input type="button" class="commentsavecontent" id="save" value="Save" style="visibility:hidden" />
 <input type=text name="contenttext" id="commenttext" style="visibility:hidden" />
@@ -144,19 +151,27 @@ document.getElementById('headvideo').style.visibility="visible";
 </script>
 </form>
 </div>
+{% endif %}
 </div>
 
+
 <br/>
 <br/>
 <br/>
 <br/>
 <br/>
 <br/>
+{% if reportid %}
+<h2><font color="red">this image is already uploaded on this site</font></h2>
+<a href="/gstudio/resources/images/show/{{ reportid }}/"> <font size="4">to see this image click here</font></a><br/><br/><br/>
+{% endif %}
 <h2 id="headvideo" style="visibility:hidden;">Processing And Uploading Video</h2>
 <div id="showingprocess" style="visibility:hidden;">
 <div id="inner">
 </div>
 </div>
+
+
 {% if fav %}
 <h2 style="color: teal;">Favourite Videos</h2><br/>
 {% else %}
@@ -180,7 +195,7 @@ document.getElementById("divvideo").setAttribute("id","div2");
 }
 
 </script>
-<font size="4">{{video.title}}</font>
+<font size="4">{% if video.title %}{{video.title}}{% else %}{{video.altnames}}{% endif %}</font>
 <form enctype="multipart/form-data" method="post" action="" target="_blank">
 {% csrf_token %}
 <input type="hidden" name = "full" value ={{video.slug}}>
@@ -243,11 +258,7 @@ document.getElementById("divvideo").setAttribute("id","div2");
 
 </div>
 <br>
-{% else %}
- 
-<h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
- 
-{% endif %}
+
 <h2>
 {% paginate %}</h2>
 
-- 
cgit v1.1