Added frame files, related #19

COMU · Mar 9, 2014 · f803e54 · f803e54
1 parent 30cc774
commit f803e54
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 85 deletions.
diff --git a/urls.py b/urls.py
@@ -17,6 +17,10 @@
    # (r'^login/$', 'web.views.login_user'),
     (r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
     (r'^gramafon/$', 'web.views.gramafon'),
+    (r'^gramafon/page1$', 'web.views.page1'),
+    (r'^gramafon/page2$', 'web.views.page2'),
+    (r'^gramafon/page3$', 'web.views.page3'),
+
 #    (r'^api/', include(song_resource.urls))	#Added song_resource for rest-api
 #    (r'^api/', include(file_resource.urls))    #Added file_resource for rest_api
 #    (r'^api/', include(singer_resource.urls))  #Added singer_resource for rest_api

diff --git a/web/templates/homepage.html b/web/templates/homepage.html
@@ -1,89 +1,12 @@
 <html>
 <head>
-	<script type="text/javascript" src="/static/js/jquery.js"></script>
-	<script type="text/javascript" src="/static/js/jquery.layout.js"></script>
-	<script type="text/javascript">
-		$(document).ready(function () {
-                	var myLayout = $('body').layout(); 
-			myLayout.sizePane("west", 400); // en dogudakinin buyuklugunu belirledik
-                        myLayout.sizePane("east", 400);
-
-			$("#B").click(function(){
-				$(".B").show();  
-			});
-			$("#Y").click(function(){
-                                $(".Y").show();  
-                        });
-
-
-			$.ajax({
-    				url: "/api/album/?format=json",
-    				error: function(obj){
-        				alert(obj.status + "\n" + obj.statusText);
-    				},
-    			success: function(obj) {
-				var obj = JSON.parse(obj); //Parsed jsonstring
-				var currentobj = obj.objects
-
-				for (var i=0; i<currentobj.length; i++){ //objects dizinine bakıyor, isimleri yazdırıyor
-						if (currentobj[i].name != "" && (currentobj)[i].name[0].toUpperCase() == "B"){ 
-							$('.B').append('<li>' + currentobj[i].name + '</li>');				
-						}
-						if (currentobj[i].name != "" && (currentobj)[i].name[0].toUpperCase() == "Y"){ 
-                                                        $('.Y').append('<li>' + currentobj[i].name + '</li>');                          
-                                                }
-
-						else {
-							$('.ui-layout-west').append('<li>' + currentobj[i].name + ' </li>');
-						}	
-				}
-			}	
-			});
-		});
-
-	</script>
-
-	<style type="text/css">
-		.ui-layout-pane {               /*arkaplani beyaz, 1 piksel cerceveli ve ice dogru 10 piksel bosluk birakilan bir eleman*/
-			background: #FFF;
-			border: 1px solid #BBB;
-			padding: 10px;
-			overflow: auto;
-		}
-		.B{
-			display: none;
-		}
-		.Y{
-			display: none;
-		}
+<title> Gramafon </title>
+</head>
 
-		.ui-layout-resizer { /* all 'resizer-bars' */
-			background: #DDD;
-		}
+<frameset cols = "400,400,*">
+	<frame name="frame1" src="page1">
+	<frame name="frame2" src="page2">
+	<frame name="frame3" src="page3">
+</frameset>
 
-		.ui-layout-toggler { /* all 'toggler-buttons' */
-			background: #AAA;
-		}
-		.ui-layout-west {
-			background: red;			
-		}
-		.ui-layout-east {
-			background: blue;
-		}
-		.ui-layout-center {
-			background: green;
-		}
-
-	</style>
-</head>
-<body>
-	<div class="ui-layout-west">
-		 <div id="B">B</div>
-		 <h3 class="B"></h3>
-		 <div id="Y">Y</div>
-		<h3 class="Y"></h3>
-	</div> 
-	<div class="ui-layout-center">Center</div>
-	<div class="ui-layout-east">East</div>
-</body>
 </html>
diff --git a/web/templates/page1.html b/web/templates/page1.html
@@ -0,0 +1,8 @@
+<html>
+
+<body bgcolor=#ffffcc >
+
+<p> 1. sayfa </p>
+
+</body>
+</html>
diff --git a/web/templates/page2.html b/web/templates/page2.html
@@ -0,0 +1,11 @@
+<html>
+
+<body bgcolor=#ffffcc >
+
+<p> 2. sayfa </p>
+
+</body>
+</html>
+~                                                                                                                                                                   
+~                                                                                                                                                                   
+~        
diff --git a/web/templates/page3.html b/web/templates/page3.html
@@ -0,0 +1,11 @@
+<html>
+
+<body bgcolor=#ffffcc >
+
+<p> 3. sayfa </p>
+
+</body>
+</html>
+~                                                                                                                                                                   
+~                                                                                                                                                                   
+~        
diff --git a/web/views.py b/web/views.py
@@ -17,5 +17,11 @@ def login_user(request):
 		return HttpResponseRedirect('/login')	
 def gramafon(request):
 	return render_to_response('homepage.html')
+def page1(request):
+	return render_to_response('page1.html')
 
-
+def page2(request):
+        return render_to_response('page2.html')	
+
+def page3(request):
+        return render_to_response('page3.html')