Changeset 1571

Timestamp:

03/20/08 13:42:05 (4 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Applied attachment:ticket:329:080312_default_template_changing.2.diff, closes #329

Files:

• devel/lib/setup.php (modified) (1 diff)
• devel/lib/templates.php (modified) (7 diffs)
• devel/mod/elggadmin/lib/configdef.php (modified) (1 diff)
• devel/mod/elggadmin/lib/elggadmin.inc.php (modified) (1 diff)
• devel/mod/template/lib.php (modified) (2 diffs)
• devel/mod/template/lib/default_template.php (modified) (2 diffs)

devel/lib/setup.php

@@ -427 +427 @@
-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

devel/lib/templates.php

@@ -314 +314 @@
-        if (!isset($template_name)) {
-            if (!isset($page_owner) || $page_owner == -1) {
-"Default_Template"
-
-
-"Default_Template"
+$CFG->default_template
+
+ // override Default_Template
+$CFG->default_template
-                }
-            }
@@ -332 +332 @@
-
-    // Grab the template content
-"Default_Template"
+$CFG->default_template
-            $template_element = $template[$parameter['context']];
-        } else {
@@ -453 +453 @@
-    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 {
@@ -463 +464 @@
-            $template_name = trim($parameter);
-        } else {
-"Default_Template"
+$CFG->default_template
-        }
-    }
@@ -469 +470 @@
-    // Grab title, see if we can edit the template
-        $editable = 0;
-"Default_Template"
+$CFG->default_template
-            $templatetitle = __gettext("Default Theme");
-        } else {
@@ -478 +479 @@
-                }
-                if (($templatestuff->owner != $USER->ident) && ($templatestuff->public != 'yes')) {
-'Default_Template'
+$CFG->default_template
-                }
-            }
@@ -484 +485 @@
-    
-    // Grab the template content
-"Default_Template"
+$CFG->default_template
-            $current_template = $template;
-        } else {

devel/mod/elggadmin/lib/configdef.php

@@ -51 +51 @@
-            $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");

devel/mod/elggadmin/lib/elggadmin.inc.php

@@ -423 +423 @@
-            $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';

devel/mod/template/lib.php

@@ -48 +48 @@
-    $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");
@@ -55 +57 @@
-    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;
-}
-

devel/mod/template/lib/default_template.php

@@ -13 +13 @@
-                                    );
-
-'Default_Template
+$CFG->default_template . '
-
-    $template_definition[] = array(
@@ -30 +30 @@
-                                    );
-    
-'Default_Template
-
-'Default_Template
-'Default_Template
+$CFG->default_template . '
+
+$CFG->default_template . '
+$CFG->default_template . '
-
-    $template_definition[] = array(