aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-02 15:47:01 -0800
committerfriendica <info@friendica.com>2014-03-02 15:47:01 -0800
commite931af830701fdacc64e2cc014aa0057dc91e093 (patch)
tree65cc83d4219df007046fef9b6793d366db19bd0e
parenteb2b2f504c7cd36dd5ab473153202315e6a717fe (diff)
downloadvolse-hubzilla-e931af830701fdacc64e2cc014aa0057dc91e093.tar.gz
volse-hubzilla-e931af830701fdacc64e2cc014aa0057dc91e093.tar.bz2
volse-hubzilla-e931af830701fdacc64e2cc014aa0057dc91e093.zip
first cut at choklet template
-rw-r--r--include/comanche.php47
-rw-r--r--view/css/choklet.css49
-rw-r--r--view/php/choklet.php23
3 files changed, 105 insertions, 14 deletions
diff --git a/include/comanche.php b/include/comanche.php
index 4af081740..83e9af438 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -97,9 +97,11 @@ function comanche_parser(&$a,$s) {
function comanche_menu($name,$class = '') {
- $a = get_app();
- $m = menu_fetch($name,$a->profile['profile_uid'],get_observer_hash());
- return menu_render($m,$class);
+ $channel_id = comanche_get_channel_id();
+ if($channel_id) {
+ $m = menu_fetch($name,$channel_id,get_observer_hash());
+ return menu_render($m,$class);
+ }
}
function comanche_replace_region($match) {
@@ -109,20 +111,37 @@ function comanche_replace_region($match) {
}
}
+/**
+ * @function comanche_get_channel_id()
+ * Returns the channel_id of the profile owner of the page, or the local_user if there is no profile owner.
+ * Otherwise returns 0
+ */
+
+function comanche_get_channel_id() {
+ $channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0);
+ if((! $channel_id) && (local_user()))
+ $channel_id = local_user();
+ return $channel_id;
+}
+
function comanche_block($name) {
+
+ $channel_id = comanche_get_channel_id();
- $o = '';
- $r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
- intval(get_app()->profile['profile_uid']),
- dbesc($name)
- );
- if($r) {
- $o = '<div class="widget bblock">';
- if($r[0]['title'])
- $o .= '<h3>' . $r[0]['title'] . '</h3>';
- $o .= prepare_text($r[0]['body'],$r[0]['mimetype']);
- $o .= '</div>';
+ if($channel_id) {
+ $o = '';
+ $r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
+ intval($channel_id),
+ dbesc($name)
+ );
+ if($r) {
+ $o = '<div class="widget bblock">';
+ if($r[0]['title'])
+ $o .= '<h3>' . $r[0]['title'] . '</h3>';
+ $o .= prepare_text($r[0]['body'],$r[0]['mimetype']);
+ $o .= '</div>';
+ }
}
return $o;
}
diff --git a/view/css/choklet.css b/view/css/choklet.css
new file mode 100644
index 000000000..883bb1ed3
--- /dev/null
+++ b/view/css/choklet.css
@@ -0,0 +1,49 @@
+#blog-banner {
+ position: relative;
+ margin-top: 45px;
+ width: 100%;
+ height: 100px;
+ margin-bottom: 20px;
+}
+
+nav.navbar {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+
+aside#region_1 {
+ display: block;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+ float: left;
+ margin-left: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+
+section {
+ margin-left: 15px;
+ margin-right: 15px;
+ float: left;
+ min-width: 650px;
+ width: 60%;
+ display: block;
+ padding-bottom: 350px;
+}
+
+#region_3 {
+ float: right;
+ min-width: 210px;
+ max-width: 220px;
+ width: 20%;
+}
+
+#blog-margin {
+ margin-right: 5%;
+ margin-left: 5%;
+} \ No newline at end of file
diff --git a/view/php/choklet.php b/view/php/choklet.php
new file mode 100644
index 000000000..31b0b124c
--- /dev/null
+++ b/view/php/choklet.php
@@ -0,0 +1,23 @@
+<!DOCTYPE html >
+<html>
+<head>
+ <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+ <div id="blog-margin">
+ <?php if(x($page,'nav')) echo $page['nav']; ?>
+ <div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></div>
+ <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ <div id="pause"></div>
+ </section>
+ <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+ <div class="clear"></div>
+ <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+ </div>
+</body>
+</html>
+