diff --git a/include/bbcode.php b/include/bbcode.php
index 17b25c206..a4e7560d6 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -63,7 +63,7 @@ function bb_spacefy($st) {
}
// The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
-// now turns back and the [noparse] tags are trimed
+// now turns back and the [noparse] tags are trimmed
// returning [i]italic[/i]
function bb_unspacefy_and_trim($st) {
@@ -630,24 +630,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Images
// [img]pathtoimage[/img]
if (strpos($Text,'[/img]') !== false) {
- $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '
', $Text);
+ $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '', $Text);
}
if (strpos($Text,'[/zmg]') !== false) {
- $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '', $Text);
+ $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '', $Text);
}
// [img float={left, right}]pathtoimage[/img]
if (strpos($Text,'[/img]') !== false) {
- $Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '', $Text);
+ $Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '', $Text);
}
if (strpos($Text,'[/img]') !== false) {
- $Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '', $Text);
+ $Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '', $Text);
}
if (strpos($Text,'[/zmg]') !== false) {
- $Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '', $Text);
+ $Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '', $Text);
}
if (strpos($Text,'[/zmg]') !== false) {
- $Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '', $Text);
+ $Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '', $Text);
}
// [img=widthxheight]pathtoimage[/img]
diff --git a/mod/photo.php b/mod/photo.php
index 1319f9569..9302278b6 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -80,6 +80,22 @@ function photo_init(&$a) {
* Other photos
*/
+ /* Check for a cookie to indicate display pixel density, in order to detect high-resolution
+ displays. This procedure was derived from the "Retina Images" by Jeremey Worboys,
+ used in accordance with the Creative Commons Attribution 3.0 Unported License.
+ Project link: https://github.com/Retina-Images/Retina-Images
+ License link: http://creativecommons.org/licenses/by/3.0/
+ */
+ $cookie_value = false;
+ if (isset($_COOKIE['devicePixelRatio'])) {
+ $cookie_value = intval($_COOKIE['devicePixelRatio']);
+ }
+ else {
+ // Force revalidation of cache on next request
+ $cache_directive = 'no-cache';
+ $status = 'no cookie';
+ }
+
$resolution = 0;
if(strpos($photo,'.') !== false)
@@ -88,7 +104,23 @@ function photo_init(&$a) {
if(substr($photo,-2,1) == '-') {
$resolution = intval(substr($photo,-1,1));
$photo = substr($photo,0,-2);
+ // If viewing on a high-res screen, attempt to serve a higher resolution image:
+ if ($resolution == 2 && ($cookie_value > 1))
+ {
+ $resolution = 1;
+ }
}
+
+ // If using resolution 1, make sure it exists before proceeding:
+ if ($resolution == 1)
+ {
+ $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND scale = %d LIMIT 1",
+ dbesc($photo),
+ intval($resolution)
+ );
+ if (!($r))
+ $resolution = 2;
+ }
$r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND scale = %d LIMIT 1",
dbesc($photo),
@@ -125,7 +157,7 @@ function photo_init(&$a) {
dbesc($photo),
intval($resolution)
);
-
+
if($r) {
logger('mod_photo: forbidden. ' . $a->query_string);
$observer = $a->get_observer();
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ba26f8910..88fd693ad 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1911,29 +1911,45 @@ img.mail-list-sender-photo {
.wall-item-content-wrapper:hover {
z-index:99;
}
-/*
.comment .wall-item-body {
-padding-left: 42px;
+ padding-left: $comment_padding;
}
- */
+
.hide-comments-outer,
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
- border-left: 1px solid $comment_border_colour;
- border-right: 1px solid $comment_border_colour;
- border-bottom: 1px solid $comment_border_colour;
+ border-left: $comment_border_left $comment_border_colour;
+ border-right: $comment_border_right $comment_border_colour;
+
+ border-bottom: $comment_border_bottom $comment_border_colour;
border-radius: 0px;
padding: 7px 10px 7px 7px;
}
+/*
+.thread-wrapper.toplevel_item{
+ border-bottom: $comment_border_bottom $comment_border_colour;
+ border-right: $comment_border_right $item_colour;
+ border-left: $comment_border_left $item_colour;
+
+ border-top-right-radius: $radiuspx;
+ border-top-left-radius: $radiuspx;
+ border-bottom-right-radius: $radiuspx;
+ border-bottom-left-radius: $radiuspx;
+}
+ */
.wall-item-comment-wrapper {
background-color: $comment_item_colour;
- border: 1px solid $item_colour;
+ /* border-top: $comment_border_top $item_colour; */
+ border-right: $comment_border_right $item_colour;
+ border-left: $comment_border_left $item_colour;
+ border-bottom: $comment_border_bottom $item_colour;
border-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
}
+
.wall-item-like,
.wall-item-dislike {
font-size: 11px;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 698adaf4d..e03d1c741 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -248,6 +248,17 @@ if(! $a->install) {
$reply_photo = '32px';
if(! $infomess_bgcolour)
$infomess_bgcolour = "#F0F0F0";
+ if (!$comment_padding)
+ $comment_padding="0px";
+ if (!$comment_border_left)
+ $comment_border_left="2px solid";
+ if (!$comment_border_right)
+ $comment_border_right="0px solid";
+ if (!$comment_border_top)
+ $comment_border_top="0px solid";
+ if (!$comment_border_bottom)
+ $comment_border_bottom="0px solid";
+
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100;
@@ -357,7 +368,12 @@ $options = array (
'$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop,
'$comment_indent' => $comment_indent,
-'$body_width' => $body_width
+'$body_width' => $body_width,
+'$comment_padding' => $comment_padding,
+'$comment_border_left' =>$comment_border_left,
+'$comment_border_right' =>$comment_border_right,
+'$comment_border_top' =>$comment_border_top,
+'$comment_border_bottom' =>$comment_border_bottom,
);
echo str_replace(array_keys($options), array_values($options), $x);
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
new file mode 100644
index 000000000..1de2f98cd
--- /dev/null
+++ b/view/theme/redbasic/schema/boxy.php
@@ -0,0 +1,19 @@
+
+
+
+
{{$head_css}}
{{$js_strings}}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 01f135522..b34f3fcf5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -9,7 +9,7 @@
{{if $prevlink}}{{/if}}
-
+
{{if $nextlink}}{{/if}}
{{$desc}}