Changeset - 73fccd196b60
Parent rev.
Child rev.
[Not reviewed]
Merge default
0 3 1
ethanzonca - 15 years ago 2010-07-13 23:23:08

Merge
4 files changed with 27 insertions and 5 deletions:
analyticstracking.php
13
class.schedule.php
3
3
index.php
4
2
input.php
7
0 comments (0 inline, 0 general)
analyticstracking.php
➞
Show inline comments
 
new file 100644
 
<script type="text/javascript">
 

			




	
	
	
		
 
  var _gaq = _gaq || [];

			




	
	
	
		
 
  _gaq.push(['_setAccount', 'UA-17441156-1']);

			




	
	
	
		
 
  _gaq.push(['_trackPageview']);

			




	
	
	
		
 

			




	
	
	
		
 
  (function() {

			




	
	
	
		
 
    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

			




	
	
	
		
 
    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

			




	
	
	
		
 
    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

			




	
	
	
		
 
  })();

			




	
	
	
		
 

			




	
	
	
		
 
</script>

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    class.schedule.php
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -211,7 +211,7 @@ class Schedule

			




	
	
	
		
 

			




	
	
	
		
 
		// Reminder:

			




	
	
	
		
 
		// border-style:top right bottom left

			




	
	
	
		
 
		$header .= "<html><head><title>" . $this->title . "</title>\n\n<style type=\"text/css\">".

			




	
	
	
		
 
		$header .= "<html><head><title>" . $this->getName() . " :: " . $this->title . "</title>\n\n<style type=\"text/css\">".

			




	
	
	
		
 
				"\n.top{\n\tborder-style:solid solid none solid;\nbackground-color:#dddddd;\n}".

			




	
	
	
		
 
				"\n.mid{\n\tborder-style:none solid none solid;\nbackground-color:#dddddd;\n}".

			




	
	
	
		
 
				"\n.end{\n\tborder-style:none solid solid solid;\nbackground-color:#dddddd;\n}".

			




	
	
		
 
@@ -236,11 +236,11 @@ class Schedule

			




	
	
	
		
 
			"\n<script src=\"scripts/effects.js\" type=\"text/javascript\" charset=\"utf-8\"></script>".

			




	
	
	
		
 
			"\n<script src=\"scripts/glider.js\" type=\"text/javascript\" charset=\"utf-8\"></script>".

			




	
	
	
		
 
			

			




	
	
	
		
 
			"\n</head><body>".

			




	
	
	
		
 
			"\n</head><body><?php include_once("analyticstracking.php") ?>".

			




	
	
	
		
 

			




	
	
	
		
 
			"<p>There were a total of " . $this->possiblePermutations . " possible permutations. Only " . $this->nPermutations . " permutations had no class conflicts.</p>".

			




	
	
	
		
 

			




	
	
	
		
 
			"\n\n<div id=\"header\">\n<h1><em>SlatePermutate</em> - Scheduler</h1>\n</div><div id=\"content\">";

			




	
	
	
		
 
			"\n\n<div id=\"header\">\n<h1><em>SlatePermutate</em> - Scheduler</h1><h3>Schedule name: " . $this->getName() . "</h3>\n</div><div id=\"content\">";

			




	
	
	
		
 
			

			




	
	
	
		
 
		$footer .="</div></div><script type=\"text/javascript\" charset=\"utf-8\">". 

			




	
	
	
		
 
			"\n\tvar my_glider = new Glider('my-glider', {duration:0});".

			




        

    


    
    

    

        

                

                    index.php
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -37,6 +37,8 @@

			




	
	
	
		
 
</head>

			




	
	
	
		
 
<body>

			




	
	
	
		
 

			




	
	
	
		
 
<?php include_once("analyticstracking.php") ?>

			




	
	
	
		
 

			




	
	
	
		
 
<div id="header">

			




	
	
	
		
 
<h1><em>SlatePermutate</em> -  Scheduler</h1>

			




	
	
	
		
 
</div>

			




	
	
		
 
@@ -47,8 +49,8 @@

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div id="footer">

			




	
	
	
		
 
<h5>&copy; <?php echo Date("Y"); ?> <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br />

			




	
	
	
		
 
with special thanks to <a href="http://ethanzonca.com">Ethan Zonca</a></h5>

			




	
	
	
		
 
<h5>&copy; <?php echo Date("Y") . ' ' . Date("n") . ' ' . Date("j"); ?> <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br />

			




	
	
	
		
 
with special thanks to <a href="http://ethanzonca.com">Ethan <?php if((Date("n")==7)&&(Date("j")==11)){echo '"the Birthday Boy" ';} ?>Zonca</a></h5>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
</body>

			




        

    


    
    

    

        

                

                    input.php
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -268,6 +268,8 @@ include_once 'class.section.php';

			




	
	
	
		
 
</head>

			




	
	
	
		
 
<body>

			




	
	
	
		
 

			




	
	
	
		
 
<?php include_once("analyticstracking.php") ?>

			




	
	
	
		
 

			




	
	
	
		
 
<div id="header">

			




	
	
	
		
 
	<h1>

			




	
	
	
		
 
		<em>

			




	
	
		
 
@@ -342,6 +344,11 @@ if(isset($_SESSION['saved']) && count($_

			




	
	
	
		
 
	<li>Check the saved schedule function. After input my default schedule, the output was the same

			




	
	
	
		
 
		as that of the demo. However, when I went back and clicked the "Saved Schedule 0" link, there 

			




	
	
	
		
 
		were then 48 possible schedules. It seems that the classes were added twice for some reason.</li>

			




	
	
	
		
 
	<li>Is there some way to automatically populate the fields when a user clicks on a saved schedule?

			




	
	
	
		
 
		This would probably be very useful, in the case that the individual would like to edit a saved

			




	
	
	
		
 
		schedule. Right now, it is only possible to edit the most previous schedule using the back button

			




	
	
	
		
 
		in the browser and this still requires the user to add the classes and schedules (although they

			




	
	
	
		
 
		already populated as soon as they are added).</li>

			




	
	
	
		
 
</ul>

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-307515
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support