Merge commit 'origin/master'

www/index.php

@@ -10,8 +10,8 @@ require_once('sflphone.funcs.php');
 
 
 // We've requested an image, fetch it, and send it.
-if (defined($_REQUEST['i'])) {
-  $img = $_REQUEST['i'];
+if (isset($_REQUEST['img'])) {
+  $img = $_REQUEST['img'];
   switch(strtolower(substr($img, -3))) {
   case 'jpg':
     header("Content-Type: image/jpeg");
@@ -26,9 +26,16 @@ if (defined($_REQUEST['i'])) {
     break;
   }
 
-  show_page($img);
+  show_page($img, FALSE);
+  exit();
 }
 
+if (isset($_REQUEST['file'])) {
+  include("header.php");
+  show_page($_REQUEST['file']);
+  include("footer.php");
+  exit();
+}
 
 
 $module = '';

www/sflphone.css

@@ -267,6 +267,7 @@ div.exampleblock-content {
 /** SFLphone specific */
 #header {
   text-align: center;
+  position: relative;
 }
 #header img {
   border: 0px;
@@ -279,3 +280,40 @@ div.exampleblock-content {
   border-left: 1px #aaaaaa solid;
   border-right: 1px #aaaaaa solid;
 }
+
+#downtown {
+  margin-top: 40px;
+  border-top: 1px solid #bbbbbb;
+  font-size: smaller;
+  padding: 1em 0pt 0pt 0pt;
+  clear: both;
+  color: #777777;
+  text-align: center;
+}
+
+.donate {
+  margin: auto
+}
+
+#homebutton {
+  position: absolute;
+  right: 0px;
+  top: 10px;
+}
+#homebutton img {
+  border: none;
+}
+
+.image {
+  text-align: center;
+  padding-bottom: 20px;
+}
+
+.image .image-title {
+  background: transparent url(images/see-above.png) no-repeat left;
+  padding-left: 20px;
+  color: #4D4F3A;
+  font-weight: normal;
+  font-style: italic;
+  display: inline;
+}
\ No newline at end of file