';
-}
-
-echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
-
-echo elgg_view_form('photos/admin/settings');
+$tab = get_input('tab', 'settings');
+
+echo elgg_view('navigation/tabs', array(
+ 'tabs' => array(
+ array(
+ 'text' => elgg_echo('settings'),
+ 'href' => '/admin/settings/tidypics',
+ 'selected' => ($tab == 'settings'),
+ ),
+ array(
+ 'text' => elgg_echo('tidypics:server_info'),
+ 'href' => '/admin/settings/tidypics?tab=server_info',
+ 'selected' => ($tab == 'server_info'),
+ ),
+ array(
+ 'text' => elgg_echo('tidypics:stats'),
+ 'href' => '/admin/settings/tidypics?tab=stats',
+ 'selected' => ($tab == 'stats'),
+ ),
+ array(
+ 'text' => elgg_echo('tidypics:settings:image_lib'),
+ 'href' => '/admin/settings/tidypics?tab=image_lib',
+ 'selected' => ($tab == 'image_lib'),
+ ),
+ array(
+ 'text' => elgg_echo('tidypics:settings:thumbnail'),
+ 'href' => '/admin/settings/tidypics?tab=thumbnail',
+ 'selected' => ($tab == 'thumbnail'),
+ ),
+ array(
+ 'text' => elgg_echo('tidypics:settings:help'),
+ 'href' => '/admin/settings/tidypics?tab=help',
+ 'selected' => ($tab == 'help'),
+ ),
+ )
+));
+
+switch ($tab) {
+ case 'server_info':
+ echo elgg_view('admin/settings/tidypics/server_info');
+ break;
+
+ case 'stats':
+ echo elgg_view('admin/settings/tidypics/stats');
+ break;
+
+ case 'image_lib':
+ echo elgg_view('admin/settings/tidypics/image_lib');
+ break;
+
+ case 'thumbnail':
+ echo elgg_view('admin/settings/tidypics/thumbnail');
+ break;
+
+ case 'help':
+ echo elgg_view('admin/settings/tidypics/help');
+ break;
+
+ default:
+ case 'settings':
+ echo elgg_view('admin/settings/tidypics/settings');
+ break;
+}
\ No newline at end of file
diff --git a/views/default/admin/settings/tidypics/help.php b/views/default/admin/settings/tidypics/help.php
new file mode 100644
index 000000000..bf08de284
--- /dev/null
+++ b/views/default/admin/settings/tidypics/help.php
@@ -0,0 +1,57 @@
+
+Tidypics tries to calculate the maximum size of an image that your server will support. If it
+guesses incorrectly and someone uploads a photo that is too large, the script may crash when
+resizing the image if you are using GD. The easiest way to test this is to set display_errors
+to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
+should display on the screen. You can increased your php memory limit (see the docs directory).
+A better option is to use ImageMagick if your server supports it (again see the docs directory).
+
+
+If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
+change display_error back to 0.
+
+HTML;
+
+echo elgg_view_module('inline', $title, $body);
+
+$title = 'Question mark images appear';
+$body =<<
+If you see question mark images when you look at your albums, this means the resizing of the images
+failed. This could be due to the memory limits as described above. There are other causes. Tidypics
+tries to detect these problems and write the cause to the error log. You should check your server
+error log right after an upload that results in a question mark for these error messages. The messages
+will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will
+not see these warnings.
+
+
+Another possible cause is using ImageMagick when your server does not support it or specifying
+the wrong path to the ImageMagick executables.
+
+HTML;
+
+echo elgg_view_module('inline', $title, $body);
+
+
+$title = 'Unable to save settings';
+$body =<<If you are unable to settings, there are two possible causes. First,
+Apache can be configured to block pages that use file paths as Tidypics
+does when setting the location of the ImageMagick executable. In this case,
+leave that field blank. Second, there is some bad code in the Izaps video
+plugin that can prevent the settings from being saved. Try disabling that plugin.
+
+HTML;
+
+echo elgg_view_module('inline', $title, $body);
+
diff --git a/views/default/admin/settings/tidypics/image_lib.php b/views/default/admin/settings/tidypics/image_lib.php
new file mode 100644
index 000000000..44a7eb847
--- /dev/null
+++ b/views/default/admin/settings/tidypics/image_lib.php
@@ -0,0 +1,38 @@
+' . elgg_echo('tidypics:lib_tools:overview') . '';
+$content .= '
';
-
-echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content);
\ No newline at end of file
diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php
deleted file mode 100644
index b939a74a8..000000000
--- a/views/default/tidypics/admin/help.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
White screen when uploading images
-
-Tidypics tries to calculate the maximum size of an image that your server will support. If it
-guesses incorrectly and someone uploads a photo that is too large, the script may crash when
-resizing the image if you are using GD. The easiest way to test this is to set display_errors
-to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
-should display on the screen. You can increased your php memory limit (see the docs directory).
-A better option is to use ImageMagick if your server supports it (again see the docs directory).
-
-If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
-change display_error back to 0.
-
-
Question mark images appear
-
-If you see question mark images when you look at your albums, this means the resizing of the images
-failed. This could be due to the memory limits as described above. There are other causes. Tidypics
-tries to detect these problems and write the cause to the error log. You should check your server
-error log right after an upload that results in a question mark for these error messages. The messages
-will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will
-not see these warnings.
-
-Another possible cause is using ImageMagick when your server does not support it or specifying
-the wrong path to the ImageMagick executables.
-
-
Unable to save settings
-
If you are unable to settings, there are two possible causes. First,
-Apache can be configured to block pages that use file paths as Tidypics
-does when setting the location of the ImageMagick executable. In this case,
-leave that field blank. Second, there is some bad code in the Izaps video
-plugin that can prevent the settings from being saved. Try disabling that plugin.
-
\ No newline at end of file
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
deleted file mode 100644
index aff6acc8d..000000000
--- a/views/default/tidypics/admin/settings.php
+++ /dev/null
@@ -1,25 +0,0 @@
- "{$vars['url']}mod/tidypics/pages/server_analysis.php",
- 'text' => elgg_echo('tidypics:settings:server:analysis'),
-));
-
-echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
-
-echo '
-This page allows you to create thumbnails for images when the thumbnail creation failed during upload.
-You may experience problems with thumbnail creation if your image library is not configured properly or
-if there is not enough memory for the GD library to load and resize an image. If your users have
-experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the
-thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
-a photo) and enter it below.
-
-
Thumbnail Creation
-
-:
-
-
-
-
-
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
deleted file mode 100644
index 479eb86e2..000000000
--- a/views/default/tidypics/admin/tidypics.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
>
-
>
-
>
-
>
-
>
-
-
-
-
diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
deleted file mode 100644
index bb0a12467..000000000
--- a/views/default/tidypics/admin/upgrade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-pluginspath}tidypics/version.php";
-
-$upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade";
-
-// determine whether an upgrade is required
-$local_version = get_plugin_setting('version', 'tidypics');
-if ($local_version === FALSE) {
- // no version set so either new install or really old one
- if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
- $local_version = 0;
- } else {
- // set initial version for new install
- set_plugin_setting('version', $version, 'tidypics');
- $local_version = $version;
- }
-} elseif ($local_version == '1.62') {
- // special work around to handle old upgrade system
- $local_version = 2010010101;
- set_plugin_setting('version', $local_version, 'tidypics');
-}
-if ($local_version == $version) {
- // no upgrade required
- return TRUE;
-}
-
-echo elgg_view('output/url', array(
- 'text' => elgg_echo('tidypics:upgrade'),
- 'href' => $upgrade_url,
- 'is_action' => TRUE)
-);
-
-echo ' ';
--
cgit v1.2.3