aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/include/functions_install.inc.php18
-rw-r--r--admin/themes/default/template/upgrade.tpl4
2 files changed, 21 insertions, 1 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
index 43043a0b0..a97835583 100644
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -88,6 +88,24 @@ function activate_core_themes()
}
/**
+ * Automatically activate some core plugins
+ */
+function activate_core_plugins()
+{
+ include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
+
+ $plugins = new plugins();
+
+ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
+ {
+ if (in_array($plugin_id, array('TakeATour')))
+ {
+ $plugins->perform_action('activate', $plugin_id);
+ }
+ }
+}
+
+/**
* Connect to database during installation. Uses $_POST.
*
* @param array &$infos - populated with infos
diff --git a/admin/themes/default/template/upgrade.tpl b/admin/themes/default/template/upgrade.tpl
index a29078716..abf11291f 100644
--- a/admin/themes/default/template/upgrade.tpl
+++ b/admin/themes/default/template/upgrade.tpl
@@ -40,6 +40,7 @@ body {
#content {
min-height:0;
border:none;
+ margin:1em auto;
}
#theHeader {
@@ -103,6 +104,7 @@ input[type="submit"], input[type="button"], a.bigButton {
input[type="submit"]:hover, input[type="button"]:hover, a.bigButton:hover {
background-color:#ff7700;
color:white;
+ text-decoration:none;
}
input[type="text"], input[type="password"], select {
@@ -214,7 +216,7 @@ input[type="text"]:focus, input[type="password"]:focus, select:focus {
</fieldset>
<p>
- <a class="bigButton" href="index.php">{'Home'|@translate}</a>
+ <a class="bigButton" href="{$button_link}">{$button_label}</a>
</p>
{/if}