diff options
| -rwxr-xr-x | boot.php | 7 | ||||
| -rw-r--r-- | doc/Comanche.md | 12 | ||||
| -rw-r--r-- | include/comanche.php | 7 | ||||
| -rw-r--r-- | include/message.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 34 | ||||
| -rw-r--r-- | mod/help.php | 96 | ||||
| -rw-r--r-- | mod/layouts.php | 101 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/pdl/mod_chat.pdl | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 14 | ||||
| -rw-r--r-- | view/tpl/bookmarkedchats.tpl | 10 |
12 files changed, 132 insertions, 159 deletions
@@ -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/message.php b/include/message.php index a95021583..607166ec9 100644 --- a/include/message.php +++ b/include/message.php @@ -76,7 +76,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $match = null; $images = null; - if(preg_match_all("/\[img\](.*?)\[\/img\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) + if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) $images = $match[1]; $match = false; diff --git a/include/widgets.php b/include/widgets.php index 4a5ae9de7..8d5ab77e3 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -589,3 +589,37 @@ function widget_chatroom_list($arr) { )); } +function widget_bookmarkedchats($arr) { + $h = get_observer_hash(); + if(! $h) + return; + $r = q("select * from xchat where xchat_xchan = '%s' group by xchat_url order by xchat_desc", + dbesc($h) + ); + + for($x = 0; $x < count($r); $x ++) + $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); + return replace_macros(get_markup_template('bookmarkedchats.tpl'),array( + '$header' => t('Bookmarked Chatrooms'), + '$rooms' => $r + )); +} + +function widget_suggestedchats($arr) { + + // probably should restrict this to your friends, but then the widget will only work + // if you are logged in locally. + + $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 limit 24"); + + for($x = 0; $x < count($r); $x ++) + $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); + return replace_macros(get_markup_template('bookmarkedchats.tpl'),array( + '$header' => t('Suggested Chatrooms'), + '$rooms' => $r + )); +} + diff --git a/mod/help.php b/mod/help.php deleted file mode 100644 index 484104124..000000000 --- a/mod/help.php +++ /dev/null @@ -1,96 +0,0 @@ -<?php - -/** - * You can create local site resources in doc/Site.md and either link to doc/Home.md for the standard resources - * or use our include mechanism to include it on your local page. - * - * #include doc/Home.md; - * - * The syntax is somewhat strict. - * - */ - - -if(! function_exists('load_doc_file')) { -function load_doc_file($s) { - $lang = get_app()->language; - if(! isset($lang)) - $lang = 'en'; - $b = basename($s); - $d = dirname($s); - if(file_exists("$d/$lang/$b")) - return file_get_contents("$d/$lang/$b"); - if(file_exists($s)) - return file_get_contents($s); - return ''; -}} - - - -function help_content(&$a) { - nav_set_selected('help'); - - global $lang; - - $doctype = 'markdown'; - - require_once('library/markdown.php'); - - $text = ''; - - if(argc() > 1) { - $text = load_doc_file('doc/' . $a->argv[1] . '.md'); - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); - } - if(! $text) { - $text = load_doc_file('doc/' . $a->argv[1] . '.bb'); - if($text) - $doctype = 'bbcode'; - $a->page['title'] = t('Help:') . ' ' . str_replace('_',' ',ucfirst(notags(argv(1)))); - } - if(! $text) { - $text = load_doc_file('doc/' . $a->argv[1] . '.html'); - if($text) - $doctype = 'html'; - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); - } - - if(! $text) { - $text = load_doc_file('doc/Site.md'); - $a->page['title'] = t('Help'); - } - if(! $text) { - $doctype = 'bbcode'; - $text = load_doc_file('doc/main.bb'); - $a->page['title'] = t('Help'); - } - - if(! strlen($text)) { - header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); - $tpl = get_markup_template("404.tpl"); - return replace_macros($tpl, array( - '$message' => t('Page not found.' ) - )); - } - - $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); - - if($doctype === 'html') - return $text; - if($doctype === 'markdown') - return Markdown($text); - if($doctype === 'bbcode') { - require_once('include/bbcode.php'); - return bbcode($text); - } - -} - - -function preg_callback_help_include($matches) { - - if($matches[1]) - return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); - -} - 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/version.inc b/version.inc index ecdc97e53..cc429ef06 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-26.600 +2014-02-27.601 diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index 6b1d2a15e..cdc66dd3d 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=suggestedchats][/widget] [/region] 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; 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 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 |