Merge photo-template into develop

diff --cc mod/photos.php
index ebb88c73914b81dcc902de3357bb80d0c77e6315,33b45fb7aac9cff591b6194e1653186172b66f85..52c1fc3616605a31f02a673867bac8095a3ae475
--- 1/mod/photos.php
--- 2/mod/photos.php
+++ b/mod/photos.php
@@@ -52,32 -88,8 +92,9 @@@ function photos_init(&$a) 
  
                if(! x($a->page,'aside'))
                        $a->page['aside'] = '';
 +                $a->page['aside'] .= $vcard_widget;
                $a->page['aside'] .= $o;
+                 $a->page['aside'] .= $photo_albums_widget;
  
  
                $tpl = get_markup_template("photos_head.tpl");

diff --cc view/theme/duepuntozero/style.css
index 34d7f1c25c6b335958bbc51e2977760a63d1845e,583d4fe2047beaa68f4fd3530e6ed821f0fb72f1..63322035e16e511fbd7354dbcca9651875262dc3
--- 1/view/theme/duepuntozero/style.css
--- 2/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@@ -3365,9 -3367,9 +3367,9 @@@ ul.menu-popup 
  }
  
  #recip {
 -      
 +
  }
- .autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+ .autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
  .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
  .autocomplete .selected { background:#F0F0F0; }
  .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
@@@ -3443,28 -3445,6 +3445,28 @@@
        .nav-ajax-left {margin-left: -1em; margin-top: 0px;     }
        nav #site-location,
        nav #banner { position: relative; clear:both; }
-       ul.menu-popup { left: 0px; top 20px; }
+       ul.menu-popup { left: 0px; top: 20px; }
  
  }
 +
 +/* videos page */
 +.videos .video-top-wrapper {
 +  width: 300px;
 +  float: left;
 +  margin: 0px 10px 10px 0px;
 +  position: relative;
 +}
 +.videos .video-top-wrapper .video-js {
 +  width: 300px!important;
 +  height: 232px!important;
 +}
 +.videos .video-top-wrapper .video-delete {
 +  position: absolute;
 +  opacity: 0;
 +  right: 0px;
 +  top: 0px;
 +  transition: opacity 0.5s;
 +}
 +.videos .video-top-wrapper:hover .video-delete {
 +  opacity: 1;
 +}

diff --cc view/theme/quattro/dark/style.css
Simple merge

diff --cc view/theme/quattro/green/style.css
Simple merge

diff --cc view/theme/quattro/lilac/style.css
Simple merge

diff --cc view/theme/quattro/quattro.less
Simple merge