cemetery
/
KAAS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

modified index

master
ashwin47 9 years ago
parent
0763319c79
commit
c4e806bc83
3 changed files with 5 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 11
      index.php
  3. 25
      overlay.php

1
.gitignore
View File

@ -3,6 +3,7 @@ vendor/
analyticstracking.php analyticstracking.php
cache/ cache/
facebook_start.php facebook_start.php
sitemap.xml
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file # 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 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock # composer.lock

11
index.php
View File

@ -47,20 +47,9 @@
</div> </div>
<div class="content"> <div class="content">
<br/> <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>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> <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"> <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://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>

25
overlay.php
View File

@ -12,11 +12,8 @@
$id= $r['id']; $id= $r['id'];
$path = "cache/".$id.".jpg"; $path = "cache/".$id.".jpg";
<<<<<<< HEAD
$_SESSION['path']=$path;
=======
$_SESSION['path'] = $path; $_SESSION['path'] = $path;
>>>>>>> update
// only create if not already exists in cache // only create if not already exists in cache
if (!file_exists($path)){ if (!file_exists($path)){
create($id, $path); create($id, $path);
@ -77,12 +74,7 @@
// Save as jpeg // Save as jpeg
imagejpeg($base_image, $path); imagejpeg($base_image, $path);
} }
<<<<<<< HEAD
=======
>>>>>>> update
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -114,32 +106,17 @@
<div class="row"> <div class="row">
<div class="header"> <div class="header">
<<<<<<< HEAD
<h1>Your new profile picture is ready !</h1>
=======
<h1>You new profile picture is ready !</h1> <h1>You new profile picture is ready !</h1>
>>>>>>> update
<img class="profile" src=<?php echo $path ?> alt=""> <img class="profile" src=<?php echo $path ?> alt="">
</div> </div>
<div class="content"> <div class="content">
<br/> <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'> <form action="update.php" method='post'>
<label for="update" >Status</label> <label for="update" >Status</label>
<textarea class="u-full-width" placeholder="" name="text"></textarea> <textarea class="u-full-width" placeholder="" name="text"></textarea>
<input class="button-primary" value="Update" type="submit"> <input class="button-primary" value="Update" type="submit">
</form> </form>
>>>>>>> update
Spread the word: Spread the word:
<ul class="share-buttons"> <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://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>

Write Preview
Loading…
Cancel
Save