From 0fe5af64cf1f5d69e0253e27dec70e346814fcdf Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 10 Nov 2011 06:45:50 -0500 Subject: moved admin settings form to a location that is better for Elgg 1.8 --- views/default/tidypics/admin/settings.php | 29 +++-- views/default/tidypics/forms/settings.php | 183 ------------------------------ 2 files changed, 17 insertions(+), 195 deletions(-) delete mode 100644 views/default/tidypics/forms/settings.php (limited to 'views/default/tidypics') diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php index 6dace1830..e1d20f953 100644 --- a/views/default/tidypics/admin/settings.php +++ b/views/default/tidypics/admin/settings.php @@ -1,18 +1,23 @@ elgg_echo("tidypics:admin:instructions"))); +$form_body = elgg_view('forms/tidypics/admin/settings', $vars); -?> -

- "{$vars['url']}mod/tidypics/pages/server_analysis.php", + 'text' => elgg_echo('tidypics:settings:server:analysis'), +)); -$url = "{$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 "$text"; -?> -

-'; +echo elgg_view('tidypics/admin/upgrade'); +echo $server_analysis_link; +echo '

'; -echo elgg_view("tidypics/forms/settings"); +echo elgg_view('input/form', array( + 'body' => $form_body, + 'action' => $vars['url'] . 'action/tidypics/admin/settings', +)); diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php deleted file mode 100644 index 7e2aabb14..000000000 --- a/views/default/tidypics/forms/settings.php +++ /dev/null @@ -1,183 +0,0 @@ -' . elgg_echo('tidypics:settings:heading:main') . ''; - -// Tagging -$tagging = $plugin->tagging; -if (!$tagging) { - $tagging = "enabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "

"; - -// Download Link -$download_link = $plugin->download_link; -if (!$download_link) { - $download_link = "enabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "

"; - -// Ratings -$photo_ratings = $plugin->photo_ratings; -if (!$photo_ratings) { - $photo_ratings = "disabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "

"; - -// Show EXIF -$exif = $plugin->exif; -if (!$exif) { - $exif = "disabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "

"; - -// Show View count -$view_count = $plugin->view_count; -if (!$view_count) { - $view_count = "enabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "

"; - -// Use flash uploader -$uploader = $plugin->uploader; -if (!$uploader) { - $uploader = "enabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "

"; - -// Watermark Text -$form_body .= "

" . elgg_echo('tidypics:settings:watermark') . "
"; -$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "

"; - -// Max Image Size -$maxfilesize = $plugin->maxfilesize; -if (!$maxfilesize) { - $maxfilesize = (int)5; // 5 MB -} -$form_body .= "

" . elgg_echo('tidypics:settings:maxfilesize') . "
"; -$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "

"; - -// Quota Size -$quota = $plugin->quota; -if (!$quota) { - $quota = 0; -} -$form_body .= "

" . elgg_echo('tidypics:settings:quota') . "
"; -$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "

"; - -// Image Library -if (extension_loaded('imagick')) { - $img_lib_options['ImageMagickPHP'] = 'imagick PHP extension'; -} - -$disablefunc = explode(',', ini_get('disable_functions')); -if (is_callable('exec') && !in_array('exec',$disablefunc)) { - $img_lib_options['ImageMagick'] = 'ImageMagick Cmdline'; -} - -$img_lib_options['GD'] = 'GD'; - -$form_body .= '

' . elgg_echo('tidypics:settings:heading:img_lib') . '

'; -$image_lib = $plugin->image_lib; -if (!$image_lib) { - $image_lib = 'GD'; -} -$form_body .= '

' . elgg_echo('tidypics:settings:image_lib') . ': '; -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[image_lib]', - 'options_values' => $img_lib_options, - 'value' => $image_lib -)); -$form_body .= '
Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.

'; - -if (is_callable('exec') && !in_array('exec', $disablefunc)) { - // Image Magick Path - $im_path = $plugin->im_path; - if(!$im_path) { - $im_path = ""; - } - $form_body .= "

" . elgg_echo('tidypics:settings:im_path') . "
"; - $form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "

"; -} - - -// River Image options -$form_body .= '

' . elgg_echo('tidypics:settings:heading:river') . '

'; -$img_river_view = $plugin->img_river_view; -if (!$img_river_view) { - $img_river_view = 'batch'; -} -$form_body .= '

' . elgg_echo('tidypics:settings:img_river_view'); -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[img_river_view]', - 'options_values' => array( - 'all' => 'all', - 'batch' => '1', - 'none' => 'none', - ), - 'value' => $img_river_view -)); -$form_body .= '

'; - -// River Album options -$album_river_view = $plugin->album_river_view; -if (!$album_river_view) { - $album_river_view = 'set'; -} -$form_body .= '

' . elgg_echo('tidypics:settings:album_river_view'); -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[album_river_view]', - 'options_values' => array( - 'cover' => 'cover', - 'set' => 'set', - ), - 'value' => $album_river_view -)); -$form_body .= '

'; - -// Thumbnail sizes -$form_body .= '

' . elgg_echo('tidypics:settings:heading:sizes') . '

'; -$form_body .= "
You must edit the css if you change the default sizes
"; -$image_sizes = $plugin->image_sizes; -if(!$image_sizes) { - $image_sizes = array(); // set default values - $image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600; - $image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153; - $image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60; -} else { - $image_sizes = unserialize($image_sizes); -} -$form_body .= "

" . elgg_echo('tidypics:settings:largesize') . "
"; -$form_body .= 'width:    '; -$form_body .= 'height:

'; - -$form_body .= "

" . elgg_echo('tidypics:settings:smallsize') . "
"; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

'; - -$form_body .= "

" . elgg_echo('tidypics:settings:thumbsize') . "
"; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

'; - - -// Group permission override -$form_body .= '

' . elgg_echo('tidypics:settings:heading:groups') . '

'; -$grp_perm_override = $plugin->grp_perm_override; -if (!$grp_perm_override) { - $grp_perm_override = "enabled"; -} -$form_body .= '

' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "

"; - -$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); - -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); -- cgit v1.2.3