Skip to content
Browse files

fix url paths & minor layout issues

  • Loading branch information...
1 parent bd6f6cd commit 6630dcfe59604aef60938c69c33dbb084b1117aa @ezraezraezra committed Apr 9, 2012
Showing with 21 additions and 19 deletions.
  1. +1 −1 README
  2. +2 −1 assets/css/scheduler.css
  3. +9 −8 js/event_listener.js
  4. +2 −2 js/fb.js
  5. +2 −2 js/tb.js
  6. +5 −5 php/classroom.php
View
2 README
@@ -8,7 +8,7 @@
*
* Tech: Etherpad Lite, Facebook API, JavaScript, jQuery, MySQL,
* Node.js, OpenTok API, PHP, Socket.io
- * Last Update: April 8th, 2012
+ * Last Update: April 9th, 2012
***********************************************************************/
NOTE: *** 3rd PARTY LIBRARIES HAVE BEEN OMITTED FROM THE PUBLIC REPO ***
View
3 assets/css/scheduler.css
@@ -27,6 +27,7 @@
width: 900px;
height: 184px;
background-image: url('../img/hero_banner.png');
- margin-bottom: 10px;
+ margin-bottom: 20px;
+ margin-top: -20px;
cursor: pointer;
}
View
17 js/event_listener.js
@@ -13,9 +13,9 @@
var LISTENER = function() {
var DEBUG = true;
- var teach_view = 'layout_tester.php?d=teach';
- var learn_view = 'layout_tester.php?d=learn';
- var home_view = 'layout_tester.php';
+ var teach_view = 'index.php?d=teach';
+ var learn_view = 'index.php?d=learn';
+ var home_view = 'index.php';
var $button = '';
var $modal = '';
@@ -234,12 +234,13 @@ var LISTENER = function() {
console.log(data);
var data_to_send = $object.serialize()+"&fb_id="+fbObj.id+"&o=register&name="+data.name;
console.log("data_to_send"+ data_to_send);
- $.get('../php/server_ajax.php?'+data_to_send, function(data) {
+ $.get('php/server_ajax.php?'+data_to_send, function(data) {
console.log(data);
// Should probably add a 'progress bar'
_fillModalUrl(data);
+ fbObj.postToWall('admin', $("input[name=title]").val(), $("input[name=date]").val());
});
});
@@ -259,7 +260,7 @@ var LISTENER = function() {
}
function _registerForWorkshop($object) {
- $.get('../php/server_ajax.php', {
+ $.get('php/server_ajax.php', {
"o" : "add",
"fb_id" : fbObj.id,
"w_id" : $object.attr("wid")
@@ -268,6 +269,7 @@ var LISTENER = function() {
// Should probably add a 'progress bar'
_fillModalUrl(data);
+ fbObj.postToWall('user', $("input[name=title]").val(), $("input[name=date]").val());
//_hideModal();
});
$("#modal_form").css("display", "none");
@@ -287,6 +289,7 @@ var LISTENER = function() {
$(".modal_facebook_login").css("display", "none");
$(".workshop_url").css("display", "none");
$("#modal_form").css("display", "block");
+ $(".modal_bottom").css("display", "block");
}
function _buttonListener($object) {
@@ -329,7 +332,7 @@ var LISTENER = function() {
$object.fadeOut('600');
var w_id = $object.attr("wid");
- $.get('../php/server_ajax.php', {
+ $.get('php/server_ajax.php', {
o : 'instructor',
a : 'push',
wid : w_id
@@ -408,8 +411,6 @@ var LISTENER = function() {
$(".modal_progress").css("display", "none");
$(".workshop_url").css("display", "block");
- fbObj.postToWall(data.url_values.type, $("input[name=title]").val(), $("input[name=date]").val());
-
//_hideModal();
}
View
4 js/fb.js
@@ -22,7 +22,7 @@ var fbObj = {
image_url = "https://graph.facebook.com/"+ this.id +"/picture?type=normal";
}
else {
- image_url = "../assets/img/user_50.png";
+ image_url = "assets/img/user_50.png";
}
$(".container_content_header_fb").css( {
backgroundImage : "url("+ image_url +")",
@@ -38,7 +38,7 @@ var fbObj = {
else if(user_type == 'user') {
message = "Going to an online workshop about "+title+" on "+ date +".";
}
- $.get('../php/fbook.php', {
+ $.get('php/fbook.php', {
token: this.token,
id: this.id,
message : message
View
4 js/tb.js
@@ -234,15 +234,15 @@ var OpenTok = function() {
});
}
$(".instructor_rate_button").attr("wid", values['wid']);
- $.get('../php/server_ajax.php', {
+ $.get('php/server_ajax.php', {
"o" : "instructor",
"a" : "pull",
"wid" : values['wid']
}, function(data) {
$(".instructor_rating").html(data.result);
});
- $.get('../php/server_ajax.php', {
+ $.get('php/server_ajax.php', {
"o" : "classroom",
"uid" : values['uid'],
"type" : values['type'],
View
10 php/classroom.php
@@ -1,11 +1,11 @@
<?php
?>
<script src="http://staging.tokbox.com/v0.91/js/TB.min.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="../js/tb.js"></script>
-<script type="text/javascript" src="../js/lib/io/dist/socket.io.js"></script>
-<script type="text/javascript" src="../js/chat.js"></script>
-<script type="text/javascript" src="../js/lib/etherpad.js"></script>
-<script type="text/javascript" src="../js/text_editor.js"></script>
+<script type="text/javascript" src="js/tb.js"></script>
+<script type="text/javascript" src="js/lib/io/dist/socket.io.js"></script>
+<script type="text/javascript" src="js/chat.js"></script>
+<script type="text/javascript" src="js/lib/etherpad.js"></script>
+<script type="text/javascript" src="js/text_editor.js"></script>
<script type="text/javascript">
$(document).ready(function() {

0 comments on commit 6630dcf

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