Wikipage added to gstudio

6 files changed, 166 insertions, 7 deletions

diff --git a/gstudio/templates/gstudio/NewPage.html b/gstudio/templates/gstudio/NewPage.html
new file mode 100644
index 0000000..541554b
--- /dev/null
+++ b/gstudio/templates/gstudio/NewPage.html
@@ -0,0 +1,30 @@
+{%extends "gstudio/base.html"%}
+{%load i18n %}
+{% block content  %}
+{%if user.is_authenticated%}
+{% if errors %}
+<ul>
+{% for error in errors %}
+<li><font color="red">{{ error }} </font></li>
+{% endfor %}
+</ul>
+{% endif %}
+<form action="" method="post">
+{% csrf_token %}
+
+<p>Name of the Page: <input type="text" name="subject"></p>
+<textarea name="page" id="pagecontent" rows="10" cols="50" style="display:none;"></textarea></p>
+
+<p><textarea name="org1" id="orgpage1" rows="10" cols="50" style="display:none;" ></textarea></p></br>
+<input type="button" id="pagecontent1" name="content" value="Add Content"/>
+<input type="button" name="savepage" id="save" value="Save Page"></p>
+</br>
+<input type="hidden" value={{user.id}} name = "idusr">
+<input type="submit" value="Submit">
+</form>
+{%else%}
+<p> Sorry! Login To proceed </p>
+
+{%endif%}
+{% endblock %}
+
diff --git a/gstudio/templates/gstudio/NewSection1.html b/gstudio/templates/gstudio/NewSection1.html
new file mode 100644
index 0000000..75db8a2
--- /dev/null
+++ b/gstudio/templates/gstudio/NewSection1.html
@@ -0,0 +1,26 @@
+
+{% extends "gstudio/base.html" %}
+{% block content %}
+<h1>Add a new Section</h1>
+{% if errors %}
+<ul>
+{% for error in errors %}
+<li><font color="red">{{ error }} </font></li>
+{% endfor %}
+</ul>
+{% endif %}
+
+<form action="" method="post">{% csrf_token %}
+<p>Title: <input type="text" name="subject"></p>
+<textarea name="page" id="pagecontent" rows="10" cols="50" style="display:none;"></textarea></p>
+<p><textarea name="org" id="orgpage" rows="10" cols="50" style="display:none;"></textarea></p>
+</br></br>
+
+<input type="button" id="addcontent" name="content" value="Add Content"/>
+<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="submit" value="Submit">
+</form>
+
+{% endblock %}
diff --git a/gstudio/templates/gstudio/_header.html b/gstudio/templates/gstudio/_header.html
index 08fdab2..4b2b075 100644
--- a/gstudio/templates/gstudio/_header.html
+++ b/gstudio/templates/gstudio/_header.html
@@ -17,6 +17,7 @@
 	{% if user.is_staff %}
         | <a href="{{  get_absolute_url }}/gstudio/user/{{user.username}}" title="MyBoard">Gnowledge Studio</a>
 	| <a href="{{  get_absolute_url }}/gstudio/resources/documents" title="My Documents">Documents</a>
+        | <a href="{{  get_absolute_url }}/gstudio/user/wikipage/{{user.username}}" title="MyWiki">Wikipage</a>
         | <a href="{{  get_absolute_url }}/gstudio/resources/images" title="Images">Images</a>
         | <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>
diff --git a/gstudio/templates/gstudio/nodetype_detail.html b/gstudio/templates/gstudio/nodetype_detail.html
index 95cf45b..73db903 100644
--- a/gstudio/templates/gstudio/nodetype_detail.html
+++ b/gstudio/templates/gstudio/nodetype_detail.html
@@ -214,7 +214,7 @@
                             <b>
 					Content:<nbsp>
 				
-				          <input type="button" id="editdata" value="Edit Content"/><ndsp><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}}"/>
@@ -223,8 +223,10 @@
 
 					{% else %}
 						<b>
-					Content:<nbsp> <input type="button"id="editdata" value="Edit Content"/><ndsp><nbsp>
-					  <input type="hidden" id="objectid" value="{{object.id}}"/>
+					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}}"/>
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 8f5c30d..9ce6188 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -51,9 +51,9 @@
 				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); -->
+<!-- } -->
 .orgitdown .orgitdownButton2 a {
 	background-image:url(/static/gstudio/js/orgitdown/orgitdown/sets/default/images/bold.png);
 }
@@ -104,7 +104,7 @@
 	background:#FFF url(/static/gstudio/js/orgitdown/orgitdown/skins/orgitdown/images/bg-container.png) repeat-x top left; 
 	padding:5px 5px 2px 5px;
 	font:11px Verdana, Arial, Helvetica, sans-serif;
-        margin-left:450px;
+        margin-left:640px;
         width:450px;
         margin-top:30px;
 }
@@ -285,6 +285,31 @@
 	<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>
+	<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/addcontent.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/updatepage.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/addcontent.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/updatesection.js"></script> -->
 
 	<!-- EXTRAHEAD -->
 	
diff --git a/gstudio/templates/gstudio/tags/commentpage.html b/gstudio/templates/gstudio/tags/commentpage.html
new file mode 100644
index 0000000..a998a7f
--- /dev/null
+++ b/gstudio/templates/gstudio/tags/commentpage.html
@@ -0,0 +1,75 @@
+
+
+
+
+{% load gstudio_tags %}
+{% load i18n %}
+
+
+
+{% 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}}
+			<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="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="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">
+			</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 %}
+	
+	
+{% endfor %}
+</ul>
+{% endif %}
+
+