From 642da17b86cce8f6455a68d2d863a288d3c125c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 27 Feb 2014 17:07:11 -0800
Subject: chatroom suggestions

---
 view/pdl/mod_chat.pdl        |  2 ++
 view/tpl/bookmarkedchats.tpl | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 view/tpl/bookmarkedchats.tpl

(limited to 'view')

diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl
index 6b1d2a15e..afc849868 100644
--- a/view/pdl/mod_chat.pdl
+++ b/view/pdl/mod_chat.pdl
@@ -1,3 +1,5 @@
 [region=aside]
 [widget=profile][/widget]
+[widget=bookmarkedchats][/widget]
+[widget=suggestededchats][/widget]
 [/region]
diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl
new file mode 100644
index 000000000..7635bb826
--- /dev/null
+++ b/view/tpl/bookmarkedchats.tpl
@@ -0,0 +1,10 @@
+{{if $rooms}}
+<div class="widget">
+<h3>{{$header}}</h3>
+<ul class="bookmarkchat">
+{{foreach $rooms as $room}}
+<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li>
+{{/foreach}}
+</ul>
+</div>
+{{/if}}
\ No newline at end of file
-- 
cgit v1.2.3


From d2bc7c606a6585dc82127717acf2cfe60b45f987 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 27 Feb 2014 17:10:26 -0800
Subject: minor fixes to suggested chatrooms

---
 view/pdl/mod_chat.pdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl
index afc849868..cdc66dd3d 100644
--- a/view/pdl/mod_chat.pdl
+++ b/view/pdl/mod_chat.pdl
@@ -1,5 +1,5 @@
 [region=aside]
 [widget=profile][/widget]
 [widget=bookmarkedchats][/widget]
-[widget=suggestededchats][/widget]
+[widget=suggestedchats][/widget]
 [/region]
-- 
cgit v1.2.3


From 102521844b3d6f31d0d801b0d0c89241c2c621af Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 27 Feb 2014 20:48:10 -0800
Subject: put schemas in Comanche (this requires theme support (!))

---
 view/theme/redbasic/php/style.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 901d06af7..01e81eb53 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -37,10 +37,16 @@ if(! $a->install) {
 
 }
 
-// Now load the scheme.  If a value is changed above, we'll keep the settings
-// If not, we'll keep those defined by the schema
-// Setting $scheme to '' wasn't working for some reason, so we'll check it's
-// not --- like the mobile theme does instead.
+	// Now load the scheme.  If a value is changed above, we'll keep the settings
+	// If not, we'll keep those defined by the schema
+	// Setting $schema to '' wasn't working for some reason, so we'll check it's
+	// not --- like the mobile theme does instead.
+
+
+	// Allow layouts to over-ride the schema
+
+	if($_REQUEST['schema'])
+		$schema = $_REQUEST['schema'];
 
 	if (($schema) && ($schema != '---')) {
 		// Check it exists, because this setting gets distributed to clones
-- 
cgit v1.2.3


From 7cb295bbe627eab2546e859248eacd26da948ed9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 27 Feb 2014 20:55:25 -0800
Subject: over-ride code tags within pre blocks as bootstrap which puts a
 border around pre tags, which messes up markdown code blocks which have yet
 another border.

---
 view/theme/redbasic/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 057a0fba4..2efe79dcc 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -74,6 +74,10 @@ input[type="submit"] {
 	text-decoration: none;
 }
 
+pre code {
+	border: none;
+}
+
 code {
 	font-family: Courier, monospace;
 	display: block;
-- 
cgit v1.2.3