Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

7 files changed, 9 insertions, 77 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b20b1434e..03a956a0e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1090,7 +1090,8 @@ footer {
 }
 
 .wall-item-content img {
-	max-width: 95% !important;
+  max-height: 95% !important;
+  max-width: 95% !important;
 /*  box-shadow: 8px 8px 8px #666; can't really have this because of smileys */
 }
 
@@ -2257,37 +2258,11 @@ aside input[type='text'] {
 
 }
 
-
-#profile-jot-desc {
-	/*float: left;*/
-	width: 480px;
-	color: #FF0000;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#character-counter {
-	float: right;
-	font-size: 120%;
-}
-
-#character-counter.grey {
-	color: #888888;
-}
-
-#character-counter.orange {
-	color: orange;
-}
-#character-counter.red {
-	color: red;
-}
-
-#profile-jot-banner-end {
-	/* clear: both; */ 
+#profile-jot-wrapper {
+	margin-top: 25px;
 }
 
 
-
 #settings-default-perms-menu {
 	margin-top: 15px;
 	margin-bottom: 15px;
@@ -3777,3 +3752,6 @@ ul.menu-popup {
 }
 
 .profile-match-connect { margin-top: 5px; }
+
+.reshared-content { margin-left: 30px; }
+.shared_header img { margin-right: 10px; }
\ No newline at end of file
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index e4fb00b7a..700a815cf 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -74,24 +74,6 @@ function initEditor(cb){
 						$('#profile-jot-desc').html(' ');
 					}	 
 
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
 				});
 
 				ed.onInit.add(function(ed) {
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 84b6df679..a50d40eca 100644
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,10 +1,5 @@
 
 <div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
 
 	<form id="profile-jot-form" action="$action" method="post" >
 		<input type="hidden" name="type" value="$ptyp" />
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index eccc3660a..a2e305df5 100644
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -3,7 +3,7 @@
 {{ if $albums }}
 <ul>
 {{ for $albums as $al }}
-<li><a href="$baseurl/photos/$nick/$al.bin2hex">$al.album</a></li>
+<li><a href="$baseurl/photos/$nick/album/$al.bin2hex">$al.album</a></li>
 {{ endfor }}
 </ul>
 {{ endif }}
diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl
index c20c7c10d..cce83e30b 100644
--- a/view/tpl/smarty3/jot-header.tpl
+++ b/view/tpl/smarty3/jot-header.tpl
@@ -79,24 +79,6 @@ function initEditor(cb){
 						$('#profile-jot-desc').html('&nbsp;');
 					}	 
 
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
 				});
 
 				ed.onInit.add(function(ed) {
diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl
index 2def156b2..4f52cff20 100644
--- a/view/tpl/smarty3/jot.tpl
+++ b/view/tpl/smarty3/jot.tpl
@@ -5,11 +5,6 @@
  *}}
 
 <div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
 
 	<form id="profile-jot-form" action="{{$action}}" method="post" >
 		<input type="hidden" name="type" value="{{$ptyp}}" />
diff --git a/view/tpl/smarty3/photo_albums.tpl b/view/tpl/smarty3/photo_albums.tpl
index 8a31e030c..b74c73fd3 100644
--- a/view/tpl/smarty3/photo_albums.tpl
+++ b/view/tpl/smarty3/photo_albums.tpl
@@ -8,7 +8,7 @@
 {{if $albums}}
 <ul>
 {{foreach $albums as $al}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/{{$al.bin2hex}}">{{$al.album}}</a></li>
+<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li>
 {{/foreach}}
 </ul>
 {{/if}}