Skip to content
Browse files

Merge pull request #76 from Dhiru/master

document, video, and image libraries changes by dhiru
  • Loading branch information...
2 parents 3c6b520 + a579626 commit a5c1dad5b181efa075dd545b818d38b63a292765 @gnowgi committed Aug 3, 2012
View
2 buildout.cfg
@@ -13,7 +13,7 @@ parts = django
patch-nosedjango
develop = .
eggs = django
- django-gstudio
+ gnowsys-studio
django-tagging
django-bitly
django-xmlrpc
View
5 demo/settings.py
@@ -34,11 +34,12 @@
MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img')
MEDIA_ROOTNEW2 = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img')
MEDIA_ROOTNEW3 = os.path.join(os.path.dirname(__file__), '../gstudio/static/gstudio/documents')
-MEDIA_ROOTNEW = os.path.join(os.path.dirname(__file__), '../media')
+MEDIA_ROOTNEW = os.path.join(os.path.dirname(__file__), '../demo/media')
#MEDIA_ROOT = '/static'
#MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../gstudio/static')
PYSCRIPT_URL_GSTUDIO = os.path.join(os.path.dirname(__file__), '../gstudio/createhtml.py')
PYSCRIPT_URL_OBJECTAPP = os.path.join(os.path.dirname(__file__), '../objectapp/createhtml.py')
+VIDEO_PANDORA_URL = os.getenv("HOME")+"/.ox/client.json"
FILE_UPLOAD_MAX_MEMORY_SIZE= 524288000
JPEG_ROOT = None
@@ -98,6 +99,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
+ 'pagination.middleware.PaginationMiddleware',
)
ROOT_URLCONF = 'demo.urls'
@@ -148,6 +150,7 @@
'fourstore',
'HTTP4Store',
'html5lib',
+ 'pagination',
# Uncomment the south entry to activate south for database migrations
# Please do install south before uncommenting
# command: sudo pip install south
View
2 gstudio/models.py
@@ -855,7 +855,7 @@ def get_at_url_add(self):
fl=1
"""
fl=0 means, Attribute for AT is not added, now show it as to be added
- " " "
+ """
if fl==0:
retats[each.title]=aturl
View
101 gstudio/templates/gstudio/docu.html
@@ -1,37 +1,77 @@
+
<html>
+
<body>
{% extends "gstudio/base.html" %}
-{% load i18n %}
+{% load pagination_tags %}
{% load adminmedia grp_tags %}
+{% load i18n comments gstudio_tags %}
+{% load i18n objectapp_tags %}
{% 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" >
+ $(window).load(function() {
+ $("#content").css({
+ "width": "600px",});});
+$(window).load(function() {
+ $("#chart").hide();});
+$(window).load(function() {
+
+ $("#graphcss").hide();
+ });
+var i = 0;
+</script>
+<style type="text/css">
+#divpost
+{
+position:relative;
+}
+#divsearch
+{
+position:absolute;
+margin-left:61%;
+margin-top:-26%;
+}
+</style>
{% if user.is_authenticated %}
-<h1 style="color: teal;">Welcome to the DocZilla</h1>
-<p><img id="zoomable" src="{% admin_media_prefix %}img/docs.png" width="250" height="250" alt="{{ image.title }}" class="left" /></p>
-<h2>Logged in as: {{user.username}}</h2>
+{% autopaginate documents 8 %}
+<h2 style="color: teal;">Document Library</h2>
<br>
-<form enctype="multipart/form-data" method="post" action="">
-{% csrf_token %}
-<h4 style="color: black;">Post File:</h4>
-<p><input type=file name="doc[]" multiple="multiple" /></p>
-<input type="hidden" name="user" value={{user.username}}>
+<div id="divpost">
+<form enctype="multipart/form-data" method="post" action="">{% csrf_token %}
+<br/>
+Post File:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type=file name="doc[]" multiple="multiple" /><br><br>
+Description:&nbsp;&nbsp;<input type=textarea name="contenttext"/>
+<input type="hidden" name="user" value={{user.username}}><br><br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<input type="submit" value="Post">
</form>
-<br>
+</div>
+
+<div id="divsearch">
<form method="post" action="">
{% csrf_token %}
+<br/>
<h4 style="color: black;">Search File</h4>
-<p><input type="text" name="sdoc" value={{val}}></p>
-<h4 style="color: black;">Sort files by:</h4>
-<p><div align="center">
-<select name="mydropdown">
+<input type="text" name="sdoc" value={{val}}>&nbsp;
+<br/>
+<br/>
+<select name="mydropdown" style="margin:0">
<option value="title">Title</option>
<option value="creation_date">Creation Date</option>
</select>
-</div>
+<br/>
+<br/>
<input type="submit" value="Search">
</form>
+</div>
+<br>
+<br>
<br>
-<h4 style="color: teal;">SHARE</h4>
+<br>
+<h4 style="color: teal;">Documents Listing</h4>
{% for document in documents %}
@@ -46,6 +86,8 @@ <h2 style="color: green;">{{document.title}}</a></h2>
<br>
<font color = 'black'>Posted At : </font><font color = 'teal'>{{document.creation_date}}</font>
<br>
+<font color = 'black'>Description:</font><font color = 'teal'>{{ document.content }}</font>
+<br>
<a href="{% admin_media_prefix %}img/{{document.title}}">Download now!!</a>
<br>
{% for author in document.authors.all %}
@@ -89,8 +131,26 @@ <h2 style="color: green;">{{document.title}}</a></h2>
</br>
<input type="hidden" name="docid" value={{document.id}}>
<input type="submit" value="Rate it!!!">
+</form><br>
+<form method="post" action="">{% csrf_token %}
+<input type="hidden" name="docid" value={{document.id}}>
+<input type="text" value="" name="texttags" />
+<input type="submit" value="Add Tags" name="addtags" />
</form>
<br>
+<div class="tags">
+ <p class="gbobject-tags span-16 last">
+ <strong>{% trans "Tags" %}</strong> :
+ {% tags_for_object document 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/>
<hr width="100%" style="height:5px;" color="black"/>
<br>
{% endfor %}<br>
@@ -102,6 +162,13 @@ <h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
{% endif %}
-
+ <h2>
+{% paginate %}</h2>
+
+
+
+
+
{% endblock %}
+
</body>
View
127 gstudio/templates/gstudio/fullscreen.html
@@ -1,4 +1,127 @@
-<html><body>
{% load adminmedia grp_tags %}
-<img src="{% admin_media_prefix %}img/{{image.title}}" >
+{% load i18n comments gstudio_tags %}
+{% load tagging_tags comments i18n %}
+
+<html>
+<head>
+<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" />
+</head>
+<body>
+
+<img src="{% admin_media_prefix %}img/{{image.image}}" >
+<br/>
+<font color = 'black'>Name : </font><font color = 'teal'>{{image.title}}</font>
+<br/>
+<font color = 'black'>Posted By : </font>
+{% for author in image.authors.all %}
+ <font color = 'teal'>{{author}}</font>
+{% endfor %}
+<br>
+
+<font color = 'black'>Posted At : </font><font color = 'teal'>{{image.creation_date}}</font>
+<br/>
+<font color = 'black'>Description:</font><font color = 'teal'>{{ image.content }}</font>
+<br/>
+
+{% ifequal image.rating.get_rating 0 %}
+
+<font color = 'black'>Current rating is: &nbsp;<font color = 'teal'> No rating yet </font></font>
+{% else %}
+<font color = 'black'>Current rating is: &nbsp; <font color = 'teal'> {{ image.rating.get_rating }} </font></font>
+{% endifequal %}
+<br>
+<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="imgid" value={{image.id}}>
+<input type="submit" value="Rate it!!!">
+<script type="text/javascript">
+function myFunction()
+{
+ document.this_form.action = "/gstudio/resources/images/";
+}
+</script>
+<input type="submit" value="Back" onclick()="myFunction()">
+</form>
+<br/>
+
+<form method="post" action="">{% csrf_token %}
+<input type="hidden" name="imgid" value={{image.id}}>
+<input type="text" value="" name="texttags" />
+<input type="submit" value="Add Tags" name="addtags" />
+</form>
+<br/>
+<div class="tags">
+ <p class="gbobject-tags span-16 last">
+ <strong>{% trans "Tags" %}</strong> :
+ {% tags_for_object image 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 image.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 image.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 image.comments_are_open %}
+ <p>{% trans "Comments are closed." %}</p>
+ {% endif %}
+ {% else %}
+ {% if image.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 image %}
+</div>
+
+
+
+
+<br>
+<hr width="100%" style="height:5px;" color="black"/>
+<br>
+
</html></body>
View
10 gstudio/templates/gstudio/home.html
@@ -1,6 +1,6 @@
-{% load objectapp_tags i18n %}
-{% load gstudio_tags i18n %}
+{% load gstudio_tags i18n %}
+{% load objectapp_tags i18n %}
{% load adminmedia grp_tags %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xml:lang="{{ LANGUAGE_CODE }}" lang="{{ LANGUAGE_CODE }}" version="-//W3C//DTD XHTML 1.1//EN" xmlns="http://www.w3.org/1999/xhtml">
@@ -114,6 +114,10 @@
<div id="header" >
{% include "gstudio/_header.html" %}
</div>
+ <div class="tags">
+ <h3>{% trans "Tags" %}</h3>
+ {% get_tag_cloud %}
+ </div>
<div id="main">
<center><font size="23" color="#4d659e"><b>{{ site }}</b></font></center>
@@ -128,7 +132,7 @@
<center><p style = " font-size : 19px ; color : #4d659e"><b>Let us collaboratively construct semantic knowledge networks with a special focus on education.<a href="/more/"><font color="red">more</font></a></b></p></center>
<div class="bottom">
<div class="authors">
- <h3>{% trans "Recent Authors" %}</h3>
+ <h3>{% trans "Recents Authors" %}</h3>
{% get_authors %}
</div>
View
189 gstudio/templates/gstudio/image.html
@@ -1,70 +1,131 @@
<html>
<body>
{% extends "gstudio/base.html" %}
+{% load pagination_tags %}
{% load adminmedia grp_tags %}
{% load i18n %}
{% block content %}
+<script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
+ <script type="text/javascript" >
+ $(window).load(function() {
+ $("#content").css({
+ "width": "600px",});});
+$(window).load(function() {
+ $("#chart").hide();});
+$(window).load(function() {
+
+ $("#graphcss").hide();
+ });
+
+var i = 0;
+</script>
+<style type="text/css">
+#div2
+{
+background-color:#E8E8E8 ;
+}
+#div1
+{
+background-color:white
+}
+
+#divpost
+{
+position:relative;
+}
+#divsearch
+{
+position:absolute;
+margin-left:61%;
+margin-top:-35%;
+}
+</style>
{% if user.is_authenticated %}
-<h1 style="color: teal;">Welcome to the ImageNation</h1>
-<p><img id="zoomable" src="{% admin_media_prefix %}img/imagenation.jpg" alt="{{ image.title }}" class="left" /></p>
-<h2>Logged in as: {{user.username}}</h2>
-<br>
+{% autopaginate images 10 %}
+
+<h2 style="color: teal;">Image Library</h2>
+<div id="divpost">
<form enctype="multipart/form-data" method="post" action="">
{% csrf_token %}
-<h4 style="color: black;">Post Image:</h4>
-<p>Title: <input type="text" name="title1"></p><br>
-<p><input type=file name="image[]" multiple="multiple" /></p>
-<input type="hidden" name="user" value={{user.username}}>
-<input type="submit" value="Post">
+
+<h1 style="color: black; margin-left: 0px;">Post Image:</h1>
+Title:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="text" name="title1"><br/><br/>
+Image:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type=file name="image[]" multiple="multiple" /><br/><br/>
+Description:&nbsp;&nbsp;<input type=textarea name="contenttext"/>
+<input type="hidden" name="user" value={{user.username}}><br/><br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" value=" Post " size="900" name="post">
</form>
-<br>
+</div>
+
+<div id="divsearch">
<form method="post" action="">
{% csrf_token %}
-<h4 style="color: black;">Search Image</h4>
+<h1 style="color: black; margin-left: 0px;">Search Image:</h1>
<p><input type="text" name="simg" value={{val}}></p>
-<h4 style="color: black;">Sort images by:</h4>
-<p><div align="center">
+<br/>
+<p><div align="left">
<select name="mydropdown">
<option value="title">Title</option>
<option value="creation_date">Creation Date</option>
</select>
</div>
<input type="submit" value="Search">
</form>
+</div>
<br>
+
+ <div>
<h4 style="color: teal;">IMAGES</h4>
{% for image in images %}
- <div class="gbobject-body span-16 last">
- <div class="gbobject-image">
- <p>
-<img src="{% admin_media_prefix %}img/{{image.title}}" width="300" height="225" alt="{{ image.title }}" >
+
+
+ <div class="gbobject-image" id = "divimage">
+<script type="text/javascript">
+i = i+1;
+if (i%2 == 0){
+document.getElementById("divimage").setAttribute("id","div1");
+}
+else
+{
+document.getElementById("divimage").setAttribute("id","div2");
+}
+
+</script>
+ <h2>{{image.title}}</h2>
+ <form method="post" action="">{% csrf_token %}
+ <input type="hidden" name="fulid" value={{image.id}}>
+ <input type="submit" value="Show" name="Show">
+
+ <!-- <p> -->
+<!-- <img src="{% admin_media_prefix %}img/{{image.title}}" width="300" height="225" alt="{{ image.title }}" > -->
- </p>
- </div>
- <div class="gbobject-content">
- <!-- {{ object_content }}-->
- </div>
- </div>
-<h4>{{image.title}}
-<form method="post" action="">
-{% csrf_token %}
-<input type="hidden" name="fulid" value={{image.id}}>
-<input type="submit" value="View Fullscreen">
-</form>
-</h4>
-<font color = 'black'>Posted By : </font>
-{% for author in image.authors.all %}
- <font color = 'teal'>{{author}}</font>
-{% endfor %}
-<br>
-<font color = 'black'>Posted At : </font><font color = 'teal'>{{image.creation_date}}</font>
-<br>
+<!-- </p> -->
+
+ <!-- <div class="gbobject-content"> -->
+<!-- <\!-- {{ object_content }}-\-> -->
+<!-- </div> -->
+<!-- </div>-->
+<!-- <h4>{{image.title}} -->
+<!-- <form method="post" action=""> -->
+<!-- {% csrf_token %} -->
+<!-- <input type="hidden" name="fulid" value={{image.id}}> -->
+<!-- <input type="submit" value="View Fullscreen"> -->
+<!-- </form> -->
+<!-- </h4> -->
+<!-- <font color = 'black'>Posted By : </font> -->
+<!-- {% for author in image.authors.all %} -->
+<!-- <font color = 'teal'>{{author}}</font> -->
+<!-- {% endfor %} -->
+<!-- <br> -->
+<!-- <font color = 'black'>Posted At : </font><font color = 'teal'>{{image.creation_date}}</font> -->
+<!-- <font color = 'black'>Current rating is {{ image.rating.get_rating }} </font> -->
+
+
+
{% for author in image.authors.all %}
- {% ifequal author.username user.username %}
-<form method="post" action="" onclick="return makesure();">
-{% csrf_token %}
+ {% ifequal author.username user.username %}
<input type="hidden" name="pict" value={{image.id}}>
-<input type="submit" name="delete" value="Delete">
+<input type="submit" name="delete" value="Delete" onclick="return makesure();">
<input type="hidden" name="user" value={{user.username}}>
</form>
<script type="text/javascript">
@@ -86,34 +147,38 @@ <h4 style="color: teal;">IMAGES</h4>
</script>
<input type="button" onclick="myFunction()" value="Delete" />
+ </form>
{% endifequal %}
{% endfor %}
-<br>
-<font color = 'black'>Current rating is </font><h4>{{ image.rating.get_rating }}</h4>
-<br>
-<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="imgid" value={{image.id}}>
-<input type="submit" value="Rate it!!!">
-</form>
-<br>
-<hr width="100%" style="height:5px;" color="black"/>
-<br>
-{% endfor %}<br>
-<br><br>
+
+
+<!-- <br> -->
+<!-- <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="imgid" value={{image.id}}> -->
+<!-- <input type="submit" value="Rate it!!!"> -->
+<!-- </form> -->
+<!-- <br> -->
+<!-- <hr width="100%" style="height:5px;" color="black"/> -->
+<!-- <br> -->
+</div>
+
+{% endfor %}
+</div>
{% else %}
<h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
{% endif %}
-
-
+ <h2>
+{% paginate %}</h2>
+
{% endblock %}
</body>
</html>
View
118 gstudio/templates/gstudio/transcript.html
@@ -1,13 +1,13 @@
-{% load gstudio_tags i18n %}
-{% get_tags as nodetype_tags %}
{% load adminmedia grp_tags %}
-
-
-
-<!doctype html>
+{% load i18n comments gstudio_tags %}
+{% load tagging_tags comments i18n %}
+
<html>
<head>
-<script src="http://code.jquery.com/jquery-1.7.2.js" type="text/javascript"></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" />
+<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/jquery.pandoravideo.js"></script>
<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery.js"></script>
<script type="text/javascript" src="{{STATIC_URL}}gstudio/js/jquery-ui-1.8.21.custom.min.js"></script>
@@ -22,7 +22,111 @@
</head>
<body>
<div id="pandoravideo" data-pandora-id={{id}} data-pandora-layers="transcripts, descriptions, keywords, places">
+
+
+</div>
+<font color='black'>Name:</font>
+<font color='teal'>{{ titlename }}</font><br/>
+<font color = 'black'>Posted By : </font>
+
+ <font color = 'teal'>{{postedby}}</font>
+<br>
+<font color = 'black'>Posted At :</font>
+ <font color = 'teal'>{{date}}</font>
+
+<br>
+ <font color = 'black'>Location: </font>
+<a href=http://maps.google.co.in/maps?hl=en&cp=43&gs_id=6&xhr=t&q={{map}}&bav=on.2,or.r_gc.r_pw.r_qf.,cf.osb&biw=1304&bih=680&um=1&ie=UTF-8&sa=N&tab=wl target="_blank">{{we}}</a>
+<br>
+<font color = 'black'>Description:</font><font color = 'teal'>{{ contentname }}</font>
+<br/>
+<font color = 'black'>Current rating is: &nbsp;<font color='teal'><b>{{ rateby }}</b></font> </font>
+<br>
+<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"/>
+
+<input type="hidden" name="vidid" value={{vidid}}>
+<input type="submit" value="Rate it!!!">
+</form>
+<br>
+<form method="post" action="">
+{% csrf_token %}
+<input type="hidden" name="favid" value={{vidid}}>
+<input type="hidden" name="favusr" value={{user.username}}>
+<input type="submit" value="Add to favourites">
+</form><br>
+<form method="post" action="">{% csrf_token %}
+<input type="hidden" name="vidid" value={{vidid}}>
+<input type="text" value="" name="texttags" />
+<input type="submit" value="Add Tags" name="addtags" />
+</form>
+<br/>
+<br/>
+<div class="tags">
+ <p class="gbobject-tags span-16 last">
+ <strong>{% trans "Tags" %}</strong> :
+ {% tags_for_object video 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 video.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 video.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 video.comments_are_open %}
+ <p>{% trans "Comments are closed." %}</p>
+ {% endif %}
+ {% else %}
+ {% if video.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 video %}
</div>
+<hr width="100%" style="height:5px;" color="black"/>
+<br>
</body>
</html>
View
270 gstudio/templates/gstudio/video.html
@@ -1,181 +1,199 @@
{% extends "gstudio/base.html" %}
+{% load pagination_tags %}
{% load i18n %}
{% load adminmedia grp_tags %}
+{% load i18n comments gstudio_tags %}
+
{% block content %}
+<script src="{% admin_media_prefix %}jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
+ <script type="text/javascript" >
+ $(window).load(function() {
+ $("#content").css({
+ "width": "600px",});});
+$(window).load(function() {
+ $("#chart").hide();});
+$(window).load(function() {
+
+ $("#graphcss").hide();
+ });
+var i = 0;
+</script>
+<style type="text/css">
+#div2
+{
+background-color:#E8E8E8 ;
+}
+#div1
+{
+background-color:white
+}
+#divpost
+{
+position:relative;
+}
+#divsearch
+{
+position:absolute;
+margin-left:61%;
+margin-top:-23%;
+}
+</style>
+
{% if user.is_authenticated %}
-<h1 style="color: teal;">Welcome to the VideoCore</h1>
-<p><img id="zoomable" src="{% admin_media_prefix %}img/videos.jpg" alt="{{ image.title }}" class="left" /></p>
-<h2>Logged in as: {{user.username}}</h2>
-<br>
+
+{% autopaginate vids 10 %}
+
+
+<h2 style="color: teal;">Video Library</h2>
+<br/>
+<div id="divpost">
<form enctype="multipart/form-data" method="post" action="">
{% csrf_token %}
-<p><h4 style="color: black;">Post Video:</h4><input type="file" name="clip[]" multiple="multiple" /></p>
+<p><h4 style="color: black;">Submit Videos:</h4>Video:&nbsp;<input type="file" name="clip" multiple="multiple" /></p><br/>
+Description:&nbsp;&nbsp;<input type=textarea name="contenttext"/>
<input type="hidden" name="user" value={{user.username}}>
-<input type="submit" value="Upload">
+<input type="hidden" name="userpassword" value={{user.password}}>
+<input type="hidden" name="useremail" value={{user.email}}>
+<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="submit" value="Upload" onclick="return myupload();" >
+<input type="hidden" name="upload" id = "uploadid">
+<script type="text/javascript">
+function myupload()
+{
+
+var prompta = prompt("Enter your password")
+document.getElementById("uploadid").setAttribute("value",prompta);
+}
+</script>
+
</form>
-<br>
+</div>
+<div id="divsearch">
<form method="post" action="">
{% csrf_token %}
-<h4 style="color: black;">Search Video</h4>
+<h4 style="color: black;">Search Videos:</h4>
<p><input type="text" name="svid" value={{val}}></p>
-<h4 style="color: black;">Sort videos by:</h4>
-<p><div align="center">
+
+
<select name="mydropdown">
<option value="title">Title</option>
<option value="creation_date">Creation Date</option>
</select>
-</div>
+
<input type="submit" name="norm" value="Search">
<input type="submit" name="spe" value="Search by User">
</form>
<br>
-<form method="post" action="">
+<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>
-
-<h4 style="color: teal;">VIDEOS</h4><br>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js"></script>
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
-
- <script>
-
-
-$(function() {
-
-
-
-
-
-
-$('#progressbar').progressbar({ value: 0.0001 });
- $pVal = $('.ui-progressbar-value').addClass('ui-corner-right');
- var pGress = setInterval(function() { //generate our endless loop
- var pCnt = $pVal.width(); // get width as int
- // generate a random number between our max 100 and it's half 50,
- // this is optional, and make the bar move back and forth before
- // we reach the end.
- var rDom = Math.floor(Math.random() * (100 - 0 + 1) + 0);
- var step = rDom >= 100 ? 100: rDom; // reached our max ? reset step.
- doAnim(step);
- },1000);
- var doAnim = function(wD) {
- // complete easing list http://jqueryui.com/demos/effect/easing.html
- $pVal.stop(true).animate({width: wD + '%'},1000, 'easeOutBack');
- if (wD >= 100) clearInterval(pGress) /* run callbacks here */
- }
-
- var time = new Date().getTime();
- $(document.body).bind("mousemove keypress", function(e) {
- time = new Date().getTime();
- });
-
- function refresh() {
- if(new Date().getTime() - time >= 200000)
- window.location.reload(true);
- else
- setTimeout(refresh, 10000);
- }
-
- setTimeout(refresh, 10000);
-
-
-
-
-
-
-});
-
-
+</div>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+{% if fav %}
+<h2 style="color: teal;">Favourite Videos</h2><br/>
+{% else %}
+<h2 style="color: teal;">List of Videos in the library </h2><br/>
+{% endif %}
+{% for video in vids %}
+<!--<iframe src="{{video.rurl}}/embed?in=0&out=10000&view=video" width="256" height="144" allowfullscreen></iframe>-->
+<div id="divvideo">
+<script type="text/javascript">
+i = i+1;
+if (i%2 == 0){
+document.getElementById("divvideo").setAttribute("id","div1");
+}
+else
+{
+document.getElementById("divvideo").setAttribute("id","div2");
+}
</script>
-
-
- <div id="progressbar"></div>
-
-
-
-
-
-
-
-<br>
-{% if fav %}
-<h4 style="color: teal;">Favourite Videos</h4>
-{% endif %}
-<br>
-
-{% for video in vids %}
-<iframe src="{{video.rurl}}/embed?in=0&out=10000&view=video" width="256" height="144" allowfullscreen></iframe>
-<h4>{{video.title}}</a></h4>
+<font size="4">{{video.title}}</font>
<form enctype="multipart/form-data" method="post" action="" target="_blank">
{% csrf_token %}
<input type="hidden" name = "full" value ={{video.slug}}>
-<input type="submit" value="FullScreen">
-</form>
-<h4><a href={{video.rurl}} target="_blank">Right click to download</a></h4><br>
-<font color = 'black'>Posted By : </font>
+<input type="submit" value="Play">
+
+<a href={{video.rurl}} target="_blank">Right click to download</a><br>
+<!-- <font color = 'black'>Posted By : </font> -->
{% for author in video.get_nbh.posted_by %}
- <font color = 'teal'>{{author}}</font>
+
+ <input type="hidden" name="authorname" value="{{ author }}" />
{% endfor %}
-<br>
-<font color = 'black'>Posted At :</font>
+
+<!-- <br> -->
+<!-- <font color = 'black'>Posted At :</font> -->
{% for date in video.get_nbh.creation_day %}
- <font color = 'teal'>{{date}}</font>
+ <input type="hidden" name="datename" value="{{ date }}" />
{% endfor %}
-<br>
-{% for we in video.get_nbh.source %}
- <font color = 'black'>Location: </font>
+ <input type="hidden" name="titlename" value="{{ video.title }}" />
+
+<!-- <br> -->
+{% for we in video.get_nbh.source %}
+ <!-- <font color = 'black'>Location: </font> -->
{% for map in video.get_nbh.map_link %}
- {% ifnotequal map '' %}
- <a href=http://maps.google.co.in/maps?hl=en&cp=43&gs_id=6&xhr=t&q={{map}}&bav=on.2,or.r_gc.r_pw.r_qf.,cf.osb&biw=1304&bih=680&um=1&ie=UTF-8&sa=N&tab=wl target="_blank">{{we}}</a>
- {% endifnotequal %}
+ {% ifnotequal map '' %}
+ <input type="hidden" name="mapname" value="{{ map }}" />
+ <input type="hidden" name="wename" value="{{ we }}" />
+ <!-- <a href=http://maps.google.co.in/maps?hl=en&cp=43&gs_id=6&xhr=t&q={{map}}&bav=on.2,or.r_gc.r_pw.r_qf.,cf.osb&biw=1304&bih=680&um=1&ie=UTF-8&sa=N&tab=wl target="_blank">{{we}}</a> -->
+ {% endifnotequal %}
{% endfor %}
{% endfor %}
-<br>
-<font color = 'black'>Current rating is </font><h4>{{ video.rating.get_rating }}</h4>
-<br>
-<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="contentname" value="{{ video.content }}" />
+ <input type="hidden" name="ratename" value="{{ video.rating.get_rating }}" />
+
+<!-- <br> -->
+<!-- <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"/> -->
<input type="hidden" name="vidid" value={{video.id}}>
-<input type="submit" value="Rate it!!!">
</form>
-<br>
-<form method="post" action="">
-{% csrf_token %}
-<input type="hidden" name="favid" value={{video.id}}>
-<input type="hidden" name="favusr" value={{user.username}}>
-<input type="submit" value="Add to favourites">
-</form><br>
-<hr width="100%" style="height:5px;" color="black"/>
-<br>
-{% endfor %}<br>
+<!-- <input type="submit" value="Rate it!!!"> -->
+<!-- </form> -->
+<!-- <br> -->
+<!-- <form method="post" action=""> -->
+<!-- {% csrf_token %} -->
+<!-- <input type="hidden" name="favid" value={{video.id}}> -->
+<!-- <input type="hidden" name="favusr" value={{user.username}}> -->
+<!-- <input type="submit" value="Add to favourites"> -->
+<!-- </form><br> -->
+<!-- <hr width="100%" style="height:5px;" color="black"/> -->
+<!-- <br> -->
+</div>
+
+{% endfor %}
-<br><br>
-<a href="http://www.facebook.com" target="_blank">Follow us on Facebook</a>
+
+<br>
{% else %}
<h2 style="color: indigo;">Sorry you need to log in to see this content !</h2>
{% endif %}
+<h2>
+{% paginate %}</h2>
+
{% endblock %}
{% block chart %}
-<br> <br><br><br><br><br><br><br><br><br><br><br><br><br>
-
-<br><br><br><br><br>
+<br>
<br>
{% endblock %}
View
16 gstudio/views/docu.py
@@ -27,12 +27,15 @@ def docu(request):
q=p.get_nbh['contains_members']
if request.method=="POST":
user = request.POST.get("user","")
+ content= request.POST.get("contenttext","")
sdoc = request.POST.get("sdoc","")
dn = request.POST.get("dn","")
sub3 = request.POST.get("mydropdown","")
rating = request.POST.get("star1","")
docid = request.POST.get("docid","")
delete = request.POST.get("delete","")
+ addtags = request.POST.get("addtags","")
+ texttags = request.POST.get("texttags","")
if rating :
rate_it(int(docid),request,int(rating))
if delete != "":
@@ -61,13 +64,20 @@ def docu(request):
variables = RequestContext(request,{'documents':vido,'val':sdoc})
template = "gstudio/docu.html"
return render_to_response(template, variables)
+
+ if addtags != "":
+ i=Gbobject.objects.get(id=docid)
+ i.tags = i.tags+ ","+str(texttags)
+ i.save()
+
+
a=[]
for each in request.FILES.getlist("doc[]",""):
a.append(each)
if a != "":
for f in a:
save_file(f)
- create_object(f,user)
+ create_object(f,user,content)
vars=RequestContext(request,{'documents':q})
template="gstudio/docu.html"
return render_to_response(template, vars)
@@ -82,7 +92,7 @@ def save_file(file, path=""):
fd.write(chunk)
fd.close()
-def create_object(file,log):
+def create_object(file,log,content):
p=Gbobject()
p.title=file._get_name()
p.rurl=MEDIA_ROOTNEW2+"p.title"
@@ -95,7 +105,7 @@ def create_object(file,log):
else:
final = final+each1
p.slug=final
- p.content=' '
+ p.content=content
p.status=2
p.save()
p.sites.add(Site.objects.get_current())
View
43 gstudio/views/image.py
@@ -28,6 +28,7 @@ def image(request):
q=p.get_nbh['contains_members']
if request.method=="POST":
title = request.POST.get("title1","")
+ content= request.POST.get("contenttext","")
simg = request.POST.get("simg","")
sub3 = request.POST.get("mydropdown","")
user = request.POST.get("user","")
@@ -36,7 +37,10 @@ def image(request):
imgid = request.POST.get("imgid","")
pict = request.POST.get("pict","")
fulid = request.POST.get("fulid","")
- if fulid != "":
+ show = request.POST.get("Show","")
+ addtags = request.POST.get("addtags","")
+ texttags = request.POST.get("texttags","")
+ if show != "":
i=Gbobject.objects.get(id=fulid)
vars=RequestContext(request,{'image':i})
template="gstudio/fullscreen.html"
@@ -69,19 +73,27 @@ def image(request):
variables = RequestContext(request,{'images':vido,'val':simg})
template = "gstudio/image.html"
return render_to_response(template, variables)
+
+
+ if addtags != "":
+ i=Gbobject.objects.get(id=imgid)
+ i.tags = i.tags+ ","+str(texttags)
+ i.save()
+
+
a=[]
for each in request.FILES.getlist("image[]",""):
a.append(each)
if a != "":
i=0
for f in a:
if i==0:
- save_file(f,title)
- create_object(f,user,title)
+ save_file(f,title,user)
+ create_object(f,user,title,content)
i=i+1
else:
- save_file(f,title+'_'+str(i))
- create_object(f,user,title+'_'+str(i))
+ save_file(f,title+'_'+str(i),user)
+ create_object(f,user,title+'_'+str(i),content)
i=i+1
p=Objecttype.objects.get(title="Image")
q=p.get_nbh['contains_members']
@@ -92,25 +104,32 @@ def image(request):
template="gstudio/image.html"
return render_to_response(template, vars)
-def save_file(file,title, path=""):
+def save_file(file,title, user, path=""):
filename = title
- fd = open('%s/%s' % (MEDIA_ROOTNEW2, str(path) + str(filename)), 'wb')
+ os.system("mkdir -p "+ MEDIA_ROOTNEW2+"/"+user)
+ fd = open('%s/%s/%s' % (MEDIA_ROOTNEW2, str(user),str(path) + str(file)), 'wb')
for chunk in file.chunks():
fd.write(chunk)
fd.close()
-def create_object(file,log,title):
+def create_object(f,log,title,content):
p=Gbobject()
+ filename = str(f)
p.title=title
- p.image=p.title
+ p.image=log+"/"+filename
final = ''
- for each1 in p.title:
+ for each1 in filename:
if each1==" ":
final=final+'-'
else:
final = final+each1
- p.slug=final
- p.content=' '
+ i=0
+ dirname = ""
+ while final[i] != ".":
+ dirname = dirname + final[i]
+ i=i+1
+ p.slug=dirname
+ p.content=content
p.status=2
p.save()
p.sites.add(Site.objects.get_current())
View
110 gstudio/views/video.py
@@ -13,71 +13,96 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
+#!/usr/bin/python
+import time;
from django.http import HttpResponse
from django.shortcuts import render_to_response
import ox
import os
from gstudio.models import *
from objectapp.models import *
from django.template import RequestContext
+from django.views.generic.list_detail import object_list
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from demo.settings import *
from gstudio.methods import *
+from django.contrib.auth import authenticate
def video(request):
api=ox.api.API("http://wetube.gnowledge.org/api")
p=Objecttype.objects.get(title="Video")
q=p.get_nbh['contains_members']
- api.signin({'username':'nero','password':'nihar'})
+ sd = request.user
+ message = ''
+ sd = str(sd)
+ password = request.POST.get("upload","")
+ content= request.POST.get("contenttext","")
if request.method == 'POST':
- clip = request.FILES.getlist("clip[]","")
+ clip = request.FILES.get("clip","")
+ content= request.POST.get("contenttext","")
svid = request.POST.get("svid","")
sub1 = request.POST.get("norm","")
sub2 = request.POST.get("spe","")
rating = request.POST.get("star1","")
vidid = request.POST.get("vidid","")
user = request.POST.get("user","")
+ userpassword = request.POST.get("userpassword","")
+ useremail = request.POST.get("useremail","")
sub3 = request.POST.get("mydropdown","")
favid=request.POST.get("favid","")
favusr=request.POST.get("favusr","")
fav=request.POST.get("fav","")
full=request.POST.get("full","")
+ author=request.POST.get("authorname","")
+ date = request.POST.get("datename","")
+ rate = request.POST.get("ratename","")
+ contentname = request.POST.get("contentname","")
+ mapname = request.POST.get("mapname","")
+ wename = request.POST.get("wename","")
+ titlename = request.POST.get("titlename","")
+ password = request.POST.get("upload","")
+ addtags = request.POST.get("addtags","")
+ texttags = request.POST.get("texttags","")
+
+ if rate == '0':
+ rate = 'No rating yet'
+ else :
+ rate = rate
+
if full!="" :
- variables= RequestContext(request,{'id':full})
+ i=Gbobject.objects.get(id=vidid)
+ variables= RequestContext(request,{'id':full,'postedby':author,'date':date,'rateby':rate,'map':mapname,'we':wename,'vidid':vidid ,'titlename':titlename,'contentname':contentname,'video':i})
template="gstudio/transcript.html"
return render_to_response(template,variables)
if fav != "" :
list1=[]
- t=Gbobject.objects.get(title=user)
+ t=Gbobject.objects.get(title=user+"video")
for each in t.get_nbh['has_favourite']:
d=each.right_subject_id
x=Gbobject.objects.get(id=d)
list1.append(x)
- variables = RequestContext(request,{'vids':list1,'val':svid})
+ variables = RequestContext(request,{'vids':list1,'val':svid,'fav':fav})
template = "gstudio/video.html"
return render_to_response(template, variables)
-
if rating :
rate_it(int(vidid),request,int(rating))
if favid!="":
e=0
r = Objecttype.objects.get(title="user")
for each in r.get_nbh['contains_members']:
- if favusr == each.title:
- e=1
+ if favusr+"video" == each.title:
+ e=1
if e==0 :
- t=Gbobject()
- t.title=favusr
- t.slug=favusr
+ t=Gbobject()
+ t.title=favusr+"video"
+ t.slug=favusr+"video"
t.content=' '
t.status=2
t.save()
t.objecttypes.add(Objecttype.objects.get(title="user"))
t.save()
- t=Gbobject.objects.get(title=favusr)
+ t=Gbobject.objects.get(title=favusr+"video")
rel=Relation()
rt=Relationtype.objects.get(title="has_favourite")
rel.relationtype_id=rt.id
@@ -86,26 +111,39 @@ def video(request):
rel.right_subject_id=f1.id
rel.save()
t.save()
+
+
+ if addtags != "":
+ i=Gbobject.objects.get(id=vidid)
+ i.tags = i.tags+ ","+str(texttags)
+ i.save()
+
+
if clip != "":
- api.signup({'username':user,'password':'wetube'})
- save_file(clip)
+ userauth = authenticate(username=user, password=password)
+ api.signup({'username':user,'password':password,'email':useremail})
+ save_file(clip,user)
clipname = clip._get_name()
i=0
dirname = ""
while clipname[i] != ".":
dirname = dirname + clipname[i]
i=i+1
y=str(dirname)
+ x=str(clipname[0]).upper()
+ CreateConfig(user)
+ # os.system("pandora_client config")
+ os.system("pandora_client add_volume "+ user+" "+MEDIA_ROOTNEW+"/"+user )
os.system("pandora_client scan")
os.system("pandora_client sync")
- os.system("pandora_client upload")
+ os.system("pandora_client upload")
wclip= api.find({'sort': [{'key': 'title','operator': '+'}],'query': {'conditions': [{'key': 'title','value': y,'operator': '='}],'operator': '&'},'keys': ['id', 'title','user','duration','sourcedescription','created'],'range': [0,100]})
for each in wclip['data']['items']:
- m=Gbobject()
+ m=Gbobject()
m.title=each['title'].lower()
m.rurl="http://wetube.gnowledge.org/"+each['id']+'/480p.webm'
m.slug=each['id']
- m.content=' '
+ m.content=content
m.status=2
m.save()
m.objecttypes.add(Objecttype.objects.get(id=p.id))
@@ -143,9 +181,13 @@ def video(request):
a4.svalue=final
a4.save()
m.save()
+
+
+
if sub3 != "":
if svid != "":
if sub2 == "":
+
vidon = Objecttype.objects.get(title="Video")
vido_new = vidon.get_nbh['contains_members']
vido = vido_new.filter(title__contains=svid)
@@ -174,9 +216,10 @@ def video(request):
vido=vido_new.order_by(sub3)
else:
vido=sort_video(vido_new)
- variables = RequestContext(request,{'vids':vido,'val':svid})
+ variables = RequestContext(request,{'vids':vido,'val':svid })
template = "gstudio/video.html"
return render_to_response(template, variables)
+ api.signin({'username': sd,'password':password})
r= api.find({'sort': [{'key': 'title','operator': '+'}],'query': {'conditions': [{'key': 'title','value': '','operator': ''}],'operator': '&'},'keys': ['id', 'title','user','created','duration','sourcedescription'],'range': [0,100]})
s=r['data']['items']
for each in s:
@@ -189,7 +232,7 @@ def video(request):
m.title=each['title'].lower()
m.rurl="http://wetube.gnowledge.org/"+each['id']+'/480p.webm'
m.slug=each['id']
- m.content=' '
+ m.content=content
m.status=2
m.save()
m.objecttypes.add(Objecttype.objects.get(id=p.id))
@@ -233,9 +276,9 @@ def video(request):
template = "gstudio/video.html"
return render_to_response(template, variables)
-def save_file(file, path=""):
+def save_file(file, user,path=""):
filename = file._get_name()
- i=0
+ i=0
dirname = ""
while filename[i] != ".":
dirname = dirname + filename[i]
@@ -248,11 +291,16 @@ def save_file(file, path=""):
z=z+'\ '
else:
z=z+each1
- os.system("mkdir "+MEDIA_ROOTNEW+"/"+x+"/"+z)
- fd = open('%s/%s/%s/%s' % (MEDIA_ROOTNEW, str(filename[0]).upper(), str(dirname), str(path) + str(filename)), 'wb')
+ fileuser = str(user)
+ os.system("mkdir -p "+ MEDIA_ROOTNEW+"/"+fileuser+"/"+x+"/"+z)
+ fd = open('%s/%s/%s/%s/%s' % (MEDIA_ROOTNEW,str(fileuser), str(filename[0]).upper(), str(dirname), str(path) + str(filename)), 'wb')
for chunk in file.chunks():
fd.write(chunk)
fd.close()
+ return
+
+
+
def sort_video(video):
a = []
@@ -271,3 +319,15 @@ def sort_video(video):
a[min] = temp
i = i+1
return a
+
+
+
+def CreateConfig(user):
+ myfile = open(VIDEO_PANDORA_URL,'w')
+ myfile = open(VIDEO_PANDORA_URL,'a')
+ myfile.write('{ \n "username":"'+user+'", \n "url":"http://wetube.gnowledge.org/api/",\n"cache": "~/.ox/client.sqlite",\n"media-cache": "~/.ox/media",\n"volumes":{},\n"password":"wetube"\n }')
+ myfile.close()
+
+
+
+
View
8 objectapp/templates/objectapp/tags/tag_cloud.html
@@ -1,13 +1,13 @@
{% load i18n %}
<div>
- <ul>
+
{% for tag in tags %}
- <li>
+
<a href="{% url objectapp_tag_detail tag.name %}"
title="{% blocktrans count tag.count as gbobject_count %}{{ gbobject_count }} gbobject{% plural %}{{ gbobject_count }} gbobjects{% endblocktrans %}"
class="tag_{{ tag.font_size }}">{{ tag }}</a>
- </li>
+
{% endfor %}
- </ul>
+
</div>
View
1 setup.py
@@ -71,5 +71,6 @@
'diff-match-patch>=20120106',
'ox>=2.0.356',
'pandora_client>=0.2.94',
+ 'django-pagination>=1.0.7',
])

0 comments on commit a5c1dad

Please sign in to comment.
Something went wrong with that request. Please try again.