aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--inc/poche/Tools.class.php8
-rwxr-xr-xinc/poche/config.inc.php.new5
-rw-r--r--themes/default/_head.twig1
-rw-r--r--themes/default/css/style.css11
-rw-r--r--themes/default/fonts/Roboto.woffbin0 -> 22172 bytes
5 files changed, 20 insertions, 5 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 8eb988f4..1d092823 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -41,10 +41,14 @@ class Tools
41 $https = (!empty($_SERVER['HTTPS']) 41 $https = (!empty($_SERVER['HTTPS'])
42 && (strtolower($_SERVER['HTTPS']) == 'on')) 42 && (strtolower($_SERVER['HTTPS']) == 'on'))
43 || (isset($_SERVER["SERVER_PORT"]) 43 || (isset($_SERVER["SERVER_PORT"])
44 && $_SERVER["SERVER_PORT"] == '443'); // HTTPS detection. 44 && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
45 || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection
46 && $_SERVER["SERVER_PORT"] == SSL_PORT);
47
45 $serverport = (!isset($_SERVER["SERVER_PORT"]) 48 $serverport = (!isset($_SERVER["SERVER_PORT"])
46 || $_SERVER["SERVER_PORT"] == '80' 49 || $_SERVER["SERVER_PORT"] == '80'
47 || ($https && $_SERVER["SERVER_PORT"] == '443') 50 || ($https && $_SERVER["SERVER_PORT"] == '443')
51 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
48 ? '' : ':' . $_SERVER["SERVER_PORT"]); 52 ? '' : ':' . $_SERVER["SERVER_PORT"]);
49 53
50 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); 54 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
@@ -243,4 +247,4 @@ class Tools
243 $lang = explode('.', $userlanguage); 247 $lang = explode('.', $userlanguage);
244 return str_replace('_', '-', $lang[0]); 248 return str_replace('_', '-', $lang[0]);
245 } 249 }
246} \ No newline at end of file 250}
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 99223c78..c60d4f80 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -25,6 +25,9 @@ define ('STORAGE_PASSWORD', 'poche');
25# Do not trespass unless you know what you are doing 25# Do not trespass unless you know what you are doing
26################################################################################# 26#################################################################################
27 27
28// Change this if not using the standart port for SSL - i.e you server is behind sslh
29define ('SSL_PORT', 443);
30
28define ('MODE_DEMO', FALSE); 31define ('MODE_DEMO', FALSE);
29define ('DEBUG_POCHE', FALSE); 32define ('DEBUG_POCHE', FALSE);
30define ('DOWNLOAD_PICTURES', FALSE); 33define ('DOWNLOAD_PICTURES', FALSE);
@@ -55,4 +58,4 @@ define ('INSTAPAPER_FILE', '/instapaper-export.html');
55 58
56define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE); 59define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE);
57define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE); 60define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE);
58define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE); \ No newline at end of file 61define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE);
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 247b929e..d0cbd320 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -7,5 +7,4 @@
7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> 7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
10 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 3ef9c823..670eb50f 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -1,3 +1,12 @@
1@font-face {
2 font-family: 'Roboto';
3 font-style: normal;
4 font-weight: 400;
5 src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
6}
7
8
9
1body { 10body {
2 margin: 10px; 11 margin: 10px;
3 font-family: 'Roboto',Verdana,Geneva,sans-serif; 12 font-family: 'Roboto',Verdana,Geneva,sans-serif;
@@ -318,4 +327,4 @@ a.link span,
318a.bad-display span, 327a.bad-display span,
319a.reading-time span { 328a.reading-time span {
320 background-repeat: no-repeat; 329 background-repeat: no-repeat;
321} \ No newline at end of file 330}
diff --git a/themes/default/fonts/Roboto.woff b/themes/default/fonts/Roboto.woff
new file mode 100644
index 00000000..1440b1be
--- /dev/null
+++ b/themes/default/fonts/Roboto.woff
Binary files differ