Commit 18660b4e authored by Kedar Aitawdekar's avatar Kedar Aitawdekar 💻

conflicts resolved for group create and delete and added funstionality of group restore from trash

parents 768577d8 8630fd50
......@@ -82,11 +82,10 @@ def create_or_update_counter(user_obj, group_id):
## FILES ##
counter_obj['file']['rating_count_received'] = analytics_instance.get_ratings_counts_received_on_files()
counter_obj['page']['blog']['rating_count_received'] = analytics_instance.get_ratings_counts_received_on_notes()
# Get all files uploaded by user
counter_obj['file']['created'] = analytics_instance.get_user_files_count()
# Get all comments posted on files uploaded by user
counter_obj['page']['blog']['comments_gained'] = analytics_instance.get_comments_counts_on_users_files()
counter_obj['file']['comments_gained'] = analytics_instance.get_comments_counts_on_users_files()
# Get all files on which the user has posted a comment
counter_obj['file']['commented_on_others_res'] = analytics_instance.get_other_files_commented_by_user_count()
# Get all unique users who visited files uploaded by user
......@@ -102,6 +101,7 @@ def create_or_update_counter(user_obj, group_id):
## NOTES ##
# Get all notes/blog pages created by user
counter_obj['page']['blog']['rating_count_received'] = analytics_instance.get_ratings_counts_received_on_notes()
counter_obj['page']['blog']['created'] = analytics_instance.get_user_notes_count()
# Get all comments posted on notes created by user
# counter_obj['no_comments_received_on_notes'] = analytics_instance.get_comments_counts_on_users_notes()
......
......@@ -28,12 +28,12 @@ body
}
.jmolImage
{
font-family:arial !important;
border:1px solid #888;
font-family:arial !important;
border:1px solid #888;
}
#myJmol1_Image_app_title
{
background:#eaeaea !important;
background:#eaeaea !important;
}
.outer-container
{
......@@ -57,9 +57,9 @@ body
font-weight:bold;
margin-bottom:10px;
/*background: linear-gradient(#eaeaea, #fff);*/
background:#eaeaea;
background:#71A7DE;
line-height: 40px;
color: #222;
color: white;
font-size:14px;
}
input, select
......@@ -142,8 +142,8 @@ font-weight: normal;
}
.blue-bg
{
background:#eaeaea;
color:#333;
background:#71A7DE ;
color:white;
font-weight:bold;
font-size: 14px;
text-align: center;
......@@ -153,8 +153,8 @@ p
margin-top:0px;
}
#myJmol1_appletinfotablediv {
height: 300px !important;
width: 400px !important;
height: 500px !important;
width: 700px !important;
margin: auto;
max-width: 100%;
}
......@@ -234,7 +234,7 @@ margin:auto;
padding: 20px;
background: #fff;
border-radius: 5px;
width: 30%;
width: 50%;
position: relative;
transition: all 5s ease-in-out;
}
......@@ -257,7 +257,7 @@ margin:auto;
z-index: 10000;
}
.popup .close:hover {
color: #06D85F;
color: red;
}
.popup .content {
max-height: 30%;
......@@ -282,6 +282,27 @@ margin:auto;
font-size:16px !important;
color:#333;
}
.left-20 .popup
{
font-size:12px !important;
font-style: italic;
color:#666;
}
.left-20 .popup img
{
max-width:80%;
}
#popup2 .popup
{
width:80%;
}
#popup3 .popup
{
width:70%;
}
.enlarge
{
text-align:right;
......@@ -337,4 +358,9 @@ margin:auto;
width: 90%;
padding:0px;
}
}
.enlarge h4
{
margin:2px 0px;
padding:0px;
}
\ No newline at end of file
......@@ -514,7 +514,7 @@
{% if user.is_authenticated %}
{% if node.if_file.mime_type %}
{% if not node.collection_set %}
{% if not node.collection_set and "Jsmol" not in node.member_of_names_list%}
<a class="button tiny" title="Click here to Download" href="{% url 'read_file' group_name_tag node download_filename %}" download="{{ download_filename }}">
Download
</a>
......@@ -524,7 +524,7 @@
{% endif %}
{% else %}
{% if node.if_file.mime_type %}
{% if node.if_file.mime_type and "Jsmol" not in node.member_of_names_list %}
{% if 'video' in node.if_file.mime_type %}
<a class="button tiny disabled secondary" title="Please login to download" href="{% url 'auth_login' %}{% if not is_ac_url %}?next={{request.path}}{% endif %}" accesskey="l">
{% else %}
......@@ -629,8 +629,6 @@
{% include "ndf/graph_concept.html" %}
</div>
{% endcomment %}
<div id="view-levels" style="display:none;">
</div>
......@@ -649,6 +647,7 @@
{% include "ndf/graph_dependency.html" %}
</div>
{% endif %}
{% endcomment %}
{% endif %}
<!-- Tab View Map Widget -->
......
......@@ -72,6 +72,7 @@
{% block collection_content %}
{% check_group node.pk as is_group %}
{% comment %}
{% if node.collection_set and not node.if_file.original.relurl and not is_group %}
<div class="show-collection">
<a class=" {% if node.collection_set %}collection-exists{% endif %}" style="width:100%" data-oid="{{node.pk|safe}}">
......@@ -79,6 +80,7 @@
</a>
</div>
{% endif %}
{% endcomment %}
{% if node.collection_set %}
<div id="view_collection">
{% include "ndf/collection_ajax_view.html" %}
......
......@@ -451,8 +451,6 @@ def edit_comment(request, group_id, node_id=None,call_from_discussion=None):
@get_execution_time
def get_thread_comments_count(request, group_id, thread_node_id):
return HttpResponse(node_collection.find({'group_set': group_id,
return HttpResponse(node_collection.find({'group_set': group_id,
'member_of': reply_st._id,
'origin.thread_id':ObjectId(thread_node_id)}).count())
# return HttpResponse(json.dumps(result_set))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment