modified index

9 years ago · c4e806bc83
3 changed files with 5 additions and 38 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@ vendor/
 analyticstracking.php
 cache/
 facebook_start.php
+sitemap.xml
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
--- a/index.php
+++ b/index.php
@ -47,21 +47,10 @@
        </div>
        <div class="content">
        <br/>
-<<<<<<< HEAD
-        <p>Show your support for Net Neutrality by changing facebook profile picture. </p>
-=======
-        <p>Show your support for Net Neutrality by updating your facebook picture. </p>
-        <p>(It will not automatically change you picture)</p>
-      
-        
+        <p>Show your support for Net Neutrality by updating your facebook picture. </p>       
          <a class="button button-primary" href=<?php echo htmlspecialchars($loginUrl);?> > Log in to Facebook </a> 
-
-
-        
->>>>>>> update
-        
-          <a class="button button-primary" href=<?php echo htmlspecialchars($loginUrl)?> > Log in to Facebook </a>
-        </div>
+       
+       </div>
        <ul class="share-buttons">
          <li><a href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fisupportnetneutrality.in%2F&t=Show%20your%20support%20for%20Net%20Neutralty" title="Share on Facebook" target="_blank"><img src="images/simple_icons_black/Facebook.png"></a></li>
          <li><a href="https://twitter.com/intent/tweet?source=http%3A%2F%2Fisupportnetneutrality.in%2F&text=Show%20your%20support%20for%20Net%20Neutralty:%20http%3A%2F%2Fisupportnetneutrality.in%2F&via=ashwinm" target="_blank" title="Tweet"><img src="images/simple_icons_black/Twitter.png"></a></li>
--- a/overlay.php
+++ b/overlay.php
@ -12,11 +12,8 @@
 	$id= $r['id'];
 	
 	$path = "cache/".$id.".jpg";
-<<<<<<< HEAD
-	$_SESSION['path']=$path;
-=======
+
 	$_SESSION['path'] = $path;
->>>>>>> update
 	// only create if not already exists in cache
 	if (!file_exists($path)){	
 		create($id, $path);
@ -77,12 +74,7 @@
 	    // Save as jpeg
 		imagejpeg($base_image, $path);
 	}
-<<<<<<< HEAD
-

-	
-=======
->>>>>>> update
 	?>

 <!DOCTYPE html>
@ -114,32 +106,17 @@
 	    <div class="row">
 	      
 	      <div class="header">
-<<<<<<< HEAD
-	      	<h1>Your new profile picture is ready !</h1>
-=======
 	      	<h1>You new profile picture is ready !</h1>
->>>>>>> update
 	        <img class="profile" src=<?php echo $path ?> alt="">
 	      </div>
 	      <div class="content">
 	       <br/>
-<<<<<<< HEAD
-	       <form action="update.php" method="post">
-	      		<label>Status</label>
-				<textarea class="u-full-width" placeholder="#SaveTheInternet" id="exampleMessage" name="text"></textarea>
-			  	<input class="button-primary" value="Update" type="submit">
-			</form>
-	
-	   
-=======
-
 	  	<form action="update.php" method='post'>
 	   	 <label for="update" >Status</label>
 		  <textarea class="u-full-width" placeholder="" name="text"></textarea>
 		  <input class="button-primary" value="Update" type="submit">
 		</form>

->>>>>>> update
 	      Spread the word:
 	        <ul class="share-buttons">
 			  <li><a href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fisupportnetneutrality.in%2F&t=Show%20your%20support%20for%20Net%20Neutralty" title="Share on Facebook" target="_blank"><img src="images/simple_icons_black/Facebook.png"></a></li>