Permalink
Browse files

Fixing merge conflicts. dev -> master

  • Loading branch information...
2 parents fb17a1e + c2860db commit 447626fd1b9848848f403769a365358f09ca38d9 @jaseemabid jaseemabid committed Nov 5, 2011
Showing with 2,103 additions and 2,190 deletions.
  1. +674 −0 GPL-LICENSE.txt
  2. +6 −0 README.md
  3. +30 −57 contribute.php
  4. +0 −133 css/popup.css
  5. +0 −161 css/storybox.css
  6. +125 −0 css/storybox.less
  7. +0 −456 css/structure.css
  8. +611 −0 css/structure.less
  9. +3 −3 editprofile.html
  10. +6 −7 faq.php
  11. +12 −10 feedback.html
  12. +11 −8 index.php
  13. +511 −24 js/functions.js
  14. +0 −18 js/jquery-1.6.2.min.js
  15. +0 −228 js/jquery.jkey.js
  16. +1 −0 js/jquery.js
  17. +0 −132 js/jquery.timeago.js
  18. +0 −312 js/jsonparse.js
  19. +16 −0 js/less-1.1.3.min.js
  20. +0 −65 js/search.js
  21. +0 −11 js/templates.js
  22. +0 −185 js/ui.js
  23. +0 −262 js/validate.js
  24. +18 −29 profile.php
  25. +23 −23 search.php
  26. +28 −24 source.php
  27. +9 −7 template.php
  28. +19 −35 video.php
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -13,3 +13,9 @@
* You can clone the code at your forked repo or `git://github.com/nitcalicut/Paathshaala.git`
* If you have any queries, please report it here. New developers are most welcome. Please feel free to contact [jaseemabid] (/jaseemabid) or [swvist] (/swvist) for queries.
+### Development branches :
+ master : The current stable version deployed in servers
+ dev : The next big thing that is going to be part of master.
+ Rewriting major JavaScript functions here.
+ less : Ported the project to less from css.
+ Major rewrite for performance gains and code maintainability.
View
@@ -2,82 +2,55 @@
<html>
<head>
<title>Paathshaala Contribute</title>
-
<?php
-
include 'source.php';
include 'functions/ui.php';
echo $header;
?>
-<script src='js/like.js' type='text/javascript'></script>
-<script src='js/video.js' type='text/javascript'></script>
-<script src='js/parsevideo.js' type='text/javascript'></script>
<link rel='stylesheet' href='css/video-js.css'>
<link rel='stylesheet' href='css/video.css'>
-
-<script type='text/javascript'>
-$(document).ready(function() {
- getVideoHtml();
-});
-
-function getActiveUser() {
- <?php echo "return \"" .$_SESSION['uid']. "\"" ; ?> ;
-}
-
-</script>
</head>
<body>
<div id='topbar'></div>
<img src="pics/load.gif" id='loading'/ style='display:none;'>
-
<div id='container'>
- <?php echo $topNotLoggedIn;
+ <?php echo $topBar;
echo $feedback; ?>
-
-<span style='font-size:24px; color:#3A75AF'> Contribute to paathshaala</span> <span id="helpTrigger" style='font-size:14px'> [help] </span>
-
-<div id='helpMessage' class='message' style='border:0px; display:none'>
- We have a lot of unpublished videos with us which is not yet searchable. Your contribution will make this video public and useful for others.<i>One small step for a student, one giant leap for student kind.</i><br />
- Please dont mess up !
-</div>
-
-
+ <span style='font-size:24px; color:#3A75AF'> Contribute to paathshaala</span> <span id="helpTrigger" style='font-size:14px'> [help] </span>
+ <div id='helpMessage' class='message' style='border:0px; display:none'>
+ We have a lot of unpublished videos with us which is not yet searchable. Your contribution will make this video public and useful for others.<br/><i>One small step for a student, one giant leap for student kind.</i><br />Please dont mess up !
+ </div>
<div class='mainLeft'>
<div class='videodiv'></div>
</div> <!--/ main left -->
-
-<div class='mainRight'>
-
-
-
-<div class='message' id='helpLog' >
- Describe video details along
-</div>
-
-
-<form class='newVideoSubmit'>
-
-<input type="text" id="title" placeholder="Enter a title for your new video"/>
-<input type="text" id="tags" placeholder="Now few comma seperated tags"/>
-<textarea id='desc' placeholder="Now add a good description to make this video searchable and useful for others"></textarea>
-
-<div class='newVideoSubmitButton'>Submit video to paathshaala :)</div>
-
-</form>
-
-
-
+ <div class='mainRight'>
+ <div class='message' id='helpLog' >
+ Describe video details along
+ </div>
+ <form class='newVideoSubmit'>
+ <input type="text" id="title" placeholder="Enter a title for your new video"/>
+ <input type="text" id="tags" placeholder="Now few comma seperated tags"/>
+ <textarea id='desc' placeholder="Now add a good description to make this video searchable and useful for others"></textarea>
+ <div class='newVideoSubmitButton'>Submit video to paathshaala :)</div>
+ </form>
</div> <!-- /main right -->
-
-
-
</div><!-- /container -->
+<?php
+ echo $bottomBar;
+ echo $scripts;
+ echo $piwik;
+?>
+<script src='js/video.js' type='text/javascript'></script>
+<script src='js/comment.js' type='text/javascript'></script>
+<script type='text/javascript'>
+$(document).ready(function() {
+ Paathshaala.getVideo();
+ $('span#helpTrigger').click(function(){
+ $('div#helpMessage').slideToggle();
+ });
+});
+</script>
-
-<?php echo $bottomBar; ?>
-<div id="bottombar"></div>
-<script src='js/ui.js' type='text/javascript' ></script>
-<?php echo $piwik; ?>
</body>
</html>
View
@@ -1,133 +0,0 @@
-div#feedback, div#editProfile {
-display:none;
-position:fixed;
-top:100px;
-left:35%;
-width : 400px;
-height : 275px;
-z-index:100;
-border-color: #D2D2D2;
-background:#f5f5f5;
-border-right: 1px solid #DDDDDD;
-border-style: none solid solid;
-border-width:1px;
-padding: 10px 10px 10px 10px;
-box-shadow:5px 4px 5px rgba(2, 2, 2, 0.5);
-border-radius:5px;
-}
-
-div#feedback form.feedbackForm {
-border:0px solid #80afdf;
-position:relative;
-top:-20px;
-}
-
-span.fbTitle {
-font-family: 'Pacifico', arial, serif;
-font-size:20px;
-background:transparent;
-color:#6480a5;
-}
-
-span#cross {
-position:absolute;
-top:10px;
-right:10px;
-font-family:Arial;
-cursor: url(../pics/pointer.png) 0 0, auto;
-z-index: 10;
-}
-
-div#blueLine {
-height:40px;
-width:100%;
-margin:10px 0px;
-background:transparent;
-border-bottom:1px solid #b5d2f0;
-border-top:1px dotted #d1d1d1;
-}
-
-ul.links li {
-z-index:55;
-position:relative;
-top:-45px;
-display:inline-block;
-background: -moz-linear-gradient(center top , #F0F0EA, #D5D7CE) repeat scroll 0 0 transparent;
-color: #333333;
-text-shadow: 0 1px 0 #FFFFFF;
-border: 1px solid #BBBBBB;
-border-radius: 4px 4px 4px 4px;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-display: inline-block;
-outline: medium none;
-text-align: center;
-text-decoration: none;
-cursor: url(../pics/pointer.png) 0 0, auto;
-height:20px;
-padding:2px 3px;
-margin:-10px 1px 1px 1px;
-}
-
-.links li:hover {
-background: #fefefe;
-border-radius:4px;
-}
-
-.links li.hilite {
-background: #fefefe;
-border-radius:4px;
-}
-
-.content div.panel {
-padding-top:10px;
-z-index:52;
-position:relative;
-top:-60px;
-display:none;
-width:400px;
-height:100px;
-}
-
-form.feedbackForm input , form.feedbackForm textarea {
--moz-transition: all 0.3s ease-in-out 0s;
-font-size:14px;
-color: #555555;
-background: #efefef;
-width:390px;
-border: 1px #D2D2D2 solid;
-padding-left:10px;
-border-radius: 5px;
-height:25px;
-padding-left:10px;
-margin-bottom:2px;
-outline: medium none;
-text-shadow: 0 1px 0 #FFFFFF;
-}
-
-form.feedbackForm textarea {
-height:100px;
-}
-
-.grayButton {
-background: -moz-linear-gradient(center top , #F0F0EA, #D5D7CE) repeat scroll 0 0 transparent;
-color: #333333;
-text-shadow: 0 1px 0 #FFFFFF;
-border: 1px solid #BBBBBB;
-border-radius: 4px 4px 4px 4px;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-display: inline-block;
-font-size: 12px;
-outline: medium none;
-padding: 3px 10px 4px;
-text-align: center;
-text-decoration: none;
-cursor: url(../pics/pointer.png) 0 0, auto;
-position:relative;
-top:10px;
-float:right;
-}
-
-.grayButton:hover {
-background: -moz-linear-gradient(center top ,#D5D7CE, #F0F0EA) repeat scroll 0 0 transparent;
-color: #555555;
-}
Oops, something went wrong.

0 comments on commit 447626f

Please sign in to comment.