aboutsummaryrefslogtreecommitdiffstats
path: root/view/php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
commit870df76463a1cc9823b364db0bfb387f3f46664f (patch)
treea8c7391bfe799703aa0a8f26b9ee788f1204e8be /view/php
parent25a533bd72c34e9775af71c010a39db6caf7b633 (diff)
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
downloadvolse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz
volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2
volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts: view/php/theme_init.php
Diffstat (limited to 'view/php')
-rw-r--r--view/php/mod_new_channel.php3
-rw-r--r--view/php/mod_register.php3
-rw-r--r--view/php/none.php1
-rw-r--r--view/php/theme_init.php10
4 files changed, 8 insertions, 9 deletions
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 da64ce08e..509df8fef 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -3,7 +3,7 @@
require_once('include/plugin.php');
head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
-head_add_css('library/bootstrap/css/bootstrap.css');
+head_add_css('library/bootstrap/css/bootstrap.min.css');
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');
@@ -15,7 +15,10 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
+<<<<<<< HEAD
head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+=======
+>>>>>>> upstream/master
head_add_js('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js');
@@ -32,7 +35,7 @@ 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('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');
@@ -57,4 +60,5 @@ head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js
$channel = get_app()->get_channel();
if($channel && file_exists($channel['channel_address'] . '.js'))
- head_add_js('/' . $channel['channel_address'] . '.js');
+ head_add_js('/' . $channel['channel_address'] . '.js');
+