conflict resolve

9 years ago · 0763319c79
7 changed files with 53 additions and 14 deletions
--- a/cache/.jpg
+++ b/cache/.jpg
--- a/cache/1011197735591770.jpg
+++ b/cache/1011197735591770.jpg
--- a/cache/10206046105125680.jpg
+++ b/cache/10206046105125680.jpg
--- a/css/custom.css
+++ b/css/custom.css
@ -47,7 +47,7 @@ img.profile{
 	display:block;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-	/*background: url(../images/modi.jpg) no-repeat center/75%;*/
+	
 	width: 380px; /* Width of new image */
 	height: 380px; /* Height of new image */
 	margin: 0 auto;
@ -68,8 +68,9 @@ a .button{

 .footer{
 	margin-top: 20px;
-	float: right;
+	
 	text-decoration: none;
+	text-align: right;

 }

@ -84,5 +85,8 @@ ul.share-buttons{
 	margin: 0 auto;
 }
 p{
-	text-align: left;
+	/*text-align: left;*/
+}
+div.pp{
+	float: left;
 }
--- a/index.php
+++ b/index.php
@ -1,17 +1,14 @@
 <?php

  require( __DIR__.'/facebook_start.php' );
-  //  require( __DIR__.'/resize.php' );
+ 
  $helper = $fb->getRedirectLoginHelper();
 
  $permissions = ['email', 'user_posts','publish_actions']; // optional
  $callback    = 'http://isupportnetneutrality.in/login.php';
  $loginUrl    = $helper->getLoginUrl($callback, $permissions);

-  //Selecting a random image 
-  $bg=['images/bg1.jpeg','images/bg2.jpg','images/bg3.jpg','images/bg4.jpg','images/bg5.jpg'];
-  $bg_path=$bg[array_rand($bg)];
-  //debug_to_console($bg_path));
+ 

  ?>

@ -50,7 +47,18 @@
        </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>
+      
+        
+          <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>
@ -60,7 +68,11 @@
          <li><a href="http://www.reddit.com/submit?url=http%3A%2F%2Fisupportnetneutrality.in%2F&title=Show%20your%20support%20for%20Net%20Neutralty" target="_blank" title="Submit to Reddit"><img src="images/simple_icons_black/Reddit.png"></a></li>
          <li><a href="mailto:?subject=Show%20your%20support%20for%20Net%20Neutralty&body=Let%20us%20show%20our%20support%20for%20Net%20Neutrality%20by%20changing%20our%20facebook%20profile%20picture:%20http%3A%2F%2Fisupportnetneutrality.in%2F" target="_blank" title="Email"><img src="images/simple_icons_black/Email.png"></a></li>
        </ul>
-        <footer class="footer"><a href='https://github.com/ashwin47/Net-Neutral'>Made</a> by <a href="http://twitter.com/ashwinm">@ashwinm</a> </footer>
+        <footer class="footer">
+        <div class="pp"><a href="privacy-policy.html">Privacy policy</a></div>
+        <a href='https://github.com/ashwin47/Net-Neutral'>Made</a> by <a href="http://twitter.com/ashwinm">@ashwinm</a>
+        </footer>
+
      </div>
    </div>
    
--- a/overlay.php
+++ b/overlay.php
@ -2,18 +2,21 @@
 <?php 
 	require( __DIR__.'/facebook_start.php' );
 	
-	//Selecting a random image 
- 
-
 	$token = $_SESSION['facebook_access_token'];
   	//$r = new HttpRequest('https://graph.facebook.com/me?access_token='.$r, HttpRequest::METH_POST);

 	$output = curly($token);
 	echo $output;
 	$r=json_decode($output, true); //To Array
+	//$r = array('id' => "1011197735591770");
 	$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);
@ -74,9 +77,12 @@
 	    // Save as jpeg
 		imagejpeg($base_image, $path);
 	}
+<<<<<<< HEAD


 	
+=======
+>>>>>>> update
 	?>

 <!DOCTYPE html>
@ -87,7 +93,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <title>Show your support for Net Neutralty | Success </title>
+    <title>Show your support for Net Neutralty | Update </title>
    <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
    <link rel="stylesheet" href="css/normalize.css">
    <link rel="stylesheet" href="css/skeleton.css">
@ -103,16 +109,21 @@
  </head>
  <body>
  <?php include_once("analyticstracking.php") ?>
-	<img src="/images/bg2.jpg" class="bg">
+	<img src=<?php echo $bg_path?> class="bg">
    <div class="container">
 	    <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>
@ -120,6 +131,15 @@
 			</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>
--- a/privacy-policy.html
+++ b/privacy-policy.html
@ -17,7 +17,10 @@ The Website

 This website and its owners take a proactive approach to user privacy and ensure the necessary steps are taken to protect the privacy of its users throughout their visiting experience. This website complies to all UK national laws and requirements for user privacy.

+<<<<<<< HEAD

+=======
+>>>>>>> update
 <h1>Facebook Platform Policy</h1>
 This website is full comply to the <a href="https://developers.facebook.com/policy/"> Facebook Platform Policies.</a>
 We don't share or reuse the public profile picture under any circumstances, we automatically remove the cache images every month.