Ticket #329: 080312_default_template_changing.2.diff

a/lib/setup.php

@@ -426 +426 @@
-if (!isset($PAGE->menu_top   )) { $PAGE->menu_top    = array();}
-if (!isset($PAGE->menu_bottom)) { $PAGE->menu_bottom = array();}
-
+//
+// Set default template
+//
+if (!isset($CFG->default_template) ||
+    !is_readable($CFG->templatesroot . $CFG->default_template . '/pageshell')) {
+    $CFG->default_template = 'Default_Template';
+}
+
-//////
-////// Define what modules we have, and load their libraries
-//////

a/lib/templates.php

@@ -313 +313 @@
-    // Get template details
-        if (!isset($template_name)) {
-            if (!isset($page_owner) || $page_owner == -1) {
-"Default_Template"
-
-
-"Default_Template"
+$CFG->default_template
+
+ // override Default_Template
+$CFG->default_template
-                }
-            }
-        }
@@ -331 +331 @@
-        templates_load_context($parameter['context']);
-
-    // Grab the template content
-"Default_Template"
+$CFG->default_template
-            $template_element = $template[$parameter['context']];
-        } else {
-            if (!isset($page_template_cache[$parameter['context']])) {
@@ -452 +452 @@
-    global $template;
-    global $template_definition;
-    global $USER;
+    global $CFG;
-
-    if (!isset($parameter)) {
-    // Get template details
-        if (!$template_name = user_info('template_name',$USER->ident)) {
-"Default_Template"
+$CFG->default_template
-        }
-    } else {
-        if (!is_array($parameter)) {
-            $template_name = trim($parameter);
-        } else {
-"Default_Template"
+$CFG->default_template
-        }
-    }
-
-    // Grab title, see if we can edit the template
-        $editable = 0;
-"Default_Template"
+$CFG->default_template
-            $templatetitle = __gettext("Default Theme");
-        } else {
-            if ($templatestuff = get_record('templates','shortname',$template_name)) {
@@ -477 +478 @@
-                    $editable = 1;
-                }
-                if (($templatestuff->owner != $USER->ident) && ($templatestuff->public != 'yes')) {
-'Default_Template'
+$CFG->default_template
-                }
-            }
-        }
-    
-    // Grab the template content
-"Default_Template"
+$CFG->default_template
-            $current_template = $template;
-        } else {
-            

a/mod/elggadmin/lib/configdef.php

@@ -50 +50 @@
-            $DEFCFG->config['defaultlocale']->name = __gettext("Default locale");
-            $DEFCFG->config['defaultlocale']->description = __gettext("Country code to set language to if you have gettext installed");
-            $DEFCFG->config['defaultlocale']->type = 'language';
+
+            $DEFCFG->config['default_template']->name = __gettext('Default Template');
+            $DEFCFG->config['default_template']->description = __gettext('The default template of the site');
+            $DEFCFG->config['default_template']->type = 'template';
-
-            $DEFCFG->config['publicreg']->name = __gettext("Public registration");
-            $DEFCFG->config['publicreg']->description = __gettext("Can general members of the public register for this system?");

a/mod/elggadmin/lib/elggadmin.inc.php

@@ -422 +422 @@
-            }
-            $result = pages_html_select($input_name, $options, $attrs);
-            break;
+        case 'template':
+            global $CFG;
+            // get all list of templates/themes
+            $themes = get_list_of_plugins($CFG->templatesroot);
+            // at least should exists Default_Template
+            $options = array();
+            foreach ($themes as $theme) {
+                $obj = new StdClass;
+                $obj->label = templates_file_to_shortname($theme);
+                $obj->value = $theme;
+                if ($theme == $value) {
+                    $obj->selected = true;
+                }
+                $options[] = $obj;
+            }
+            $result = pages_html_select($input_name, $options, $attrs);
+            break;
-        default:
-            $attrs['class'] .= ' input-text';
-            $result = pages_html_input('text', $attrs);

a/mod/template/lib.php

@@ -47 +47 @@
-    // Function to allow the user to create a new template
-    $function['templates:add'][] = dirname(__FILE__) . "/lib/templates_add.php";
-        
+    // Adds default template
+    listen_for_event("user","create","template_user_create");
-    // Delete users
-    listen_for_event("user","delete","template_user_delete");
-}
@@ -54 +56 @@
-function templates_root($vars) {
-    global $CFG;
-    return $CFG->templatesroot;
+}
+
+function template_user_create($object_type, $event, $object) {
+    global $CFG;
+    // add current default template
+    $object->template_name = $CFG->default_template;
+    return $object;
-}
-
-function template_user_delete($object_type, $event, $object) {

a/mod/template/lib/default_template.php

@@ -12 +12 @@
-                                    'display'  => 1,
-                                    );
-
-'Default_Template
+$CFG->default_template . '
-
-    $template_definition[] = array(
-                                    'id' => 'pageshell',
@@ -29 +29 @@
-                                                        )
-                                    );
-    
-'Default_Template
-
-'Default_Template
-'Default_Template
+$CFG->default_template . '
+
+$CFG->default_template . '
+$CFG->default_template . '
-
-    $template_definition[] = array(
-                                    'id' => 'contentholder',