Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics

Conflicts:
	start.php
	views/default/photos/css.php

diff --cc languages/en.php
Simple merge

diff --cc start.php
index a9e2fa9ef6136a4396fc179ab7f9cd2a760dc9cd,376c7985dc0289d6b517cfdf4f9e543551985606..51cf7fa60c62207369513e3fff7785eb72471423
--- 1/start.php
--- 2/start.php
+++ b/start.php
@@@ -38,7 -38,28 +38,20 @@@ function tidypics_init() 
        $js = elgg_get_simplecache_url('js', 'photos/tidypics');
        elgg_register_simplecache_view('js/photos/tidypics');
        elgg_register_js('tidypics', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/upload');
 -      elgg_register_simplecache_view('js/photos/upload');
 -      elgg_register_js('tidypics:upload', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/tagging');
 -      elgg_register_simplecache_view('js/photos/tagging');
 -      elgg_register_js('tidypics:tagging', $js, 'footer');
 -
 -      elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer');
 -      
 -      $js_base = 'mod/tidypics/vendors/jquery-file-upload/js';
 +
++      $js_base = 'mod/lightpics/vendors/jquery-file-upload/js';
+       
+       elgg_register_js('jquery-tmpl', "http://blueimp.github.com/JavaScript-Templates/tmpl.js", 'footer');
+       elgg_register_js('jquery-load-image', "$js_base/vendor/load-image.min.js", 'footer');
+       elgg_register_js('jquery-canvas-to-blob', "$js_base/vendor/canvas-to-blob.min.js", 'footer');
+       elgg_register_js('jquery-image-gallery', "$js_base/vendor/jquery.image-gallery.min.js", 'footer');
+       elgg_register_js('jquery-iframe-transport', "$js_base/jquery.iframe-transport.js", 'footer');
+       
+       elgg_register_js('jquery-fileupload', "$js_base/jquery.fileupload.js", 'footer');
+       elgg_register_js('jquery-fileupload-fp', "$js_base/jquery.fileupload-fp.js", 'footer');
+       elgg_register_js('jquery-fileupload-ui', "$js_base/jquery.fileupload-ui.js", 'footer');
+       elgg_register_js('jquery-fileupload-jui', "$js_base/jquery.fileupload-jui.js", 'footer');
+       
        // Add photos link to owner block/hover menus
        elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');
  

diff --cc views/default/photos/css.php
index 49a7e139a42629332ea6a68758208f073afd0d6f,b031b825ca7dd7c75f124712e30823be952134b4..8fd64fd0f119942b1726b814ec1875f7d01fb300
--- 1/views/default/photos/css.php
--- 2/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@@ -72,6 -70,143 +72,68 @@@
        vertical-align: top;
  }
  
 -/* ***************************************
 -      Tagging
 -*************************************** */
 -.tidypics-tagging-border1 {
 -      border: solid 2px white;
 -}
 -
 -.tidypics-tagging-border1, .tidypics-tagging-border2,
 -.tidypics-tagging-border3, .tidypics-tagging-border4 {
 -    filter: alpha(opacity=50);
 -      opacity: 0.5;
 -}
 -
 -.tidypics-tagging-handle {
 -    background-color: #fff;
 -    border: solid 1px #000;
 -    filter: alpha(opacity=50);
 -    opacity: 0.5;
 -}
 -
 -.tidypics-tagging-outer {
 -    background-color: #000;
 -    filter: alpha(opacity=50);
 -    opacity: 0.5;
 -}
 -
 -.tidypics-tagging-help {
 -      position: absolute;
 -      left: 50%;
 -      top: -25px;
 -      width: 250px;
 -      margin-left: -125px;
 -      text-align: center;
 -}
 -
 -.tidypics-tagging-select {
 -      position: absolute;
 -      max-width: 300px;
 -}
 -
 -.tidypics-tag-wrapper {
 -      display: none;
 -      position: absolute;
 -}
 -
 -.tidypics-tag {
 -      border: 2px solid white;
 -      clear: both;
 -}
 -
 -.tidypics-tag-label {
 -      float: left;
 -      margin-top: 5px;
 -      color: #666;
 -}
 -
 -/* ***************************************
 -      Tagging
 -*************************************** */
 -#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;
 -}
 -
+ /* ***************************************
+       UPLOADER
+ *************************************** */
+ 
+ .fileinput-container {
+       text-align: center;
+ }
+ .fileinput-button {
+       cursor: pointer;
+ }
+ .fileinput-button input {
+       position: absolute;
+       top: 0;
+       right: 0;
+       margin: 0;
+       opacity: 0;
+       filter: alpha(opacity=0);
+ 
+ }
+ .files .fade {
+   display: none;
+ }
+ /* Fix for IE 6: */
+ *html .fileinput-button {
+   margin-right: -2px;
+ }
+ *html .fileinput-button .elgg-button {
+   line-height: 24px;
+ }
+ *html .fileupload-buttonbar .elgg-button {
+   margin-left: 3px;
+ }
+ 
+ /* Fix for IE 7: */
+ *+html .fileinput-button {
+   margin-right: 1px;
+ }
+ *+html .fileinput-button .elgg-button {
+   line-height: 24px;
+ }
+ *+html .fileupload-buttonbar .elgg-button {
+   margin-left: 3px;
+ }
+ 
+ @media (max-width: 480px) {
+   .files .preview * {
+     width: 40px;
+   }
+   .files .name * {
+     width: 80px;
+     display: inline-block;
+     word-wrap: break-word;
+   }
+ }
+ 
+ /* Fix for Webkit (Safari, Chrome) */
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
+   .fileinput-button {
+     margin-top: 2px;
+   }
+ }
+ 
 -
  <?php
  return true;
  ?>