diff options
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/choklet.php | 27 | ||||
| -rw-r--r-- | view/php/default.php | 40 | ||||
| -rw-r--r-- | view/php/full.php | 3 | ||||
| -rw-r--r-- | view/php/mod_new_channel.php | 3 | ||||
| -rw-r--r-- | view/php/mod_register.php | 3 | ||||
| -rw-r--r-- | view/php/none.php | 1 | ||||
| -rw-r--r-- | view/php/theme_init.php | 48 |
7 files changed, 88 insertions, 37 deletions
diff --git a/view/php/choklet.php b/view/php/choklet.php new file mode 100644 index 000000000..0d8b66c29 --- /dev/null +++ b/view/php/choklet.php @@ -0,0 +1,27 @@ +<!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">
+ <header><?php if(x($page,'header')) echo $page['header']; ?></header>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+ <div id="nav-backer" class="navbar"> </div>
+ <div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></div>
+ <main>
+ <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>
+ </main>
+ <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>
+
diff --git a/view/php/default.php b/view/php/default.php index 80c8070b2..01cd8a0d4 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -1,19 +1,21 @@ -<!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>
- <?php if(x($page,'nav')) echo $page['nav']; ?>
- <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
- <div id="page-footer"></div>
- <div id="pause"></div> - </section> - <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
- <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
-</body>
-</html>
-
+<!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> + <header><?php if(x($page,'header')) echo $page['header']; ?></header> + <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <main> + <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> + </main> + <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> +</body> +</html> diff --git a/view/php/full.php b/view/php/full.php index d8643d5a1..99653c06d 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -6,7 +6,8 @@ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> </head> <body> - <nav><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <header><?php if(x($page,'header')) echo $page['header']; ?></header> + <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> diff --git a/view/php/mod_new_channel.php b/view/php/mod_new_channel.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_new_channel.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - -$a->page['template'] = 'full'; diff --git a/view/php/mod_register.php b/view/php/mod_register.php deleted file mode 100644 index e7709cbd8..000000000 --- a/view/php/mod_register.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - -$a->page['template'] = 'full'; diff --git a/view/php/none.php b/view/php/none.php new file mode 100644 index 000000000..51d0e83dc --- /dev/null +++ b/view/php/none.php @@ -0,0 +1 @@ +<?php if(x($page,'content')) echo $page['content']; ?> diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 68d6e4cd1..45eb2fc1d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,26 +1,52 @@ <?php - require_once('include/plugin.php'); - head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); -head_add_css('library/jslider/bin/jquery.slider.min.css'); +head_add_css('library/jslider/css/jslider.css'); +head_add_css('library/colorbox/colorbox.css'); + +head_add_css('view/css/conversation.css'); +head_add_css('view/css/widgets.css'); + -head_add_js('js/jquery.js'); -head_add_js('js/jquery.textinputs.js'); -head_add_js('js/fk.autocomplete.js'); -head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js'); +head_add_js('jquery.js'); +head_add_js('jquery-migrate-1.1.1.js'); +//head_add_js('jquery-compat.js'); +head_add_js('spin.js'); +head_add_js('jquery.spin.js'); +head_add_js('jquery.textinputs.js'); +head_add_js('autocomplete.js'); +head_add_js('library/fancybox/jquery.fancybox-1.3.4.js'); head_add_js('library/jquery.timeago.js'); head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); -head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); -head_add_js('js/acl.js'); -head_add_js('js/webtoolkit.base64.js'); -head_add_js('js/main.js'); +head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); +head_add_js('library/cryptojs/components/core-min.js'); +head_add_js('library/cryptojs/rollups/aes.js'); +head_add_js('library/cryptojs/rollups/rabbit.js'); +head_add_js('library/cryptojs/rollups/tripledes.js'); +head_add_js('acl.js'); +head_add_js('webtoolkit.base64.js'); +head_add_js('main.js'); +head_add_js('crypto.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); +head_add_js('library/colorbox/jquery.colorbox-min.js'); + +/** + * Those who require this feature will know what to do with it. + * Those who don't, won't. + * Eventually this functionality needs to be provided by a module + * such that permissions can be enforced. At the moment it's + * more of a proof of concept; but sufficient for our immediate needs. + */ + +$channel = get_app()->get_channel(); +if($channel && file_exists($channel['channel_address'] . '.js')) + head_add_js('/' . $channel['channel_address'] . '.js'); + |