deleted: view/theme/smoothly/arrow.png

deleted:    view/theme/smoothly/calendar.png
	deleted:    view/theme/smoothly/connect.png
	modified:   view/theme/smoothly/css/typography.css
	deleted:    view/theme/smoothly/dot.png
	deleted:    view/theme/smoothly/down.png
	deleted:    view/theme/smoothly/file.gif
	deleted:    view/theme/smoothly/groups.png
	deleted:    view/theme/smoothly/icons.png
	deleted:    view/theme/smoothly/icons.svg
	deleted:    view/theme/smoothly/login-bg.gif
	deleted:    view/theme/smoothly/lrarrow.gif
	deleted:    view/theme/smoothly/menu-user-pin.jpg
	deleted:    view/theme/smoothly/menu-user-pin.png
	deleted:    view/theme/smoothly/nav-bg.png
	modified:   view/theme/smoothly/nav.tpl
	deleted:    view/theme/smoothly/nets.tpl
	deleted:    view/theme/smoothly/next.png
	deleted:    view/theme/smoothly/notifications.png
	deleted:    view/theme/smoothly/photo-menu.jpg
	deleted:    view/theme/smoothly/photo_album.tpl
	deleted:    view/theme/smoothly/photo_top.tpl
	deleted:    view/theme/smoothly/photo_view.tpl
	deleted:    view/theme/smoothly/photography.png
	deleted:    view/theme/smoothly/premium.png
	deleted:    view/theme/smoothly/prev.png
	deleted:    view/theme/smoothly/profile_entry.tpl
	deleted:    view/theme/smoothly/profile_vcard.tpl
	deleted:    view/theme/smoothly/saved_searches_aside.tpl
	deleted:    view/theme/smoothly/screenshot.png
	deleted:    view/theme/smoothly/search.png
	deleted:    view/theme/smoothly/search_item.tpl
	deleted:    view/theme/smoothly/shiny.png
	deleted:    view/theme/smoothly/star.png

view/theme/smoothly/css/typography.css

@@ -127,7 +127,7 @@ li {
 
 dt { font-weight:bold; }
 
-dd { margin:0 0 1.5em 0.8em; }
+dd { }
 
 
 /* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */

view/theme/smoothly/nav.tpl

@@ -57,8 +57,8 @@
 </nav>
 
 <div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/tobottom.png" alt="to bottom" title="to bottom" /></a>
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
+<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
 </div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">

view/theme/smoothly/nets.tpl

@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>

view/theme/smoothly/photo_album.tpl

@@ -1,8 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
-	</div>
-		<p class='caption'>$desc</p>		
-	</a>
-	</div>
-<div class="photo-album-image-wrapper-end"></div>

view/theme/smoothly/photo_top.tpl

@@ -1,7 +0,0 @@
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<div id="photo-album-wrapper-inner">
-	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$photo.title"><img src="$photo.src" alt="$phoyo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$id" /></a>
-	</div>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-<div class="photo-top-image-wrapper-end"></div>

view/theme/smoothly/photo_view.tpl

@@ -1,40 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo" class="lframe">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-

view/theme/smoothly/profile_entry.tpl

@@ -1,10 +0,0 @@
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class='profile-visible'>$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-

view/theme/smoothly/profile_vcard.tpl

@@ -1,43 +0,0 @@
-<div class="vcard">
-	<div class="fn label">$profile.name</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block

view/theme/smoothly/saved_searches_aside.tpl

@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>

view/theme/smoothly/search_item.tpl

@@ -1,66 +0,0 @@
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name 
-			<a href="$cat.removeurl" title="$remove">[$remove]</a> 
-			{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name 
-			<a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>

view/theme/smoothly/style.css

@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2012-10-24
+	Created by alex@friendica.pixelbits.de on 2012-10-25
 
 ** Colors ** 
 Blue links - #1873a2
@@ -412,7 +412,7 @@ nav #user-menu:hover {
 }
 
 nav #user-menu-label::after {
-	content: url("menu-user-pin.png") no-repeat;
+	content: url("images/menu-user-pin.png") no-repeat;
 	padding-left: 15px;
 }
 
@@ -457,9 +457,9 @@ ul#user-menu-popup {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
 	background-color: #898988;
 	width: 100%;
-	padding: 10px 0px;
+	padding: 0;
 	margin: 0px;
-	margin-top: 4px;
+	margin-top: 10px;
 	top: 20px;
 	left: 0px;
 	border: 1px solid #9a9a9a;
@@ -509,7 +509,7 @@ ul#user-menu-popup li a.nav-sep {
 .nav-ajax-update {
 	width: 44px;
 	height: 32px;
-	background: transparent url('notifications.png') 0px 0px no-repeat; 
+	background: transparent url('images/notifications.png') 0px 0px no-repeat; 
 	color: #333333;
 	font-weight: bold;
 	font-size: 0.8em;
@@ -722,7 +722,7 @@ aside h4 {
 }
 
 h3 #search:before {
-	content: url("search.png");
+	content: url("images/search.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -818,7 +818,7 @@ h3 #search:before {
 
 li.widget-list {
 	list-style: none outside none;
-	background: url("arrow.png") no-repeat scroll left center transparent;
+	background: url("images/arrow.png") no-repeat scroll left center transparent;
 	display: block;
    	padding: 3px 24px;
 }
@@ -955,7 +955,7 @@ ul .sidebar-group-li .icon {
 }
 
 #group-sidebar h3:before {
-	content: url("groups.png");
+	content: url("images/groups.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -1369,7 +1369,7 @@ ul .sidebar-group-li .icon {
 .wall-item-photo-menu-button {
 	display: none;
 	text-indent: -99999px;
-	background: #eeeeee url("menu-user-pin.png") no-repeat 75px center;
+	background: #eeeeee url("images/menu-user-pin.png") no-repeat 75px center;
 	position: absolute;
 	overflow: hidden;
 	height: 20px;
@@ -1389,7 +1389,15 @@ ul .sidebar-group-li .icon {
 .wall-item-photo-wrapper { 
 	width: 80px; 
 	height: 80px;
+	padding: 4px;
 	position: relative;
+	border: 1px solid #dddddd;
+	border-radius: 5px;
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
+	box-shadow: 3px 3px 4px #959494;
+		-moz-box-shadow: 3px 3px 4px #959494;
+		-webkit-box-shadow: 3px 3px 4px #959494;
 }
 
 .wall-item-tools { 
@@ -1883,6 +1891,10 @@ div[id$="wrapper"] br {
 	color: #898989;
 }
 
+#profile-edit-links {
+	margin-left: 0;
+}
+
 #profile-edit-links li {
 	display: inline;
 	width: 150px;
@@ -1975,12 +1987,19 @@ div[id$="wrapper"] br {
 }
 
 .photo {
-	height: 191px;
-	width: 191px;
+	height: 191px!important;
+	width: 191px!important;
+}
+
+#side-bar-photos-albums {
+}
+
+#photo-albums-upload-link {
+	margin: 20px;
 }
 
 #side-bar-photos-albums h3:before {
-	content: url("photography.png");
+	content: url("images/photography.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -2058,7 +2077,9 @@ div[id$="wrapper"] br {
 	border-bottom: 0px; 
 }
 
-.photo-top-photo {}
+.photo-top-photo {
+	width: 180px;
+}
 .photo-album-photo {} 
 
 .photo-top-album-name {
@@ -2114,13 +2135,13 @@ div[id$="wrapper"] br {
 #photo-prev-link { 
 	left: 0px; 
 	top: 0px; 
-	background-image: url('prev.png'); 
+	background-image: url('images/prev.png'); 
 }
 
 #photo-next-link { 
 	right: 0px; 
 	top: 0px; 
-	background-image: url('next.png');
+	background-image: url('images/next.png');
 }
 
 #photo-prev-link a,
@@ -2153,17 +2174,15 @@ div[id$="wrapper"] br {
 
 #photos-upload-existing-album-text,
 #photos-upload-newalbum-div { 
-	background-color: #fff;
 	color: #909090;
-	font-size: 1.2em;
 	padding: 3px 0px;
-	padding-left: 0px;
 	width: 300px;
 }
 
 #photos-upload-album-select,
 #photos-upload-newalbum { 
 	width: 400px;
+	margin-bottom: 10px;
 }
 
 #photos-upload-perms-menu {
@@ -2175,6 +2194,12 @@ div[id$="wrapper"] br {
 	display: none;
 }
 
+#photos-upload-perms {
+	margin-top: 10px;
+}
+
+.photos-upload-perms {}
+
 select, input {
 	border: 1px solid #b0b0b0;
 	padding: 2px;
@@ -2684,7 +2709,7 @@ margin-left: 0px;
 
 .contact-photo-menu-button {
 	position: absolute;
-	background-image: url("photo-menu.jpg");
+	background-image: url("images/photo-menu.jpg");
 	background-position: top left; 
 	background-repeat: no-repeat;
 	margin: 10px 0 0 0; 
@@ -2746,7 +2771,7 @@ margin-left: 0px;
 }
 
 #follow-sidebar h3:before {
-	content: url("user.png");
+	content: url("images/user.png");
 	padding-right: 10px;
 	vertical-align: middle;
 }
@@ -2902,7 +2927,7 @@ margin-left: 0px;
 
 #id_openid_url, 
 .openid input {
-	background: url(login-bg.gif) no-repeat;
+	background: url(images/login-bg.gif) no-repeat;
 	background-position: 0 50%;
 	padding-left: 18px;
 	width: 250px!important;
@@ -3336,7 +3361,7 @@ margin-left: 0px;
 }
 
 .event-description:before {
-	content: url('calendar.png');
+	content: url('images/calendar.png');
 	margin-right: 15px;
 	vertical-align: middle;
 }
@@ -3666,19 +3691,19 @@ margin-left: 0px;
 	display: block; 
 	width: 20px; 
 	height: 20px;
-	background-image: url("icons.png");
+	background-image: url("images/icons.png");
 }
 .starred { 
-	background-image: url("star.png");
+	background-image: url("images/star.png");
 	repeat: no-repeat;
 }
 .unstarred { 
-	background-image: url("premium.png");
+	background-image: url("images/premium.png");
 	repeat: no-repeat;
 }
 
 .notify {
-	background-image: url("notifications.png");
+	background-image: url("images/notifications.png");
 	repeat: no-repeat;
 }
 
@@ -3719,7 +3744,7 @@ margin-left: 0px;
 }
 
 .sharePerms {
-	background-image: url("icons.png");
+	background-image: url("images/icons.png");
 	width: 20px;
 	height: 20px;
 	margin: 2px 0px 2px 3px;
@@ -4149,7 +4174,7 @@ ul.menu-popup {
 }
 
 div.wall-item-content-wrapper.shiny {
-	background-image: url("shiny.png");
+	background-image: url("images/shiny.png");
 	background-repeat: repeat-x;
 }
 
@@ -4174,7 +4199,7 @@ div.wall-item-content-wrapper.shiny {
 }
 
 hr.line-dots {
-    background: url("dot.png") repeat-x scroll left center transparent;
+    background: url("images/dot.png") repeat-x scroll left center transparent;
     border: medium none;
 }
 
@@ -4207,7 +4232,7 @@ hr.line-dots {
 
 .filer-icon {
 	display: block; width: 16px; height: 16px;
-	background-image: url('file.gif');
+	background-image: url('images/file.gif');
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
@@ -4281,7 +4306,7 @@ div #datebrowse-sidebar.widget {
 	color: #1873a2;
 	cursor: pointer;
 	margin-bottom: 10px;
-	/*background: url("down.png") no-repeat scroll left center transparent;*/
+	/*background: url("images/down.png") no-repeat scroll left center transparent;*/
 }
 
 .fakelink:hover {

view/theme/smoothly/theme.php

@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.10.24
+ * Version: Version 0.10.25
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>

view/theme/smoothly/vcard-widget.tpl

@@ -1,5 +0,0 @@
-	<div class="vcard">
-		<div class="fn">$name</div>
-		<div id="profile-photo-wrapper"><img class="photo" src="$photo" alt="$name" /></div>
-	</div>
-