aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-27 20:48:10 -0800
committerfriendica <info@friendica.com>2014-02-27 20:48:10 -0800
commit102521844b3d6f31d0d801b0d0c89241c2c621af (patch)
tree9e44dc68fdf76640a3f784b1ae872b960d73a413
parentd2bc7c606a6585dc82127717acf2cfe60b45f987 (diff)
downloadvolse-hubzilla-102521844b3d6f31d0d801b0d0c89241c2c621af.tar.gz
volse-hubzilla-102521844b3d6f31d0d801b0d0c89241c2c621af.tar.bz2
volse-hubzilla-102521844b3d6f31d0d801b0d0c89241c2c621af.zip
put schemas in Comanche (this requires theme support (!))
-rwxr-xr-xboot.php7
-rw-r--r--doc/Comanche.md12
-rw-r--r--include/comanche.php7
-rw-r--r--include/widgets.php2
-rw-r--r--mod/layouts.php101
-rw-r--r--view/theme/redbasic/php/style.php14
6 files changed, 81 insertions, 62 deletions
diff --git a/boot.php b/boot.php
index c37bd57b9..d080b7774 100755
--- a/boot.php
+++ b/boot.php
@@ -1678,10 +1678,11 @@ function current_theme(){
function current_theme_url($installing = false) {
global $a;
$t = current_theme();
- $uid = '';
- $uid = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
+ $opts = '';
+ $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
+ $opts .= ((x($a->layout,'schema')) ? '&schema=' . $a->layout['schema'] : '');
if(file_exists('view/theme/' . $t . '/php/style.php'))
- return('view/theme/' . $t . '/php/style.pcss' . $uid);
+ return('view/theme/' . $t . '/php/style.pcss' . $opts);
return('view/theme/' . $t . '/css/style.css');
}
diff --git a/doc/Comanche.md b/doc/Comanche.md
index 8874e839a..2c3bb914a 100644
--- a/doc/Comanche.md
+++ b/doc/Comanche.md
@@ -6,7 +6,7 @@ Comanche is a markup language similar to bbcode with which to create elaborate a
Comanche primarily chooses what content will appear in various regions of the page. The various regions have names and these names can change depending on what layout template you choose.
-Currently there are two layout templates, unless your site provides additional layouts (TODO list all templates)
+Currently there are two layout templates, unless your site provides additional layouts.
default
@@ -42,6 +42,9 @@ To select a theme for your page, use the 'theme' tag.
This will select the theme named "apw". By default your channel's preferred theme will be used.
+ [theme=dark]redbasic[/theme]
+
+This will select the theme named "redbasic" and load the "dark" theme schema for this theme.
**Regions**
@@ -60,6 +63,11 @@ Your webpage creation tools allow you to create menus and blocks, in addition to
This places the menu called "mymenu" at this location on the page, which must be inside a region.
+ [menu=horizontal-menu]mymenu[/menu]
+
+This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it adds the CSS class "horizontal-menu" to this menu. This *may* result in a menu that looks different than the default menu style, *if* the css for the current theme defines a "horizontal-menu" class.
+
+
[block]contributors[/block]
This places a block named "contributors" in this region.
@@ -92,6 +100,8 @@ The 'comment' tag is used to delimit comments. These comments will not appear on
**Complex Example**
+Please note that pasting this example into a layout page is not likely to do anything useful as the chosen names (layout, theme, regions, etc.) may not correspond to any existing webpage components.
+
[comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment]
[layout]3-column-with-header[/layout]
diff --git a/include/comanche.php b/include/comanche.php
index f02190ee5..0c81b0ed3 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -57,6 +57,13 @@ function comanche_parser(&$a,$s) {
if($cnt)
$a->page['template'] = trim($matches[1]);
+
+ $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches);
+ if($cnt) {
+ $a->layout['schema'] = trim($matches[1]);
+ $a->layout['theme'] = trim($matches[2]);
+ }
+
$cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches);
if($cnt)
$a->layout['theme'] = trim($matches[1]);
diff --git a/include/widgets.php b/include/widgets.php
index aaf5a72a0..8d5ab77e3 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -613,7 +613,7 @@ function widget_suggestedchats($arr) {
$h = get_observer_hash();
if(! $h)
return;
- $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc");
+ $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc limit 24");
for($x = 0; $x < count($r); $x ++)
$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
diff --git a/mod/layouts.php b/mod/layouts.php
index 9ed349850..cbbef4fea 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -28,76 +28,71 @@ function layouts_content(&$a) {
return;
}
+ // Get the observer, check their permissions
+ $observer = $a->get_observer();
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+ $perms = get_all_perms($owner,$ob_hash);
-// Get the observer, check their permissions
-
- $observer = $a->get_observer();
- $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+ if(! $perms['write_pages']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
- $perms = get_all_perms($owner,$ob_hash);
+ $tabs = array(
+ array(
+ 'label' => t('Layout Help'),
+ 'url' => 'help/Comanche',
+ 'sel' => '',
+ 'title' => t('Help with this feature'),
+ 'id' => 'layout-help-tab',
+ ));
- if(! $perms['write_pages']) {
- notice( t('Permission denied.') . EOL);
- return;
- }
-// if(local_user() && local_user() == $owner) {
- // $a->set_widget('design',design_tools());
- // }
+ $o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
- $tabs = array(
- array(
- 'label' => t('Layout Help'),
- 'url' => 'help/Comanche',
- 'sel' => '',
- 'title' => t('Help with this feature'),
- 'id' => 'layout-help-tab',
- ));
+ // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+ // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels.
- $o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
+ require_once ('include/conversation.php');
+ $x = array(
+ 'webpage' => ITEM_PDL,
+ 'is_owner' => true,
+ 'nickname' => $a->profile['channel_address'],
+ 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+ 'bang' => (($group || $cid) ? '!' : ''),
+ 'visitor' => 'none',
+ 'nopreview' => 1,
+ 'ptlabel' => t('Layout Name'),
+ 'profile_uid' => intval($owner),
+ );
-// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels.
-require_once ('include/conversation.php');
- $x = array(
- 'webpage' => ITEM_PDL,
- 'is_owner' => true,
- 'nickname' => $a->profile['channel_address'],
- 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
- 'bang' => (($group || $cid) ? '!' : ''),
- 'visitor' => 'none',
- 'nopreview' => 1,
- 'ptlabel' => t('Layout Name'),
- 'profile_uid' => intval($owner),
- );
+ $o .= status_editor($a,$x);
- $o .= status_editor($a,$x);
+ // Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
+ // TODO - this should be replaced with pagelist_widget
- //Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
-//TODO - this should be replaced with pagelist_widget
+ $r = q("select * from item_id where uid = %d and service = 'PDL' order by sid asc",
+ intval($owner)
+ );
-$r = q("select * from item_id where uid = %d and service = 'PDL' order by sid asc",
- intval($owner)
-);
+ $pages = null;
- $pages = null;
+ if($r) {
+ $pages = array();
+ foreach($r as $rr) {
+ $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
+ }
+ }
- if($r) {
- $pages = array();
- foreach($r as $rr) {
- $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']);
- }
- }
+ //Build the base URL for edit links
+ $url = z_root() . "/editlayout/" . $which;
-//Build the base URL for edit links
- $url = z_root() . "/editlayout/" . $which;
-// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM).
- return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
+ return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
'$baseurl' => $url,
'$edit' => t('Edit'),
'$pages' => $pages,
@@ -105,7 +100,7 @@ $r = q("select * from item_id where uid = %d and service = 'PDL' order by sid as
'$view' => t('View'),
'$preview' => '1',
- ));
+ ));
}
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