diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
| commit | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (patch) | |
| tree | 518ecb9df491374faa1062fee2d32dca61ba74a3 /views/default/forms | |
| parent | f9e9c6cb5950ccf1d1d5396caa9dbb2803aacdad (diff) | |
| parent | 24ff6662195222479b4d83d41fa89edc8a3c05d1 (diff) | |
| download | elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.gz elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.bz2 | |
Merge branch 'no-flash-uploader' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'views/default/forms')
| -rw-r--r-- | views/default/forms/photos/admin/settings/main.php | 2 | ||||
| -rw-r--r-- | views/default/forms/photos/ajax_upload.php | 54 |
2 files changed, 1 insertions, 55 deletions
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index e893efc81..8791742f1 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -5,7 +5,7 @@ $plugin = $vars['plugin']; -$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link'); +$checkboxes = array('tagging', 'view_count', 'exif', 'download_link'); foreach ($checkboxes as $checkbox) { echo '<div>'; echo elgg_view('input/checkbox', array( diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php deleted file mode 100644 index 3ab578a38..000000000 --- a/views/default/forms/photos/ajax_upload.php +++ /dev/null @@ -1,54 +0,0 @@ -<?php -/** - * Tidypics ajax upload form body - * - * @uses $vars['entity'] - */ - -$album = $vars['entity']; - -$ts = time(); -$batch = time(); -$tidypics_token = md5(session_id() . get_site_secret() . $ts . elgg_get_logged_in_user_entity()->salt); -$basic_uploader_url = current_page_url() . '/basic'; - -$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -?> - -<p> -<?php - echo elgg_echo('tidypics:uploader:instructs', array($maxfilesize, $basic_uploader_url)); -?> -</p> - -<ul id="tidypics-uploader-steps"> - <li class="mbm"> - <div id="tidypics-uploader"> - <a id="tidypics-choose-button" href="<?php echo $basic_uploader_url; ?>"> - 1. <?php echo elgg_echo('tidypics:uploader:choose'); ?> - </a> - <div id="tidypics-flash-uploader"> - <input type="file" id="uploadify" name="uploadify" class="hidden" /> - <input type="hidden" name="album_guid" value="<?php echo $album->getGUID(); ?>" /> - <input type="hidden" name="batch" value="<?php echo $batch; ?>" /> - <input type="hidden" name="tidypics_token" value="<?php echo $tidypics_token; ?>" /> - <input type="hidden" name="user_guid" value="<?php echo elgg_get_logged_in_user_guid(); ?>" /> - <input type="hidden" name="Elgg" value="<?php echo session_id(); ?>" /> - </div> - </div> - </li> - <li class="mbm"> - <a id="tidypics-upload-button" class="tidypics-disable" href="#"> - 2. <?php echo elgg_echo('tidypics:uploader:upload'); ?> - </a> - </li> - <li class="mbm"> - <a id="tidypics-describe-button" class="tidypics-disable" href="#"> - 3. <?php echo elgg_echo('tidypics:uploader:describe'); ?> - </a> - </li> -</ul> |