aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/forms/photos/admin/settings/main.php3
-rw-r--r--views/default/forms/photos/ajax_upload.php54
-rw-r--r--views/default/icon/object/album.php1
-rw-r--r--views/default/icon/object/image.php2
-rw-r--r--views/default/js/photos/uploading.php94
-rw-r--r--views/default/photos/css.php79
6 files changed, 3 insertions, 230 deletions
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index ab5e7e24a..5bdd8f586 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -5,10 +5,9 @@
$plugin = $vars['plugin'];
-$checkboxes = array('view_count', 'uploader', 'exif', 'download_link');
+$checkboxes = array('view_count', 'exif', 'download_link');
foreach ($checkboxes as $checkbox) {
echo '<div>';
- $checked = $plugin->$checkbox ? 'checked' : false;
echo elgg_view('input/checkbox', array(
'name' => "params[$checkbox]",
'value' => true,
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>
diff --git a/views/default/icon/object/album.php b/views/default/icon/object/album.php
index 656b2e0df..55bb7451b 100644
--- a/views/default/icon/object/album.php
+++ b/views/default/icon/object/album.php
@@ -17,6 +17,7 @@ $album = $vars['entity'];
$cover_guid = $album->getCoverImageGuid();
if ($cover_guid) {
$vars['title'] = $album->getTitle();
+ $vars['href'] = $album->getURL();
echo elgg_view_entity_icon(get_entity($cover_guid), $vars['size'], $vars);
} else {
$url = "mod/tidypics/graphics/empty_album.png";
diff --git a/views/default/icon/object/image.php b/views/default/icon/object/image.php
index 3dbced8ab..9087fc3d8 100644
--- a/views/default/icon/object/image.php
+++ b/views/default/icon/object/image.php
@@ -27,7 +27,7 @@ if (!isset($vars['title'])) {
$title = $vars['title'];
}
-$url = $entity->getURL();
+$url = isset($vars['href']) ? $vars['href'] : $entity->getURL();
if (isset($vars['href'])) {
$url = $vars['href'];
}
diff --git a/views/default/js/photos/uploading.php b/views/default/js/photos/uploading.php
deleted file mode 100644
index 465f937ab..000000000
--- a/views/default/js/photos/uploading.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * AJAX uploading
- */
-?>
-
-//<script>
-elgg.provide('elgg.tidypics.uploading');
-
-elgg.tidypics.uploading.init = function() {
-
- var fields = ['Elgg', 'user_guid', 'album_guid', 'batch', 'tidypics_token'];
- var data = elgg.security.token;
-
- $(fields).each(function(i, name) {
- var value = $('input[name=' + name + ']').val();
- if (value) {
- data[name] = value;
- }
- });
-
- $("#uploadify").uploadify({
- 'uploader' : elgg.config.wwwroot + 'mod/tidypics/vendors/uploadify/uploadify.swf',
- 'script' : elgg.config.wwwroot + 'action/photos/image/ajax_upload',
- 'cancelImg' : elgg.config.wwwroot + 'mod/tidypics/vendors/uploadify/cancel.png',
- 'fileDataName' : 'Image',
- 'multi' : true,
- 'auto' : false,
- 'wmode' : 'transparent',
- 'buttonImg' : " ",
- 'height' : $('#tidypics-choose-button').height(),
- 'width' : $('#tidypics-choose-button').width(),
- 'scriptData' : data,
- 'onEmbedFlash' : function(event) {
- // @todo This is supposed to mimick hovering over the link.
- // hover events aren't firing for the object.
- $("#" + event.id).hover(
- function(){
- $("#tidypics-choose-button").addClass('tidypics-choose-button-hover');
- },
- function(){
- $("#tidypics-choose-button").removeClass('tidypics-choose-button-hover');
- }
- );
- },
- 'onSelectOnce' : function() {
- $("#tidypics-upload-button").removeClass('tidypics-disable');
- },
- 'onAllComplete' : function() {
- // @todo they can keep adding pics if they want. no need to disable this.
- $("#tidypics-choose-button").addClass('tidypics-disable');
- $("#tidypics-upload-button").addClass('tidypics-disable').die();
- $("#tidypics-describe-button").removeClass('tidypics-disable');
-
- elgg.action('photos/image/ajax_upload_complete', {
- data: {
- album_guid: data.album_guid,
- batch: data.batch
- },
- success: function(json) {
- var url = elgg.normalize_url('photos/edit/' + json.batch_guid)
- $('#tidypics-describe-button').attr('href', url);
- }
- });
- },
- 'onComplete' : function(event, queueID, fileObj, response) {
- // check for errors here
- if (response != 'success') {
- $("#uploadify" + queueID + " .percentage").text(" - " + response);
- $("#uploadify" + queueID).addClass('uploadifyError');
- }
- $("#uploadify" + queueID + " > .cancel").remove();
- return false;
- },
- 'onCancel' : function(event, queueID, fileObj, data) {
- if (data.fileCount == 0) {
- $("#tidypics-upload-button").addClass('tidypics-disable');
- }
- },
- 'onError' : function (event, ID, fileObj, errorObj) {
- // @todo do something useful with the limited information in the errorObj.
- }
-
- });
-
- // bind to upload button
- $('#tidypics-upload-button').live('click', function(e) {
- var $uploadify = $('#uploadify');
- $uploadify.uploadifyUpload();
- e.preventDefault();
- });
-}
-
-elgg.register_hook_handler('init', 'system', elgg.tidypics.uploading.init); \ No newline at end of file
diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index ee411dcf3..a92c35b3e 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -70,85 +70,6 @@
vertical-align: top;
}
-/* ***************************************
- AJAX UPLOADER
-*************************************** */
-#tidypics-uploader-steps {
- list-style: none;
-}
-
-#tidypics-uploader-steps li a {
- font-weight:bold;
-}
-
-.tidypics-choose-button-hover {
- color:#0054a7;
- text-decoration:underline;
-}
-
-.tidypics-disable {
- color:#cccccc;
-}
-
-.tidypics-disable:hover {
-color:#cccccc;
-text-decoration:none;
-}
-
-
-.uploadifyQueueItem {
-background-color:#F5F5F5;
-border:2px solid #E5E5E5;
-font-size:11px;
-margin-top:5px;
-padding:10px;
-width:350px;
-}
-
-.uploadifyProgress {
-background-color:#FFFFFF;
-border-color:#808080 #C5C5C5 #C5C5C5 #808080;
-border-style:solid;
-border-width:1px;
-margin-top:10px;
-width:100%;
-}
-
-.uploadifyProgressBar {
-background-color: #0054a7;
-width: 1px;
-height: 3px;
-}
-
-#tidypics-uploader {
- position:relative;
- width:400px;
- min-height:20px;
-}
-
-#tidypics-choose-button {
-position:absolute;
-top:0;
-left:0;
-z-index:0;
-display:block;
-float:left;
-}
-
-#tidypics-flash-uploader {
-position:relative;
-z-index:100;
-}
-
-.uploadifyQueueItem .cancel {
- float: right;
-}
-
-.uploadifyError {
-border: 2px solid #FBCBBC;
-background-color: #FDE5DD;
-}
-
<?php
return true;
?>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 09:54:51 +0000