From 10bd2dd3fcf8d350e3efc84a77fb68b32d4b14fb Mon Sep 17 00:00:00 2001
From: makfire <mukeshpandey15@hotmail.com>
Date: Wed, 8 Jul 2015 15:37:25 +0530
Subject: trash view stablished

---
 gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnowsys-ndf/gnowsys_ndf/ndf/templates')

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html
index 59e9cf3..58b6e0b 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/node_ajax_view.html
@@ -1336,7 +1336,7 @@ ul#navigation li a.last {
         <!-- Delete button if page created by user -->
           {% if node.created_by == request.user.id %}
             {% if node.member_of_names_list.0 == "Page" %}
-              <a class="tiny alert round button" href="{% url 'page_delete' group_name_tag node %}">{% trans "Delete" %}</a>
+              <a class="tiny alert round button" href="{% url 'trash_resource' group_id node %}">{% trans "Delete" %}</a>
             {% elif node.member_of_names_list.0 == "Term" %}
               <a class="tiny alert round button" href="{% url 'term_delete' group_name_tag node %}">{% trans "Delete" %}</a>
             {% endif %}
-- 
cgit v1.1


From 62b7b318060b0bc32aaab0221f55df9d93a94906 Mon Sep 17 00:00:00 2001
From: makfire <mukeshpandey15@hotmail.com>
Date: Wed, 8 Jul 2015 17:33:53 +0530
Subject: deletion flow setupped

---
 .../gnowsys_ndf/ndf/templates/ndf/data_review.html   | 20 ++++++++++++++++++++
 .../ndf/templates/ndf/data_review_table.html         |  6 +++++-
 .../ndf/templates/ndf/data_review_tbody.html         |  6 ++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'gnowsys-ndf/gnowsys_ndf/ndf/templates')

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
index 9fd5dee..26e1d23 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
@@ -824,6 +824,26 @@
 		$drContainer.css("opacity", "1"); 
 	})
 	// ---END of search in the data-review
+	function deleteNode(node_id)
+	{ 
+		a = node_id
+   		alert(a)
+		$.ajax({
+
+			 	url:"{% url 'delete_resource' groupid  %}",
+			 	type:'Get',
+			 	data:{
+			 			'node_id':node_id
+			 	},
+
+			 	success:function(data){
+			 		alert(data)	
+			 	}		
+
+
+		});
+
+	}
 
 // </script>
 {% endblock %}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
index 7313197..8b6c9e5 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
@@ -14,6 +14,7 @@
 			<th class="text-center right-border" colspan="3">Alignment & Level</th>
 			<th class="text-center right-border" colspan="7">Curate</th>
 			<th class="text-center right-border" colspan="3">Advance</th>
+			<th class="text-center right-border" colspan="2">Admin</th>
 			{% if title == "moderation" %}
 				<th class="text-center right-border" colspan="3">Moderation</th>
 			{% endif %}
@@ -65,7 +66,10 @@
 			<th class="expand-width-3">Reading Level</th>
 			<th>Time Required</th>
 			<th class="expand-width-3 right-border">Text Complexity</th>
-
+            <!-- Admin -->
+            
+            <th class="expand-width-3"> Purge </th>
+            <th class="expand-width-3"> Restore </th>
 			<!-- moderation -->
 			{% if title == "moderation" %}
 				<th class="expand-width-2">Discuss</th>
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
index 3c8d8a6..8057b22 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
@@ -291,6 +291,12 @@
 			</option> -->
 		</select>				
 	</td>
+	<td class="deletedata">
+	   	 
+		<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "deleteNode('{{resource.pk}}')"> Delete </div> 
+		<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "restoreNode('{{resource.pk}}')"> restore </div>
+	</td>
+
 
 	{% if title == "moderation" %}
 
-- 
cgit v1.1


From 620bec6e6fafbaa6aa40bcb07898189e94263b94 Mon Sep 17 00:00:00 2001
From: makfire <mukeshpandey15@hotmail.com>
Date: Thu, 9 Jul 2015 16:43:42 +0530
Subject: trash functionality done

---
 .../gnowsys_ndf/ndf/templates/ndf/data_review.html    | 19 ++++++++++++++-----
 .../ndf/templates/ndf/data_review_table.html          | 12 +++++++-----
 .../ndf/templates/ndf/data_review_tbody.html          | 14 +++++++++-----
 .../gnowsys_ndf/ndf/templates/ndf/uDashboard.html     | 11 +++++++++++
 4 files changed, 41 insertions(+), 15 deletions(-)

(limited to 'gnowsys-ndf/gnowsys_ndf/ndf/templates')

diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
index 26e1d23..17fb4b5 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review.html
@@ -824,20 +824,29 @@
 		$drContainer.css("opacity", "1"); 
 	})
 	// ---END of search in the data-review
-	function deleteNode(node_id)
+	function deleteNode(oid)
 	{ 
-		a = node_id
-   		alert(a)
 		$.ajax({
 
 			 	url:"{% url 'delete_resource' groupid  %}",
 			 	type:'Get',
 			 	data:{
-			 			'node_id':node_id
+			 			'node_id':oid
 			 	},
 
 			 	success:function(data){
-			 		alert(data)	
+			 		//updateContent();
+			 		var $resBlankRow = $("tr#blank-row-" + oid);
+						// fetching resource object VIEW row
+					var $resViewRow = $("tr#view-row-" + oid);
+					// fetching resource object EDIT row
+					var $resEditRow = $("tr#edit-row-" + oid);
+
+					$($resEditRow).add($resViewRow).add($resBlankRow).animate({
+							opacity: 0.1
+						}, 1000).fadeOut(1000);
+
+			 		setCurrNoneToEditRow(oid)
 			 	}		
 
 
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
index 8b6c9e5..bf1807d 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_table.html
@@ -1,6 +1,5 @@
 {% load cache %}
 
-
 <table id="data-review-table" style="width:auto">
 <!-- <table> -->
 
@@ -14,7 +13,9 @@
 			<th class="text-center right-border" colspan="3">Alignment & Level</th>
 			<th class="text-center right-border" colspan="7">Curate</th>
 			<th class="text-center right-border" colspan="3">Advance</th>
-			<th class="text-center right-border" colspan="2">Admin</th>
+			{% if user.is_superuser %}
+				<th class="text-center right-border" colspan="2">Admin</th>
+			{% endif %}
 			{% if title == "moderation" %}
 				<th class="text-center right-border" colspan="3">Moderation</th>
 			{% endif %}
@@ -67,9 +68,10 @@
 			<th>Time Required</th>
 			<th class="expand-width-3 right-border">Text Complexity</th>
             <!-- Admin -->
-            
-            <th class="expand-width-3"> Purge </th>
-            <th class="expand-width-3"> Restore </th>
+            {% if user.is_superuser %}
+	            <th class="expand-width-3"> Purge </th>
+	            <th class="expand-width-3"> Restore </th>
+	        {% endif %}    
 			<!-- moderation -->
 			{% if title == "moderation" %}
 				<th class="expand-width-2">Discuss</th>
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
index 8057b22..d1d5314 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/data_review_tbody.html
@@ -291,11 +291,15 @@
 			</option> -->
 		</select>				
 	</td>
-	<td class="deletedata">
-	   	 
-		<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "deleteNode('{{resource.pk}}')"> Delete </div> 
-		<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "restoreNode('{{resource.pk}}')"> restore </div>
-	</td>
+	{% if user.is_superuser %}
+		<td class="deletedata">
+		   	 
+			<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "deleteNode('{{resource.pk}}')"> Delete </div> 
+		</td>
+		<td>
+			<div class="button tiny exapnd" id = "{{resource.pk}}" onclick = "restoreNode('{{resource.pk}}')"> restore </div>
+		</td>
+	{% endif %}
 
 
 	{% if title == "moderation" %}
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html
index 0dc035b..9923444 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/uDashboard.html
@@ -44,6 +44,10 @@
   .img-height {
     height: 100%;
   }
+  .fi-trash{
+        color:orange;
+
+  }
 
   .div-height {
     margin-bottom: 0.5em; 
@@ -127,12 +131,19 @@
             {% trans "Files uploaded" %}: &nbsp;{{file_count}}<br>
             {% trans "Quiz" %}: {{quiz_count}}<br> 
             {% trans "Forum" %}: {{forum_count}}<br>
+            
         <!--    FOR AWARDS  -->  
         <!-- {% if page_count > 1 %}  
             <img src="/static/ndf/images/close.png">
             {% endif %}     -->      
           </h5>
       </div>
+
+      {% if user.is_superuser %}
+        <div class"trashdiv" style="position:absolute; float:right; right:11%; top:2%;">
+          <a href="/Trash/data-review" > <h5>  <span class = "fi-trash"> </span> <b >  Trash </b> </h5> </a>
+        </div>
+      {% endif %}  
     </div>
     
     <br/>
-- 
cgit v1.1