aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/tidypics/css.php24
-rw-r--r--views/default/tidypics/forms/ajax_upload.php49
-rw-r--r--views/default/tidypics/forms/upload.php4
3 files changed, 56 insertions, 21 deletions
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 3fd3c81aa..d836cabcf 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -305,6 +305,25 @@ list-style: none;
}
/*----- uploadify ------*/
+
+#tidypics_uploader_steps {
+list-style:none;
+}
+
+#tidypics_uploader_steps li {
+margin-bottom: 20px;
+}
+
+#tidypics_uploader_steps li a {
+font-weight:bold;
+}
+
+.tidypics_choose_button_hover {
+color:#0054a7;
+text-decoration:underline;
+}
+
+
.uploadifyQueueItem {
background-color:#F5F5F5;
border:2px solid #E5E5E5;
@@ -331,6 +350,7 @@ height: 3px;
#tidypics_uploader {
position:relative;
width:400px;
+min-height:20px;
}
#tidypics_choose_button {
@@ -347,10 +367,6 @@ position:relative;
z-index:100;
}
-#uploadifyQueue {
-margin-bottom: 20px;
-}
-
.uploadifyQueueItem .cancel {
float: right;
}
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 313ca17f9..c906b7673 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -33,32 +33,40 @@ if ($quota) {
}
}
+$basic_uploader_url = current_page_url() . '/basic';
+
?>
<div class="contentWrapper">
- <p>Instructions here for uploading images using Ajax/Flash</p>
+ <p><?php echo sprintf(elgg_echo('tidypics:uploader:instructs'), $basic_uploader_url); ?></p>
+ <ul id="tidypics_uploader_steps">
+ <li>
<div id="tidypics_uploader">
- <a id="tidypics_choose_button">Choose images</a>
+ <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" />
</div>
</div>
-
-<a href="javascript:$('#uploadify').uploadifyUpload();">Upload Files</a>
-<!--
-<a href="javascript:$('#uploadify').uploadifyClearQueue();">Clear Queue</a>
--->
-<br />
-<a href="<?php echo $vars['url']; ?>pg/photos/batch/<?php echo $batch; ?>">Add titles and descriptions</a>
-<br />
-<a href="<?php echo current_page_url(); ?>/basic">Basic uploader</a>
-
-
+ </li>
+ <li>
+ <a href="javascript:$('#uploadify').uploadifyUpload();">
+ 2. <?php echo elgg_echo('tidypics:uploader:upload'); ?>
+ </a>
+ </li>
+ <li>
+ <a href="<?php echo $vars['url']; ?>pg/photos/batch/<?php echo $batch; ?>">
+ 3. <?php echo elgg_echo('tidypics:uploader:describe'); ?>
+ </a>
+ </li>
+ </ul>
</div>
<script type="text/javascript">
+
$("#uploadify").uploadify({
'uploader' : '<?php echo $vars['url']; ?>mod/tidypics/vendors/uploadify/uploadify.swf',
'script' : '<?php echo $vars['url']; ?>action/tidypics/ajax_upload/',
@@ -73,10 +81,21 @@ $("#uploadify").uploadify({
'cancelImg' : '<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif',
'multi' : true,
'auto' : false,
- 'fileDesc' : '<?php echo elgg_echo('tidypics:upload:filedesc'); ?>',
+ 'fileDesc' : '<?php echo elgg_echo('tidypics:uploader:filedesc'); ?>',
'fileExt' : '*.jpg;*.jpeg;*.png;*.gif',
'wmode' : 'transparent',
- 'buttonImg' : " "
+ 'buttonImg' : " ",
+ 'height' : 20,
+ 'onEmbedFlash' : function(event) {
+ $("#" + event.id).hover(
+ function(){
+ $("#tidypics_choose_button").addClass('tidypics_choose_button_hover');
+ },
+ function(){
+ $("#tidypics_choose_button").removeClass('tidypics_choose_button_hover');
+ }
+ );
+ }
});
</script>
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 5a9703171..8bbda08b3 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -35,8 +35,8 @@ if ($quota) {
ob_start();
?>
<p style="line-height:1.6em;">
- <label><?php echo elgg_echo("images:upload"); ?></label><br />
- <i><?php echo elgg_echo("tidypics:settings:maxfilesize") . ' ' . $maxfilesize; ?></i><br />
+ <label><?php echo elgg_echo("tidypics:uploader:upload"); ?></label><br />
+ <i><?php echo sprintf(elgg_echo('tidypics:uploader:basic'), $maxfilesize); ?></i><br />
<?php
if ($quota) {
?>