Merge https://github.com/friendica/red into pending_merge

6 files changed, 62 insertions, 58 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6c9d757b1..1e9930443 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -128,7 +128,7 @@ a.wall-item-name-link {
 }
 
 .wall-item-content img {
-    max-width: 95%;
+	max-width: 100%;
 }
 
 .wall-item-title h3 {
@@ -262,4 +262,4 @@ a.wall-item-name-link {
 .item-forged {
 	color: #FF0000;
 	font-size: 1.5em !important;
-}
\ No newline at end of file
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index ed3e2ac26..3832ea1a6 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -9,8 +9,8 @@
 }
 
 #photo-photo {
-    display: table;
-    margin: 0 auto;
+	display: table;
+	margin: 0 auto;
 }
 
 #photo-photo-end {
@@ -22,27 +22,12 @@
 	margin-bottom: 25px;
 }
 
-#photos-upload-newalbum-div {
-	float: left;
-	width: 175px;
-}
-
 #photos-upload-noshare {
 	margin-bottom: 10px;
 }
 
-#photos-upload-existing-album-text {
-	float: left;
-	width: 175px;
-}
-#photos-upload-newalbum {
-	float: left;
-}
-#photos-upload-album-select {
-	float: left;
-}
-
-#photos-upload-spacer {
+#photos-upload-spacer,
+#photos-upload-new-end {
 	margin-top: 25px;
 }
 #photos-upload-new-end, #photos-upload-exist-end {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e62949520..31b769460 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2341,6 +2341,12 @@ aside .nav-pills > li > a {
 	margin-right: 10px;
 }
 
+.section-content-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	border-bottom-left-radius: $radiuspx;
+	border-bottom-right-radius: $radiuspx;
+}
 
 @media screen and (max-width: 767px) {
 	aside#region_1 {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 045ddc309..55b35af4b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -226,7 +226,7 @@ if(! $a->install) {
 	if (! $input_linksubmit)
 		$input_linksubmit = "#0080FF";
 	if (! $input_border)
-		$input_border = "#666";
+		$input_border = "#ccc";
 	if (! $input_colourhover)
 		$input_colourhover = "#333";
 	if (! $input_decohover)
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index 84a47378b..a65887d3c 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -3,7 +3,14 @@
 
 
 <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" name="albumname" value="{{$album}}" >
+<input type="text" name="albumname" value="{{$album}}" list="dl-album-edit" />
+	<datalist id="dl-album-edit">
+	{{foreach $albums as $al}}
+		{{if $al.text}}
+		<option value="{{$al.text}}">
+		{{/if}}
+	{{/foreach}}
+	</datalist>
 
 <div id="photo-album-edit-name-end"></div>
 
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 81d7b6dc0..3db292f02 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,44 +1,50 @@
-<div class="section-title-wrapper">
-	<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
-	<h2>{{$pagename}}</h2>
-	<div class="clear"></div>
-</div>
-
-<div class="generic-content-wrapper-styled">
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
-	<input type="hidden" id="photos-upload-source" name="source" value="photos" />
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		{{$albumselect}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
+		<h2>{{$pagename}}</h2>
+		<div class="clear"></div>
 	</div>
-	<div id="photos-upload-exist-end"></div>
 
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
+	<div class="section-content-wrapper">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
+			<div id="photos-album-name-label" >
+				<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
+			</div>
+			<div id="photos-album-name-input">
+				<input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" />
+				<datalist id="dl-photo-upload">
+				{{foreach $albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}">
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+			</div>
 
+			<div id="photos-upload-new-end"></div>
 
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
-		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
-	</div>
-	{{$aclselect}}
-	<div id="photos-upload-perms-end"></div>
+			<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+				<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+			</div>
 
-	<div id="photos-upload-spacer"></div>
+			<div id="photos-upload-perms" class="photos-upload-perms" >
+				<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
+				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+			</div>
 
-	{{$uploader}}
+			{{$aclselect}}
 
-	{{$default}}
+			<div id="photos-upload-perms-end"></div>
 
-	<div class="photos-upload-end" ></div>
-</form>
+			<div id="photos-upload-spacer"></div>
+
+			{{$uploader}}
+
+			{{$default}}
+
+			<div class="photos-upload-end" ></div>
+		</form>
+	</div>
 </div>