diff options
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | upload.php | 4 | ||||
| -rw-r--r-- | views/default/tidypics/forms/upload.php | 30 |
3 files changed, 14 insertions, 22 deletions
diff --git a/languages/en.php b/languages/en.php index 7e7185c5d..bc64fd550 100644 --- a/languages/en.php +++ b/languages/en.php @@ -25,7 +25,7 @@ 'album:create' => "Create new album",
'album:add' => "Add Photo Album",
- 'album:addpix' => "Add photos",
+ 'album:addpix' => "Add photos to",
'album:edit' => "Edit album",
'album:delete' => "Delete album",
diff --git a/upload.php b/upload.php index 320c5ce6d..4fcf27695 100644 --- a/upload.php +++ b/upload.php @@ -37,10 +37,8 @@ }
set_context('photos');
- $title = elgg_echo('album:addpix');
+ $title = elgg_echo('album:addpix') . ' ' . $album_entity->title;
$area2 .= elgg_view_title($title);
-
- $area2 .= '<h2><a href="' . $album_entity->getURL() . '">'. $album_entity->title. '</a></h2>';
$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album ) );
$body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3);
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index 35768f64c..be87c8697 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -1,27 +1,19 @@ <?php - /** - * Elgg file browser uploader - * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ - */ global $CONFIG; //this is for image uploads only. Image edits are handled by edit.php form - $container_guid = get_input('container_guid'); - $access_id = get_entity($vars['album'])->access_id; - if (get_plugin_setting('maxfilesize','tidypics')) { - if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { - $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB - } else { - $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); - } + $container_guid = get_input('container_guid'); + $access_id = get_entity($vars['album'])->access_id; + if (get_plugin_setting('maxfilesize','tidypics')) { + if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { + $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB } else { - $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); } + } else { + $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + } ?> <script language="javascript"> @@ -50,6 +42,7 @@ function showhide(layer_ref) { } //--> </script> +<div class="contentWrapper"> <form action="<?php echo $vars['url']; ?>action/tidypics/upload" enctype="multipart/form-data" method="post"> <p style="line-height:1.6em;"> <label><?php echo elgg_echo("images:upload"); ?></label><br /> @@ -76,4 +69,5 @@ function showhide(layer_ref) { <input type="submit" value="<?php echo elgg_echo("save"); ?>" onclick="showhide('tidypics_loader');" /> </p> -</form>
\ No newline at end of file +</form> +</div>
\ No newline at end of file |