all modules integrated

4 files changed, 198 insertions, 84 deletions

diff --git a/gstudio/templates/metadashboard/grpdashboard.html b/gstudio/templates/metadashboard/grpdashboard.html
index f6cb6c0..6ad36ac 100644
--- a/gstudio/templates/metadashboard/grpdashboard.html
+++ b/gstudio/templates/metadashboard/grpdashboard.html
@@ -1,18 +1,24 @@
 {% extends "gstudio/base.html" %}
 {% load gstudio_tags %}
-{% load i18n %}
-{% block content %}
+{% load pagination_tags %}
+{% load adminmedia grp_tags %}
+{% load i18n comments gstudio_tags %} 
+{% load tagging_tags comments i18n %}
 
+{% block content %}
 <script src="http://code.jquery.com/jquery-latest.js"></script>
     <script type="text/javascript" >
       $(window).load(function() {
       $("#content").css({
-    "width": "1000px",});});
+    "width": "620px",});});
 $(window).load(function() {
  $("#chart").hide();});
 $(window).load(function() {
  
- $("#graphcss").hide();   
+ $("#graphcss").hide();
+$(".savecontent").hide();   
+$(".submitresponse").hide();
+$("#editthreadsave").hide();
   });
 var i=0;
 </script>
@@ -27,40 +33,83 @@ var i=0;
 }
 </style>
 
-{% if user.is_authenticated %}
+
 <!--   <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/{{user.username}}');">
   <h>Hello Welcome to the {{ meet_ob.title }}</h></br> -->
-	<h3> {{admin_m.username}}'s initial twist to the thread</h3>
+	<font size ="3" > {{admin_m.username}}'s initial twist to the thread</font>
 
   <!--  <h>You are logged in as <font color="blue">{{user.username}}</font></h> -->
          </br>
-   {%if flag %}
-   <div id="Release">
+  
+<h2>{{meet_ob.title}}</h2>
+{% with meet_ob.html_content|safe as meet_ob_content %}
+<font size ="3" >{{meet_ob_content}} </font>
+{% endwith %}
+{% if user.is_authenticated %}
+<form method="post" action=".">{% csrf_token %}
+<input type="hidden" id="threadid" value={{meet_ob.id}} style="visibility:hidden;" name="editiden">
+<input type="hidden" id="threadedit{{meet_ob.id}}" style="visibility:hidden;" name="editval">
+<input type="hidden" id="threadcontent{{meet_ob.id}}" value="{{meet_ob.content_org}}" style="visibility:hidden;" name="editcont">
+<input type="button" id="threadorg" value={{meet_ob.title}} style="visibility:hidden;" name="edittitle">
+<br/>
+<input type="button" id="threadedit" value="Edit">
+<input type="button" id="editthreadsave" value="Save">
+<input type="submit" id="subeditresp" value=Submit" style="visibility:hidden;"></br>
+</form>
+
+
+{% if flag %}
+{% check_release meet_ob as release %}
+{% if not release %}
+   <div id="Release"> 
    <form method="post" action=".">{% csrf_token %}
-   <input type="submit" value="Release Replies">
+   <input type="submit" value="Release responses">
        <input type="hidden" value="hits" name = "release">
    </form>
    </div>
+{% else %}
    <div>
    <form method="post" action=".">{% csrf_token %}
-   <input type="submit" value="Block Replies">
+   <input type="submit" value="Block responses">
        <input type="hidden" value="hits" name = "block">
    </form>
    </div>
    {% endif %}
    </br>
+{% endif %}
 
+ <form method="post" action="">{% csrf_token %}
+       	 <input type="hidden" name="docid" value={{meet_ob.id}}>
+       	 <input type="text" class="tagtext" value="" name="texttags"  />
+       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
+       </form>
+	
+       <br>
+       <div class="tags">
+       	 <p class="gbobject-tags span-16 last">
+       	   <strong>{% trans "Tags" %}</strong> :
+       	   {% tags_for_object ot as tag_list %}
+       	   {% for tag in tag_list %}
+       	   <a href="{% url objectapp_tag_detail tag %}"
+              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
+       	   {% empty %}
+       	   <span>{% trans "No tags" %}</span>
+       	   {% endfor %}
+       	 </p>
+       </div>
 
+	<br/>
 	<form method="post" action=".">{% csrf_token %}
       <!--  <input type="hidden" value="{{meet_ob.id}}" name = "meetid">-->
-	<input type="button" value="Add your twist" onClick="location.href=parseURL('topicadd1/{{meet_ob.id}}');">
+	<input type="button" id="twistaddbtn" value="Add your twist" onClick="location.href=parseURL('topicadd1/{{meet_ob.id}}');">
         </form>
-<!-- direct link to identica
+{% endif %}
+<!-- direct link to identica 
 <a href="http://www.addtoany.com/add_to/identi_ca?linkurl=ur url&linkname={{post}} via" ><img src="http://www.tildehash.com/identishare/share.png" ></img></a>
-
+-->
 <!-- Twitter syndicating button 
 <a href="https://twitter.com/share" class="twitter-share-button"  data-url="https://127.0.0.1:8000/chat/" data-via="{{user.title}}" data-lang="en" data-text="{{post}}" data-related="anywhereTheJavascriptAPI" data-count="none">Tweet</a>
-
+-->
 <!-- Diaspora syndicating button 
 <script type="text/javascript" src="https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael-min.js"></script>
 <input id="diasporacontent" value="{{post}}" type="hidden" name="diaspora"></input>
@@ -70,7 +119,7 @@ var i=0;
 -->
 </br>   {% autoescape off %}
    {% for each in topic %}
-      	<h4><font size="5" color="red">{{each.title}}</font></h4>
+      	<h4><font size="5" >{{each.title}}</font></h4>
       		Posted on : {{each.creation_date}}
 		by : 
    		{% for author in each.authors.all %} 
@@ -79,22 +128,38 @@ var i=0;
      		<!-- Current rating is <h5>{{ each.rating.get_rating }}</h5> -->
    	{%autoescape on%}
 		{% with each.html_content|safe as each_content %}
-		<font color="green"> {{each_content}} </font>
+		<font size ="3" > {{each_content}} </font>
 		{% endwith %}
 	{% endautoescape%}
+	<div>
 	<form method="post" action=".">{% csrf_token %}
                 
-    		<input type="text" class="reptext" name = "reply" style="display:none">
+    		<input type="hidden" class="reptext" id="topictext{{ each.id }}" name = "reply" style="display:none">
+	<input type="hidden" id="hidden{{ each.id }}" value="{{ each.id }}" name ="hiddenid">
+		 <input type="hidden" id="commentdata{{each.id}}" value="{{each.content_org}}">
+	        <input type="hidden" value={{user.username}} name = "usr">
     		<input type="hidden" value="{{each.id}}" name = "iden">
 	    	<input type="hidden" value="{{user.id}}" name = "idusr">
-<br/><br/><br/>
-		 <input type="button" class="editor" id="{{each.id}}"  value="Add a Fiber">
-                <input type="button" class="savecontent" id="{{each.id}}"  value="Save">
-
-	        <input type="submit" value="Submit"></br>
-		<input name="del_topic" type="checkbox" value="delete_topic"/>
-  		<input type="submit" value="Delete the twist"></br>
+<br/>			{% if user.is_authenticated %}
+		 <input type="button" class="editor" id="{{ each.id }}" value="Add Response"/>
+		 <input type="hidden" class="editval" id="edit{{each.id}}" name="edit" value="empty">
+                <input type="button" class="savecontent" id="save{{ each.id }}" value="Save" onclick="topicsaveclick(document.getElementById('hidden{{ each.id }}').value)"><br/>
+               <input type="button" class="editcontent" name="{{each.content_org}}"  id="{{each.id}}" value="Edit">
+	        <input type="submit" class="submitresponse" id="topicsubmit{{ each.id }}" value="Submit"></br>
+			{% endif %}
+		{% ifequal user.id admin_id %}		
+		<input class="topicchk" id="chk{{ each.id }}" name="del_topic" type="checkbox" value="delete_topic"/>
+		<input type="submit" class="topicdelete" id="delete{{ each.id }}" value="Delete the twist"></br>
+		{% else %}
+   		{% for author in each.authors.all %} 
+   			{% ifequal user.id author.id %}
+		<input class="topicchk" id="chk{{ each.id }}" name="del_topic" type="checkbox" value="delete_topic"/>
+		<input type="submit" class="topicdelete" id="delete{{ each.id }}" value="Delete the twist"></br>
+			{% endifequal %}
+   		{% endfor %}
 
+		{% endifequal %}
+  
          <!--	Rate this ? </br>
 		<input name="star1" type="radio" value=1 class="star"/>
 		<input name="star1" type="radio" value=2 class="star"/>
@@ -104,9 +169,32 @@ var i=0;
 		<!--topic id and user id hidden fields
 		</br>
 		<input type="submit" value="Rate it!!!">  -->
-         </form>   
+         </form>
+	</div>   
+	{% if user.is_authenticated %}
+ <form method="post" action="">{% csrf_token %}
+       	 <input type="hidden" name="docid" value={{each.id}}>
+       	 <input type="text" class="tagtext" value="" name="texttags"  />
+       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
+       </form>
+	
+       <br>
+       <div class="tags">
+       	 <p class="gbobject-tags span-16 last">
+       	   <strong>{% trans "Tags" %}</strong> :
+       	   {% tags_for_object each as tag_list %}
+       	   {% for tag in tag_list %}
+       	   <a href="{% url objectapp_tag_detail tag %}"
+              title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
+       	   {% empty %}
+       	   <span>{% trans "No tags" %}</span>
+       	   {% endfor %}
+       	 </p>
+       </div>
+	{% endif %}
+	<br/>
         <p>
-	 Fibers :
+	 Responses :
 	<!--	<div id="main">
 	<div id="sidetree">
 	<div class="treeheader">&nbsp;</div>
@@ -118,8 +206,6 @@ var i=0;
 	The discussion freezes at {{endtime}}
 {% endautoescape %}
 
-{% else %}
-  <h1> <p style = "color :red;">OOPS!!! Login Please!</p></h1>
-{% endif %}
+
 {% endblock %}
 
diff --git a/gstudio/templates/metadashboard/pgedashboard.html b/gstudio/templates/metadashboard/pgedashboard.html
index f06063a..1e48755 100644
--- a/gstudio/templates/metadashboard/pgedashboard.html
+++ b/gstudio/templates/metadashboard/pgedashboard.html
@@ -16,7 +16,7 @@
     <script type="text/javascript" >
       $(window).load(function() {
       $("#content").css({
-    "width": "500px",});});
+    "width": "1000px",});});
 $(window).load(function() {
  $("#chart").hide();});
 $(window).load(function() {
@@ -25,16 +25,22 @@ $(window).load(function() {
   });
 $(window).load(function() {
  
- $("#savepagecontent").hide();
+ $(".savepagecontent").hide();
  $("#saveseccontent").hide();
  $("#savesubsec").hide();
  $("#savesubsec1").hide();
-
+ $(".submitresponse").hide();
+ $(".saveseccontent").hide();
+ $(".savesubsec").hide();
+ $(".submitsubsec").hide();
+ $(".pagedit").hide()
+$(".savesubsec1").hide();
+ $(".submitsubsec1").hide();
   });
 
 </script>
 
-{% if user.is_authenticated %}
+
 {% autopaginate section 1 %}
    <!-- <input type="button" value="Home" onClick="location.href=parseURL('/gstudio/user/wikipage/{{user.username}}');"> -->
    <h1>{{ page_ob.title }}</h1> 
@@ -44,41 +50,51 @@ $(window).load(function() {
    		{% endfor %}</br></br>
 
    {% with page_ob.html_content|safe as page_ob_content %}
-	
-                  {{page_ob_content}}
+   <font size="3"> 
+                {{page_ob_content}}</font>
    {% endwith %}
-
-	<input type="button" id="editpagecontent" value="Edit"/>
-	<input type="button" id="savepagecontent" value="Save"/></br>
+	{% if user.is_authenticated %}
+	<form method="post" action="">{% csrf_token %}
+	<input type="hidden" class="reptext" name="replytosection" id="sectionreply" style="visibility:hidden;"/></br>
+	<input type="hidden" class="editval" name="edit" value="empty"/>
+	<input type="hidden" value="{{page_ob.id}}" name = "iden">
+	<input type="hidden" value="{{user.username}}" name ="usr">
+	<input type="hidden" value="{{user.id}}" name = "idusr">
+	<input type="button" class="editpagecontent" name="{{page_ob.content_org}}" value="Edit"/>
+	<input type="button" class="savepagecontent" name="{{page_ob.id}}" value="Save"/></br>
+	<input type="submit" class="pagedit" value="Submit"/>
+       </form>
+	
        <form method="post" action="">{% csrf_token %}
-	 <input type="hidden" name="docid" value={{page_ob.id}}>
-	 <input type="text" value="" name="texttags"  />
-	 <input type="submit" value="Add Tags" name="addtags" />
+       	 <input type="hidden" name="docid" value={{page_ob.id}}>
+       	 <input type="text" class="tagtext" value="" name="texttags"  />
+       	 <input type="submit" class="tag" value="Add Tags" name="addtags" />
        </form>
+	{% endif %}
        <br>
        <div class="tags">
-	 <p class="gbobject-tags span-16 last">
-	   <strong>{% trans "Tags" %}</strong> :
-	   {% tags_for_object ot as tag_list %}
-	   {% for tag in tag_list %}
-	   <a href="{% url objectapp_tag_detail tag %}"
+       	 <p class="gbobject-tags span-16 last">
+       	   <strong>{% trans "Tags" %}</strong> :
+       	   {% tags_for_object ot as tag_list %}
+       	   {% for tag in tag_list %}
+       	   <a href="{% url objectapp_tag_detail tag %}"
               title="Tag {{ tag }}" rel="tag">{{ tag }}</a>
-	   {% empty %}
-	   <span>{% trans "No tags" %}</span>
-	   {% endfor %}
-	 </p>
+       	   {% empty %}
+       	   <span>{% trans "No tags" %}</span>
+       	   {% endfor %}
+       	 </p>
        </div>
-	<input type="button" id="pageid" value="{{page_ob.id}}" style="visibility:hidden;"/>
-	<input type="button" id="pageorg" value="{{page_ob.content_org}}" style="visibility:hidden;"/>
+	</br>
+		{% if user.is_authenticated %}
 	<form method="post" action=".">{% csrf_token %}
 	<input type="button" id="newsection1"  value="Add a new Section" onClick="location.href=parseURL('sectionadd1/{{page_ob.id}}');">
 	<input type="hidden" id="pageid1" value="{{page_ob.id}}"/>
         </form>
-
+	{% endif %}
 </br>   {% autoescape off %}
 
    {% for each in section %}
-      	<h4><font size="5" color="red">{{each.title}}</h4></font>   
+      	<h4><font size="6">{{each.title}}</h4></font>
 	  Posted on : {{each.creation_date}}
 	  by {% for author in each.authors.all %} 
 	  {{author}}
@@ -90,16 +106,27 @@ $(window).load(function() {
 	{% endifequal %}
    	{%autoescape on%}
 	 {% with each.html_content|safe as each_content %}
-		{{each_content}}
+	<font size="3"> 
+		{{each_content}}</font>
 	{% endwith %}
 	{% endautoescape%}
-	<input type="button" id="editseccontent" value="Edit"/>
-	<input type="button" id="saveseccontent" value="Save"/>
+		{% if user.is_authenticated %}
+	<form method="post" action="">{% csrf_token %}
+	<input type="hidden" class="reptext" name = "replytosection" id="sectionreply" style="visibility:hidden;"/></br>
+	<input type="hidden" value="{{each.id}}" name = "iden">
+	<input type="hidden" value="{{user.username}}" name ="usr">
+	<input type="hidden" value="{{user.id}}" name = "idusr">
+	<input type="hidden" class="editval" name="edit" value="empty"/>
+	<input type="button" class="editseccontent" name="{{each.content_org}}" value="Edit"/>
+	<input type="button" class="saveseccontent" name="{{each.id}}" value="Save"/>
+	<input type="submit" class="submitresponse" value="Submit"/>
+       </form>
        <form method="post" action="">{% csrf_token %}
 	 <input type="hidden" name="docid" value={{each.id}}>
-	 <input type="text" 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">
@@ -113,20 +140,22 @@ $(window).load(function() {
 	   {% endfor %}
 	 </p>
        </div>
-
-	<input type="button" id="sectionorg" value="{{each.content_org}}" style="visibility:hidden;"/>
-	<input type="button" id="sectionid" value="{{each.id}}" style="visibility:hidden;"/>	
+		{% if user.is_authenticated %}
 	<form method="post" action=".">{% csrf_token %}<br/>
         	 Create Subsection:
-	        <input type="text" name = "replytosection" id="sectionreply" style="visibility:hidden;"/></br>
+	        <input type="hidden" name = "replytosection" class="reptext" style="visibility:hidden;"/></br>
     		<input type="hidden" value="{{each.id}}" name = "iden">
+		<input type="hidden" value="{{user.username}}" name ="usr">
 	    	<input type="hidden" value="{{user.id}}" name = "idusr">
-		<input type="button" value="Create Subsection" id="createsubsection">
-		<input type="button" value="save" id="savesubsec">
-		<input type="submit" id="submitsubsec" value="submit" style="visibility:hidden;"></br>
+		<input type="button" value="Create Subsection" class="createsubsection">
+ 		<input type="hidden" value="empty" name = "edit" class="editval"/>
+
+		<input type="button" value="save" class="savesubsec" name="{{each.id}}">
+		<input type="submit" class="submitsubsec" value="Submit" ></br>
 
-	       </br></br><input name="del_section" type="checkbox" value="delete_section"/> 
-  		<input type="submit" value="Delete the section"></br> 
+	       </br></br><input name="del_section" class="chkbox" type="checkbox" value="delete_section"/> 
+  		<input type="submit" class="deletesec" value="Delete the section"></br>
+		<div id="rating">
          	Do you wanna rate it ? </br>
 		<input name="star1" type="radio" value=1 class="star"/>
 		<input name="star1" type="radio" value=2 class="star"/>
@@ -134,9 +163,12 @@ $(window).load(function() {
 		<input name="star1" type="radio" value=4 class="star"/>
 		<input name="star1" type="radio" value=5 class="star"/>
 		<!--topic id and user id hidden fields-->
-		</br>
+		
 		<input type="submit" value="Rate it!!!">
+		</div>
          </form>
+	{% endif %}
+	</br>
         <p>
 	 Subsections :
 	<!-- <div id="main"> -->
@@ -149,9 +181,6 @@ $(window).load(function() {
      {% endfor %}
 {% endautoescape %}
 
-{% else %}
-  <h1> <p style = "color :red;">OOPS!!! Login Please!</p></h1>
-{% endif %}
 
 {% block nodetype-comments %}
 <div id="comments" class="">
diff --git a/gstudio/templates/metadashboard/userdashboard.html b/gstudio/templates/metadashboard/userdashboard.html
index a8342b1..c12c122 100644
--- a/gstudio/templates/metadashboard/userdashboard.html
+++ b/gstudio/templates/metadashboard/userdashboard.html
@@ -4,22 +4,21 @@
 {% block content %}
 
 
-{% if user.is_authenticated %}
+
 <!--    <h> Welcome to the  GnowledgeStudio</h></br>
    <h>You are logged in as <font color="blue">{{user.username}}</font></h>
     <p></br> -->
-<p> On the loom now:</p>
+<p><font size ="3" > On the loom now:</font></p>
 </br>
     {% for each in meetings.member_systems.all %}
-    <a href="/gstudio/group/gnowsys-grp/{{each.id}}/">{{each.title}}</a></br>
+    <font size ="3" ><a href="/gstudio/group/gnowsys-grp/{{each.id}}/">{{each.title}}</a> </font></br>
     {% endfor %}
+{% if user.is_authenticated %}
     <input type="button" value="Want to weave a thread?" onClick="location.href=parseURL('groupadd/');">
-    </p>
-    <p>
-    </br>
-{% else %}
-  <h1> <p style = "color :black;">Please Login</p></h1>
 {% endif %}
+ 
+    </br>
+
 
 
 
diff --git a/gstudio/templates/metadashboard/wikidashboard.html b/gstudio/templates/metadashboard/wikidashboard.html
index 8b9d15e..1af53ce 100644
--- a/gstudio/templates/metadashboard/wikidashboard.html
+++ b/gstudio/templates/metadashboard/wikidashboard.html
@@ -4,20 +4,20 @@
 {% block content %}
 
 
-{% if user.is_authenticated %}
+
   
 <p> Here is a list of all the pages:</p>
 </br>
     {% for each in pages.member_systems.all %}
     <a href="/gstudio/page/gnowsys-page/{{each.id}}/">{{each.title}}</a></br>
     {% endfor %}
+	{% if user.is_authenticated %}
     <input type="button" value="Create a new page" onClick="location.href=parseURL('pageadd/');">
+	{% endif %}
     </p>
     <p>
     </br>
-{% else %}
-  <h1> <p style = "color :black;">OOPS!!! Login Please!</p></h1>
-{% endif %}
+