diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-02 12:40:38 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-02 12:40:38 +0000 |
| commit | 4cf87cd1f558593fe7047440806bc6b7d32e83ee (patch) | |
| tree | eff1ceef115a0977cfc8988f6ca88ae3afd455e7 /views | |
| parent | db727a00f06d95da0b6d3a3356b1d60c01feabe3 (diff) | |
| download | elgg-4cf87cd1f558593fe7047440806bc6b7d32e83ee.tar.gz elgg-4cf87cd1f558593fe7047440806bc6b7d32e83ee.tar.bz2 | |
The system now uses the site GUID to get and set entity data. Also, installation is a great deal more visual.
git-svn-id: https://code.elgg.org/elgg/trunk@621 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/navigation/toolbox.php | 3 | ||||
| -rw-r--r-- | views/default/pageshells/pageshell_sidebar.php | 2 | ||||
| -rw-r--r-- | views/default/settings/install.php | 19 | ||||
| -rw-r--r-- | views/default/settings/system.php | 50 |
4 files changed, 71 insertions, 3 deletions
diff --git a/views/default/navigation/toolbox.php b/views/default/navigation/toolbox.php index 94fe89662..f8fb2ae9d 100644 --- a/views/default/navigation/toolbox.php +++ b/views/default/navigation/toolbox.php @@ -19,7 +19,7 @@ if (is_array($menu) && sizeof($menu) > 0) {
?>
-
+ <div id="sidebar_toolbox">
<ul>
<?php
@@ -55,6 +55,7 @@ ?>
</ul>
+</div>
<?php
diff --git a/views/default/pageshells/pageshell_sidebar.php b/views/default/pageshells/pageshell_sidebar.php index fba0d627b..d55bf2842 100644 --- a/views/default/pageshells/pageshell_sidebar.php +++ b/views/default/pageshells/pageshell_sidebar.php @@ -27,9 +27,7 @@ <?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
<!-- toolbox -->
- <div id="sidebar_toolbox">
<?php echo elgg_view("navigation/toolbox"); ?><!-- include the my world toolbox -->
- </div>
<!-- get the sidebar and contents -->
<div id="sidebar_left">
diff --git a/views/default/settings/install.php b/views/default/settings/install.php new file mode 100644 index 000000000..8de795da4 --- /dev/null +++ b/views/default/settings/install.php @@ -0,0 +1,19 @@ +<?php
+
+ /**
+ * Elgg system settings on initial installation
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.org/
+ *
+ */
+
+ echo "<p>" . nl2br(elgg_echo("installation:settings:description")) . "</p>";
+
+ echo elgg_view("settings/system",array("action" => "action/systemsettings/install"));
+
+?>
\ No newline at end of file diff --git a/views/default/settings/system.php b/views/default/settings/system.php new file mode 100644 index 000000000..1d2d19c67 --- /dev/null +++ b/views/default/settings/system.php @@ -0,0 +1,50 @@ +<?php
+
+ /**
+ * Elgg system settings form
+ * The form to change system settings
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.org/
+ *
+ * @uses $vars['action'] If set, the place to forward the form to (usually action/systemsettings/save)
+ */
+
+ // Set action appropriately
+ if (!isset($vars['action'])) {
+ $action = $vars['url'] . "action/systemsettings/save";
+ } else {
+ $action = $vars['action'];
+ }
+
+?>
+
+ <form action="<?php echo $action; ?>" method="post">
+
+<?php
+
+ foreach(array('sitename','wwwroot','path','dataroot') as $field) {
+
+?>
+ <p>
+ <?php echo elgg_echo($field); ?><br />
+ <?php
+ echo elgg_view("input/text",array('internalname' => $field, 'value' => $vars[$field]));
+ ?>
+ </p>
+
+<?php
+
+ }
+
+?>
+ <p>
+ <input type="hidden" name="settings" value="go" />
+ <input type="submit" value="<?php echo elgg_echo("save"); ?>" />
+ </p>
+
+ </form>
\ No newline at end of file |