Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #82 from Dhiru/master

minor modifications of the templates of video, document and images.
  • Loading branch information...
commit fd9cc8dfc4a21b606eddf9184da10aebe00f2644 2 parents 86e6691 + 374eb25
@gnowgi authored
View
38 gstudio/templates/gstudio/docu.html
@@ -23,32 +23,26 @@
var i = 0;
</script>
<style type="text/css">
-#divpost
+#divsearch
+{
+position:absolute;
+}
+#upperdiv
{
position:relative;
+margin-bottom:35%;
}
-#divsearch
+#divpost
{
position:absolute;
-margin-left:61%;
-margin-top:-26%;
+margin-left:52%;
}
</style>
{% if user.is_authenticated %}
{% autopaginate documents 8 %}
<h2 style="color: teal;">Document Library</h2>
<br>
-<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>
-</div>
+<div id="upperdiv">
<div id="divsearch">
<form method="post" action="">
@@ -67,6 +61,20 @@ <h4 style="color: black;">Search File</h4>
<input type="submit" value="Search">
</form>
</div>
+
+<div id="divpost">
+<form enctype="multipart/form-data" method="post" action="">{% csrf_token %}
+<br/>
+<h4 style="color: black;">Post File:</h4>&nbsp;
+file:&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>
+
+<input type="submit" value="Post">
+</form>
+</div>
+
+</div>
<br>
<br>
<br>
View
45 gstudio/templates/gstudio/image.html
@@ -29,38 +29,34 @@
background-color:white
}
-#divpost
+#divsearch
+{
+position:absolute;
+}
+#upperdiv
{
position:relative;
+margin-bottom:35%;
}
-#divsearch
+#divpost
{
position:absolute;
-margin-left:61%;
-margin-top:-35%;
+margin-left:52%;
}
+
</style>
{% if user.is_authenticated %}
{% autopaginate images 10 %}
<h2 style="color: teal;">Image Library</h2>
-<div id="divpost">
-<form enctype="multipart/form-data" method="post" action="">
-{% csrf_token %}
+<br/>
+<div id="upperdiv">
-<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>
-</div>
<div id="divsearch">
<form method="post" action="">
{% csrf_token %}
-<h1 style="color: black; margin-left: 0px;">Search Image:</h1>
+<h4 style="color: black; margin-left: 0px;">Search Image:</h4>
<p><input type="text" name="simg" value={{val}}></p>
<br/>
<p><div align="left">
@@ -72,8 +68,23 @@ <h1 style="color: black; margin-left: 0px;">Search Image:</h1>
<input type="submit" value="Search">
</form>
</div>
-<br>
+<div id="divpost">
+<form enctype="multipart/form-data" method="post" action="">
+{% csrf_token %}
+
+<h4 style="color: black; margin-left: 0px;">Post Image:</h4>
+Title:&nbsp; <input type="text" name="title1"><br/><br/>
+Image:&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/>
+<input type="submit" value=" Post " size="900" name="post" onclick="return myupload();">
+
+
+</form>
+</div>
+</div>
+<br>
<div>
<h4 style="color: teal;">IMAGES</h4>
{% for image in images %}
View
100 gstudio/templates/gstudio/video.html
@@ -13,7 +13,7 @@
$(window).load(function() {
$("#chart").hide();});
$(window).load(function() {
-
+
$("#graphcss").hide();
});
var i = 0;
@@ -27,15 +27,33 @@
{
background-color:white
}
-#divpost
+#divsearch
+{
+position:absolute;
+}
+#upperdiv
{
position:relative;
+margin-bottom:20%;
}
-#divsearch
+#divpost
{
position:absolute;
-margin-left:61%;
-margin-top:-23%;
+margin-left:52%;
+}
+#showingprocess
+{
+width:371px;
+height:38px;
+border:solid 1px #B3B3B3;
+}
+#inner{
+width:10px;
+height:36px;
+border:solid 1px blue;
+margin-top:1px;
+background: green;
+
}
</style>
@@ -46,28 +64,8 @@
<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;">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="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()
-{
+<div id="upperdiv">
-var prompta = prompt("Enter your password")
-document.getElementById("uploadid").setAttribute("value",prompta);
-}
-</script>
-
-</form>
-</div>
<div id="divsearch">
<form method="post" action="">
{% csrf_token %}
@@ -79,7 +77,7 @@ <h4 style="color: black;">Search Videos:</h4>
<option value="title">Title</option>
<option value="creation_date">Creation Date</option>
</select>
-
+<br/>
<input type="submit" name="norm" value="Search">
<input type="submit" name="spe" value="Search by User">
</form>
@@ -90,19 +88,63 @@ <h4 style="color: black;">Search Videos:</h4>
<input type="submit" name="fav" value="View Favourites">
</form>
</div>
+<div id="divpost">
+<form enctype="multipart/form-data" method="post" action="">
+{% csrf_token %}
+<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="hidden" name="userpassword" value={{user.password}}>
+<input type="hidden" name="useremail" value={{user.email}}><br/><br/>
+<p><b> Enter the password of wetube.gnowledge.org</b> </p>
+<input type="password" name="videopassword" />
+<br/><br/>
+<input type="submit" value="Upload" onclick="return myupload();" >
+<script type="text/javascript">
+function myupload()
+{
+document.getElementById('showingprocess').style.visibility="visible";
+document.getElementById('headvideo').style.visibility="visible";
+
+ setInterval( function() {
+ if( i < 340 )
+ {
+
+ i = i + 20;
+ $("#inner").css({ "-moz-box-sizing":"border-box", "margin-left":i });
+ }
+ else
+ {
+ i = 0;
+ }
+ },1000);
+
+
+
+}
+</script>
+</form>
+</div>
+</div>
+
<br/>
<br/>
<br/>
<br/>
<br/>
<br/>
+<h2 id="headvideo" style="visibility:hidden;">Processing And Uploading Video</h2>
+<div id="showingprocess" style="visibility:hidden;">
+<div id="inner">
+</div>
+</div>
{% if fav %}
<h2 style="color: teal;">Favourite Videos</h2><br/>
{% else %}
<h2 style="color: teal;">List of Videos in the library </h2><br/>
{% endif %}
-
+<div id="listvideo">
{% for video in vids %}
<!--<iframe src="{{video.rurl}}/embed?in=0&out=10000&view=video" width="256" height="144" allowfullscreen></iframe>-->
@@ -180,7 +222,7 @@ <h2 style="color: teal;">List of Videos in the library </h2><br/>
{% endfor %}
-
+</div>
<br>
{% else %}
View
14 gstudio/views/video.py
@@ -60,10 +60,9 @@ def video(request):
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","")
-
+ password = request.POST.get("videopassword","")
if rate == '0':
rate = 'No rating yet'
else :
@@ -120,7 +119,6 @@ def video(request):
if clip != "":
- userauth = authenticate(username=user, password=password)
api.signup({'username':user,'password':password,'email':useremail})
save_file(clip,user)
clipname = clip._get_name()
@@ -131,7 +129,7 @@ def video(request):
i=i+1
y=str(dirname)
x=str(clipname[0]).upper()
- CreateConfig(user)
+ CreateConfig(user,password)
# os.system("pandora_client config")
os.system("pandora_client add_volume "+ user+" "+MEDIA_ROOTNEW+"/"+user )
os.system("pandora_client scan")
@@ -146,6 +144,8 @@ def video(request):
m.content=content
m.status=2
m.save()
+ m.sites.add(Site.objects.get_current())
+ m.save()
m.objecttypes.add(Objecttype.objects.get(id=p.id))
m.save()
a=Attribute()
@@ -235,6 +235,8 @@ def video(request):
m.content=content
m.status=2
m.save()
+ m.sites.add(Site.objects.get_current())
+ m.save()
m.objecttypes.add(Objecttype.objects.get(id=p.id))
m.save()
a=Attribute()
@@ -322,10 +324,10 @@ def sort_video(video):
-def CreateConfig(user):
+def CreateConfig(user,password):
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.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":"'+password+'"\n }')
myfile.close()
Please sign in to comment.
Something went wrong with that request. Please try again.