aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-07 17:11:35 -0700
committerzotlabs <mike@macgirvin.com>2017-06-07 17:11:35 -0700
commit9dbd99714186ac5ea008e8e17e12be5076e8553f (patch)
tree3898c5422c9fb854d7ebe21084ec409ed45f2140 /view/theme/redbasic/php
parent2e35dc648fd61ae2d39e8c46c14dbf19d31942fb (diff)
parent55836e8ca65ca9a2ae25591de3232470d7a50049 (diff)
downloadvolse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.gz
volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.bz2
volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme/redbasic/php')
-rw-r--r--view/theme/redbasic/php/config.php15
-rw-r--r--view/theme/redbasic/php/style.php7
-rw-r--r--view/theme/redbasic/php/theme_init.php1
3 files changed, 17 insertions, 6 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 752a02a6a..8dbe1be9c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,10 +5,20 @@ namespace Zotlabs\Theme;
class RedbasicConfig {
function get_schemas() {
- $scheme_choices = array();
- $scheme_choices["---"] = t("Focus (Hubzilla default)");
$files = glob('view/theme/redbasic/schema/*.php');
+
+ $scheme_choices = [];
+
if($files) {
+
+ if(in_array('view/theme/redbasic/schema/default.php', $files)) {
+ $scheme_choices['---'] = t('Default');
+ $scheme_choices['focus'] = t('Focus (Hubzilla default)');
+ }
+ else {
+ $scheme_choices['---'] = t('Focus (Hubzilla default)');
+ }
+
foreach($files as $file) {
$f = basename($file, ".php");
if($f != 'default') {
@@ -17,6 +27,7 @@ class RedbasicConfig {
}
}
}
+
return $scheme_choices;
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index a666f96f2..06cf23ba2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -56,10 +56,9 @@ if (($schema) && ($schema != '---')) {
}
-// If we haven't got a schema, load the default. We shouldn't touch this - we
-// should leave it for admins to define for themselves.
-// default.php and default.css MUST be symlinks to existing schema files.
-if (! $schema) {
+// Allow admins to set a default schema for the hub.
+// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema
+if ((!$schema) || ($schema == '---')) {
if(file_exists('view/theme/redbasic/schema/default.php')) {
$schemefile = 'view/theme/redbasic/schema/default.php';
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 020bda363..bfeabcb46 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,6 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
+head_add_js('/library/popper/popper.js');
head_add_js('/library/bootstrap/js/bootstrap.min.js');
head_add_js('/library/bootbox/bootbox.min.js');
head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');